From: <st...@us...> - 2007-02-14 16:30:59
|
Revision: 3897 http://svn.sourceforge.net/smartfrog/?rev=3897&view=rev Author: steve_l Date: 2007-02-14 08:29:17 -0800 (Wed, 14 Feb 2007) Log Message: ----------- Apart from some changes to sflogging that have broken the logging tests, the junit test suite is now working. The split into xunit and junit is now officially complete. Modified Paths: -------------- trunk/core/components/junit/src/org/smartfrog/services/junit/junit3/JUnit3TestSuiteImpl.java trunk/core/components/junit/test/files/check-dependencies.sf trunk/core/components/junit/test/files/console-all.sf trunk/core/components/junit/test/files/logging-compound.sf trunk/core/components/junit/test/org/smartfrog/services/junit/test/system/ConditionalTest.java trunk/core/components/junit/test/org/smartfrog/services/junit/test/system/DeployedConsoleListenerTest.java trunk/core/components/junit/test/org/smartfrog/services/junit/test/system/LoggingChainListenerTest.java trunk/core/components/junit/test/org/smartfrog/services/junit/test/system/TestRunnerTestBase.java trunk/core/components/xunit/src/org/smartfrog/services/sfunit/SFUnitTestSuiteImpl.java trunk/core/components/xunit/src/org/smartfrog/services/xunit/all.sf trunk/core/components/xunit/src/org/smartfrog/services/xunit/base/AbstractTestSuite.java trunk/core/components/xunit/src/org/smartfrog/services/xunit/base/TestRunner.java trunk/core/components/xunit/src/org/smartfrog/services/xunit/base/TestRunnerImpl.java trunk/core/components/xunit/src/org/smartfrog/services/xunit/base/TestSuite.java trunk/core/components/xunit/src/org/smartfrog/services/xunit/base/components.sf trunk/core/components/xunit/src/org/smartfrog/services/xunit/base/testrunner.sf trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/AbstractListenerImpl.java trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/BufferingListener.java trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/BufferingListenerImpl.java trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/ChainListenerImpl.java trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/ConsoleListenerImpl.java trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/StatisticsTestListenerImpl.java trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/html/HtmlTestIndexImpl.java trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/html/HtmlTestListenerComponent.java trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/html/OneHostHtmlListener.java trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/html/OneHostXMLListener.java trunk/core/components/xunit/src/org/smartfrog/services/xunit/serial/LogEntry.java trunk/core/components/xunit/src/org/smartfrog/services/xunit/serial/TestInfo.java trunk/core/components/xunit/src/org/smartfrog/services/xunit/serial/ThrowableTraceInfo.java Added Paths: ----------- trunk/core/components/junit/test/files/log-all.sf Removed Paths: ------------- trunk/core/components/junit/test/files/log-chain-all.sf Modified: trunk/core/components/junit/src/org/smartfrog/services/junit/junit3/JUnit3TestSuiteImpl.java =================================================================== --- trunk/core/components/junit/src/org/smartfrog/services/junit/junit3/JUnit3TestSuiteImpl.java 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/junit/src/org/smartfrog/services/junit/junit3/JUnit3TestSuiteImpl.java 2007-02-14 16:29:17 UTC (rev 3897) @@ -106,6 +106,7 @@ public synchronized void sfStart() throws SmartFrogException, RemoteException { super.sfStart(); + log=sfLog(); readConfiguration(); } Modified: trunk/core/components/junit/test/files/check-dependencies.sf =================================================================== --- trunk/core/components/junit/test/files/check-dependencies.sf 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/junit/test/files/check-dependencies.sf 2007-02-14 16:29:17 UTC (rev 3897) @@ -34,10 +34,10 @@ retain false; classes [ "junit.framework.TestResult", - "org.smartfrog.services.junit.JUnitTestSuiteImpl", + "org.smartfrog.services.junit.junit3.JUnit3TestSuiteImpl", "org.smartfrog.services.xunit.serial.ThrowableTraceInfo", "org.smartfrog.services.xunit.log.TestListenerLogImpl", - "org.smartfrog.services.xunit.base.TestRunnerComponent" + "org.smartfrog.services.xunit.base.TestRunnerImpl" ]; } Modified: trunk/core/components/junit/test/files/console-all.sf =================================================================== --- trunk/core/components/junit/test/files/console-all.sf 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/junit/test/files/console-all.sf 2007-02-14 16:29:17 UTC (rev 3897) @@ -34,4 +34,4 @@ } -} \ No newline at end of file +} Copied: trunk/core/components/junit/test/files/log-all.sf (from rev 3894, trunk/core/components/junit/test/files/log-chain-all.sf) =================================================================== --- trunk/core/components/junit/test/files/log-all.sf (rev 0) +++ trunk/core/components/junit/test/files/log-all.sf 2007-02-14 16:29:17 UTC (rev 3897) @@ -0,0 +1,43 @@ +/** (C) Copyright 1998-2004 Hewlett-Packard Development Company, LP + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +For more information: www.smartfrog.org + +*/ + +#include "/files/chain-all.sf" +#include "/files/logging-compound.sf" + +sfCodeBase PROPERTY org.smartfrog.codebase; + + +sfConfig extends LoggingCompound { + + + + tests extends TestAll { + + testLog LAZY ATTRIB TestLog; + + //buffer the results + listener extends ConsoleListener { + } + } + + + + +} \ No newline at end of file Property changes on: trunk/core/components/junit/test/files/log-all.sf ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: trunk/core/components/junit/test/files/log-chain-all.sf =================================================================== --- trunk/core/components/junit/test/files/log-chain-all.sf 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/junit/test/files/log-chain-all.sf 2007-02-14 16:29:17 UTC (rev 3897) @@ -1,39 +0,0 @@ -/** (C) Copyright 1998-2004 Hewlett-Packard Development Company, LP - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -For more information: www.smartfrog.org - -*/ - -#include "/files/chain-all.sf" -#include "/files/logging-compound.sf" - -sfCodeBase PROPERTY org.smartfrog.codebase; - /** - * run all tests in the suite. - * output to an XML listener - */ - -sfConfig extends LoggingCompound { - - - chain extends Chain { - } - - chain:tests:testLog LAZY testLog; - - -} \ No newline at end of file Modified: trunk/core/components/junit/test/files/logging-compound.sf =================================================================== --- trunk/core/components/junit/test/files/logging-compound.sf 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/junit/test/files/logging-compound.sf 2007-02-14 16:29:17 UTC (rev 3897) @@ -23,8 +23,7 @@ #include "/org/smartfrog/sfcore/logging/logtoprimimpl.sf" /** - * run all tests in the suite. - * output to an XML listener + * this logging compound logs to a the test listener log */ LoggingCompound extends Compound { @@ -46,7 +45,7 @@ } } - testLog LAZY log:logTo:logTo; + TestLog LAZY log:logTo:logTo; } Modified: trunk/core/components/junit/test/org/smartfrog/services/junit/test/system/ConditionalTest.java =================================================================== --- trunk/core/components/junit/test/org/smartfrog/services/junit/test/system/ConditionalTest.java 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/junit/test/org/smartfrog/services/junit/test/system/ConditionalTest.java 2007-02-14 16:29:17 UTC (rev 3897) @@ -21,10 +21,6 @@ package org.smartfrog.services.junit.test.system; -import org.smartfrog.services.xunit.base.TestRunner; -import org.smartfrog.services.xunit.listeners.BufferingListener; -import org.smartfrog.services.xunit.serial.Statistics; - /** Test deploying against a localhost Date: 06-Jul-2004 Time: 21:54:25 */ public class ConditionalTest extends TestRunnerTestBase { @@ -33,15 +29,15 @@ } public void testConditionalTrue() throws Throwable { - executeBufferedTestRun("junit-conditional-true.sf", 0, 0, 0); + executeBufferedTestRun("junit-conditional-true", 1, 0, 0); } public void testConditionalUnless() throws Throwable { - executeBufferedTestRun("junit-conditional-unless.sf", 0, 0, 0); + executeBufferedTestRun("junit-conditional-unless", -1, 0, 0); } public void testConditionalFalse() throws Throwable { - executeBufferedTestRun("junit-conditional-false.sf", 0, 0, 0); + executeBufferedTestRun("junit-conditional-false", -1, 0, 0); } } Modified: trunk/core/components/junit/test/org/smartfrog/services/junit/test/system/DeployedConsoleListenerTest.java =================================================================== --- trunk/core/components/junit/test/org/smartfrog/services/junit/test/system/DeployedConsoleListenerTest.java 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/junit/test/org/smartfrog/services/junit/test/system/DeployedConsoleListenerTest.java 2007-02-14 16:29:17 UTC (rev 3897) @@ -21,7 +21,6 @@ import org.smartfrog.services.xunit.base.TestRunner; import org.smartfrog.services.xunit.listeners.ConsoleListenerFactory; -import org.smartfrog.sfcore.prim.Prim; /** created Nov 22, 2004 4:45:26 PM */ Modified: trunk/core/components/junit/test/org/smartfrog/services/junit/test/system/LoggingChainListenerTest.java =================================================================== --- trunk/core/components/junit/test/org/smartfrog/services/junit/test/system/LoggingChainListenerTest.java 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/junit/test/org/smartfrog/services/junit/test/system/LoggingChainListenerTest.java 2007-02-14 16:29:17 UTC (rev 3897) @@ -12,6 +12,7 @@ /** created Nov 22, 2004 4:45:26 PM */ public class LoggingChainListenerTest extends TestRunnerTestBase { + private static final String TEST_LOG = "TestLog"; public LoggingChainListenerTest(String name) { super(name); @@ -25,7 +26,7 @@ "LoggingCompound"); TestListenerLog log = (TestListenerLog) application.sfResolve( - "testLog", + TEST_LOG, (Prim) null, true); BufferingListener factory = new BufferingListenerImpl(); @@ -43,7 +44,7 @@ public void testSuccess() throws Throwable { int seconds = getTimeout(); - application = deployExpectingSuccess("/files/log-chain-all.sf", "LogChainTest"); + application = deployExpectingSuccess("/files/log-all.sf", "LogAllTest"); TestRunner runner = (TestRunner) application.sfResolve( "tests", Modified: trunk/core/components/junit/test/org/smartfrog/services/junit/test/system/TestRunnerTestBase.java =================================================================== --- trunk/core/components/junit/test/org/smartfrog/services/junit/test/system/TestRunnerTestBase.java 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/junit/test/org/smartfrog/services/junit/test/system/TestRunnerTestBase.java 2007-02-14 16:29:17 UTC (rev 3897) @@ -22,8 +22,8 @@ package org.smartfrog.services.junit.test.system; import org.smartfrog.services.xunit.base.TestRunner; +import org.smartfrog.services.xunit.listeners.BufferingListener; import org.smartfrog.services.xunit.serial.Statistics; -import org.smartfrog.services.xunit.listeners.BufferingListener; import org.smartfrog.test.DeployingTestBase; import org.smartfrog.test.TestHelper; import org.w3c.dom.Document; @@ -115,6 +115,14 @@ } } + /** + * execute a test run to a buffer + * @param name the test to run (base-relative; no .sf extension needed) + * @param run number of tests to run; -1 means no + * @param errors + * @param failures + * @throws Throwable + */ protected void executeBufferedTestRun(String name, int run, int errors, int failures) throws Throwable { application = deployExpectingSuccess(BASE+name+".sf", name); int seconds = getTimeout(); @@ -128,16 +136,21 @@ true); boolean finished = spinTillFinished(runner, seconds); assertTrue("Test run timed out", finished); - assertTrue("expected tests to run", listener.getStartCount() == 1); - assertTrue("session started", - listener.getSessionStartCount() == 1); - assertTrue("session ended", - listener.getSessionEndCount() == 1); - assertTrue("all tests passed", listener.testsWereSuccessful()); - Statistics statistics = runner.getStatistics(); - assertEquals("statistics.testRun"+run, run, statistics.getTestsRun()); - assertEquals("statistics.errors", errors, statistics.getErrors()); - assertEquals("statistics.failures",failures, - statistics.getFailures()); + if(run>=0) { + assertTrue("expected tests to run", listener.getStartCount() == 1); + assertTrue("session started", + listener.getSessionStartCount() == 1); + assertTrue("session ended", + listener.getSessionEndCount() == 1); + //assertTrue("all tests passed", listener.testsWereSuccessful()); + Statistics statistics = runner.getStatistics(); + assertEquals("statistics.testRun"+run, run, statistics.getTestsRun()); + assertEquals("statistics.errors", errors, statistics.getErrors()); + assertEquals("statistics.failures",failures, + statistics.getFailures()); + } else { + assertEquals("expected tests to be skipped and startcount==0", + 0,listener.getStartCount()); + } } } Modified: trunk/core/components/xunit/src/org/smartfrog/services/sfunit/SFUnitTestSuiteImpl.java =================================================================== --- trunk/core/components/xunit/src/org/smartfrog/services/sfunit/SFUnitTestSuiteImpl.java 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/xunit/src/org/smartfrog/services/sfunit/SFUnitTestSuiteImpl.java 2007-02-14 16:29:17 UTC (rev 3897) @@ -57,7 +57,7 @@ /** * Return true iff the component is finished. Spin on this, with a (delay) between calls * - * @return + * @return true if we have finished */ public boolean isFinished() { return finished; @@ -146,7 +146,7 @@ * @throws RemoteException for network problems * @throws SmartFrogException for other problems */ - public boolean runTests() throws RemoteException, SmartFrogException { + public boolean runTests() throws RemoteException, SmartFrogException, InterruptedException { InetAddress host = sfDeployedHost(); String hostname = host.getHostName(); //use our short name @@ -190,6 +190,8 @@ * * @param testBlock component to test * @return true if the test worked + * @throws SmartFrogException smartfrog problems + * @throws RemoteException network problems */ private synchronized boolean testOneChild(TestBlock testBlock) throws SmartFrogException, RemoteException { activeTest = (Prim) testBlock; @@ -197,6 +199,7 @@ try { activeTest.sfStart(); //now we wait for the child to terminate + //TODO: block, without breaking synchronization return true; } catch (SmartFrogException e) { caught = e; @@ -211,7 +214,9 @@ /** * Deploy a child; return false if there were none left * - * @return + * @return whether the test was run or not + * @throws SmartFrogException smartfrog problems + * @throws RemoteException network problems */ private synchronized boolean deployNextChild() throws SmartFrogException, RemoteException { if (testChildrenIterator.hasNext()) { @@ -227,11 +232,11 @@ * component.</li> <li> if it is the last - terminate normally. </li> <li> If starting the next component raised an * error, terminate abnormally</li> </ol> Abnormal child terminations are relayed up. * - * @param status exit record of the component + * @param record exit record of the component * @param comp child component that is terminating * @return true whenever a child component is not started */ - protected boolean onChildTerminated(TerminationRecord status, Prim comp) { + protected boolean onChildTerminated(TerminationRecord record, Prim comp) { if (activeTest == comp) { //cast it TestBlock test = (TestBlock) activeTest; @@ -275,8 +280,8 @@ caught = e; } //terminate with an error if we caught something - TerminationRecord record = TerminationRecord.abnormal("Failed to start next test", sfCompleteName, caught); - sfTerminate(status); + TerminationRecord newRecord = TerminationRecord.abnormal("Failed to start next test", sfCompleteName, caught); + sfTerminate(newRecord); //and notify the caller we are handling it ourselves return false; } else { Modified: trunk/core/components/xunit/src/org/smartfrog/services/xunit/all.sf =================================================================== --- trunk/core/components/xunit/src/org/smartfrog/services/xunit/all.sf 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/xunit/src/org/smartfrog/services/xunit/all.sf 2007-02-14 16:29:17 UTC (rev 3897) @@ -34,7 +34,7 @@ * declare all the xunit stuff, even things from subsidiary directories */ -#include "/org/smartfrog/services/xunit/base/testrunner.sf" +#include "/org/smartfrog/services/xunit/base/components.sf" #include "/org/smartfrog/services/xunit/log/testlistenerlogimpl.sf" #include "/org/smartfrog/services/xunit/listeners/html/components.sf" #include "/org/smartfrog/services/xunit/timeouts/components.sf" \ No newline at end of file Modified: trunk/core/components/xunit/src/org/smartfrog/services/xunit/base/AbstractTestSuite.java =================================================================== --- trunk/core/components/xunit/src/org/smartfrog/services/xunit/base/AbstractTestSuite.java 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/xunit/src/org/smartfrog/services/xunit/base/AbstractTestSuite.java 2007-02-14 16:29:17 UTC (rev 3897) @@ -231,7 +231,7 @@ /** * Get the test listener factory from this configuration - * @return + * @return the test listener factory */ protected TestListenerFactory getTestListenerFactory() { return getConfiguration().getListenerFactory(); Modified: trunk/core/components/xunit/src/org/smartfrog/services/xunit/base/TestRunner.java =================================================================== --- trunk/core/components/xunit/src/org/smartfrog/services/xunit/base/TestRunner.java 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/xunit/src/org/smartfrog/services/xunit/base/TestRunner.java 2007-02-14 16:29:17 UTC (rev 3897) @@ -78,7 +78,7 @@ /** * Get the listener factory - * @return + * @return the factory * @throws RemoteException */ @@ -89,7 +89,7 @@ /** * run the test - * + * @return true if the tests were started * @throws RemoteException */ boolean startTests() throws RemoteException, SmartFrogException; @@ -101,5 +101,10 @@ */ Statistics getStatistics() throws RemoteException; + /** + * test for being finished + * @return true if we have finished + * @throws RemoteException + */ boolean isFinished() throws RemoteException; } Modified: trunk/core/components/xunit/src/org/smartfrog/services/xunit/base/TestRunnerImpl.java =================================================================== --- trunk/core/components/xunit/src/org/smartfrog/services/xunit/base/TestRunnerImpl.java 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/xunit/src/org/smartfrog/services/xunit/base/TestRunnerImpl.java 2007-02-14 16:29:17 UTC (rev 3897) @@ -109,6 +109,7 @@ public static final String ERROR_TESTS_IN_PROGRESS = "Component is already running tests"; public static final String TESTS_FAILED = "Tests Failed"; + private static final String TEST_WAS_INTERRUPTED = "Test was interrupted"; /** * constructor @@ -194,7 +195,8 @@ shouldDetach = sfResolve( ShouldDetachOrTerminate.ATTR_SHOULD_DETACH, shouldDetach, false); singleTest = sfResolve(ATTR_SINGLE_TEST,singleTest,false); - configuration.setTestLog((TestListenerLog) sfResolve(ATTR_TESTLOG,(Prim)null,false)); + TestListenerLog testLog = (TestListenerLog) sfResolve(ATTR_TESTLOG, (Prim) null, false); + configuration.setTestLog(testLog); validate(); //execute the tests in all the suites attached to this class @@ -274,6 +276,8 @@ if (!executeTests()) { throw new SmartFrogException(TESTS_FAILED); } + } catch (InterruptedException e) { + catchException(e); } catch (RemoteException e) { catchException(e); } catch (SmartFrogException e) { @@ -310,8 +314,9 @@ * @return true if the tests worked * @throws SmartFrogException for problems * @throws RemoteException for network problems + * @throws InterruptedException if the tests get blocked */ - public boolean executeTests() throws SmartFrogException, RemoteException { + public boolean executeTests() throws SmartFrogException, RemoteException, InterruptedException { try { if(singleTest==null || singleTest.length()==0) { @@ -326,7 +331,7 @@ } - private boolean executeBatchTests() throws RemoteException, SmartFrogException { + private boolean executeBatchTests() throws RemoteException, SmartFrogException, InterruptedException { boolean successful = true; Enumeration e = sfChildren(); while (e.hasMoreElements()) { @@ -336,9 +341,13 @@ successful &= executeTestSuite(suiteComponent); } //break out if the thread is interrupted - if (Thread.currentThread().isInterrupted()) { - log.info("Test was interrupted"); - return false; + Thread thisThread = Thread.currentThread(); + synchronized(thisThread) { + if (thisThread.isInterrupted()) { + thisThread.interrupt(); + log.info(TEST_WAS_INTERRUPTED); + throw new InterruptedException(TEST_WAS_INTERRUPTED); + } } if(!successful && !configuration.getKeepGoing()) { //we have failed and asked to stop in this situation @@ -354,8 +363,10 @@ * @return true iff it worked * @throws RemoteException network trouble * @throws SmartFrogException other problems + * @throws InterruptedException if the test run is interrupted */ - private boolean executeSingleTest() throws SmartFrogException, RemoteException { + private boolean executeSingleTest() + throws SmartFrogException, RemoteException, InterruptedException { Prim child=null; child=sfResolve(singleTest,child,false); if(child==null) { @@ -372,8 +383,10 @@ * @return true if the tests were successful * @throws RemoteException network trouble * @throws SmartFrogException other problems + * @throws InterruptedException if the test run is interrupted */ - private boolean executeTestSuite(TestSuite suiteComponent) throws RemoteException, SmartFrogException { + private boolean executeTestSuite(TestSuite suiteComponent) + throws RemoteException, SmartFrogException, InterruptedException { //bind to the configuration. This will set the static properties. suiteComponent.bind(getConfiguration()); boolean result; @@ -382,8 +395,8 @@ } finally { //unbind from this test suiteComponent.bind(null); + updateResultAttributes((Prim) suiteComponent); } - updateResultAttributes((Prim)suiteComponent); return result; } @@ -391,6 +404,7 @@ /** * fetch the test results from the Test suite, then update our own values * + * @param testSuite test suite to patch * @throws RemoteException network trouble * @throws SmartFrogException other problems */ Modified: trunk/core/components/xunit/src/org/smartfrog/services/xunit/base/TestSuite.java =================================================================== --- trunk/core/components/xunit/src/org/smartfrog/services/xunit/base/TestSuite.java 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/xunit/src/org/smartfrog/services/xunit/base/TestSuite.java 2007-02-14 16:29:17 UTC (rev 3897) @@ -86,7 +86,8 @@ * @return true if they worked * @throws RemoteException for network problems * @throws SmartFrogException for other problems + * @throws InterruptedException if the thread got interrupted while the tests were running */ - boolean runTests() throws RemoteException, SmartFrogException; + boolean runTests() throws RemoteException, SmartFrogException,InterruptedException; } Modified: trunk/core/components/xunit/src/org/smartfrog/services/xunit/base/components.sf =================================================================== --- trunk/core/components/xunit/src/org/smartfrog/services/xunit/base/components.sf 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/xunit/src/org/smartfrog/services/xunit/base/components.sf 2007-02-14 16:29:17 UTC (rev 3897) @@ -30,10 +30,6 @@ #include "/org/smartfrog/services/xunit/base/testsuite.sf" //test runner #include "/org/smartfrog/services/xunit/base/testrunner.sf" -//include logging -#include "/org/smartfrog/services/xunit/base/log/testlistenerlogimpl.sf" -//base listeners -#include "/org/smartfrog/services/xunit/base/listeners/components.sf"; Modified: trunk/core/components/xunit/src/org/smartfrog/services/xunit/base/testrunner.sf =================================================================== --- trunk/core/components/xunit/src/org/smartfrog/services/xunit/base/testrunner.sf 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/xunit/src/org/smartfrog/services/xunit/base/testrunner.sf 2007-02-14 16:29:17 UTC (rev 3897) @@ -55,7 +55,7 @@ * the base test runner has a console listener automatically */ TestRunner extends Compound { - sfClass "org.smartfrog.services.junit.TestRunnerImpl"; + sfClass "org.smartfrog.services.xunit.base.TestRunnerImpl"; testRunnerSchema extends TestRunnerSchema; listener extends ConsoleListener ; failOnError true; Modified: trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/AbstractListenerImpl.java =================================================================== --- trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/AbstractListenerImpl.java 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/AbstractListenerImpl.java 2007-02-14 16:29:17 UTC (rev 3897) @@ -43,6 +43,8 @@ /** * end this test suite. After calling this, caller should discard all references; they may no longer be valid. <i>No * further methods may be called</i> + * @throws RemoteException network problems + * @throws SmartFrogException other problems */ public void endSuite() throws RemoteException, SmartFrogException { Modified: trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/BufferingListener.java =================================================================== --- trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/BufferingListener.java 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/BufferingListener.java 2007-02-14 16:29:17 UTC (rev 3897) @@ -42,16 +42,16 @@ /** * get the number of errors - * @return - * @throws RemoteException + * @return the error count + * @throws RemoteException for network trouble */ int getErrorCount() throws RemoteException; /** * get the error at that point in the list - * @param entry + * @param entry info about a given entry * @return a copy of the error - * @throws RemoteException + * @throws RemoteException for network trouble * @throws IndexOutOfBoundsException if the entry is out of range */ TestInfo getErrorInfo(int entry) throws RemoteException, IndexOutOfBoundsException; @@ -59,8 +59,8 @@ /** * get the number of starts * - * @return - * @throws RemoteException + * @return the start count + * @throws RemoteException for network trouble */ int getStartCount() throws RemoteException; @@ -69,17 +69,16 @@ * * @param entry the list entry beginning at zero * @return a copy of the info - * @throws RemoteException + * @throws RemoteException for network trouble * @throws IndexOutOfBoundsException if the entry is out of range */ TestInfo getStartInfo(int entry) throws RemoteException, IndexOutOfBoundsException; /** - * get the number of end - * - * @return - * @throws RemoteException + * get the number of ends + * @return the end count + * @throws RemoteException for network trouble */ int getEndCount() throws RemoteException; @@ -88,7 +87,7 @@ * * @param entry the list entry beginning at zero * @return a copy of the info - * @throws RemoteException + * @throws RemoteException for network trouble * @throws IndexOutOfBoundsException if the entry is out of range */ TestInfo getEndInfo(int entry) throws RemoteException, IndexOutOfBoundsException; @@ -97,8 +96,8 @@ /** * get the number of failures * - * @return - * @throws RemoteException + * @return the number of failures + * @throws RemoteException for network trouble */ int getFailureCount() throws RemoteException; @@ -107,7 +106,7 @@ * * @param entry the list entry beginning at zero * @return a copy of the info - * @throws RemoteException + * @throws RemoteException for network trouble * @throws IndexOutOfBoundsException if the entry is out of range */ TestInfo getFailureInfo(int entry) throws RemoteException, IndexOutOfBoundsException; @@ -115,7 +114,7 @@ /** * returns true iff all tests passed * @return test success flag - * @throws RemoteException + * @throws RemoteException for network trouble */ boolean testsWereSuccessful() throws RemoteException; @@ -124,14 +123,14 @@ * * @return and interface that should have events reported to it * - * @throws RemoteException + * @throws RemoteException for network trouble */ int getSessionStartCount() throws RemoteException; /** * get the number of times that callers ended listening - * @return - * @throws RemoteException + * @return the number of times that callers ended listening + * @throws RemoteException for network trouble */ int getSessionEndCount() throws RemoteException; } Modified: trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/BufferingListenerImpl.java =================================================================== --- trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/BufferingListenerImpl.java 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/BufferingListenerImpl.java 2007-02-14 16:29:17 UTC (rev 3897) @@ -1,4 +1,4 @@ -/** (C) Copyright 2004 Hewlett-Packard Development Company, LP +/** (C) Copyright 2006-2007 Hewlett-Packard Development Company, LP This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -58,7 +58,7 @@ * get the number of errors * * @return the error count - * @throws java.rmi.RemoteException + * @throws RemoteException for network trouble */ public synchronized int getErrorCount() throws RemoteException { return errors.size(); @@ -69,7 +69,7 @@ * * @param entry the index of the entry * @return a copy of the error - * @throws java.rmi.RemoteException + * @throws RemoteException for network trouble * @throws IndexOutOfBoundsException if the entry is out of range */ public synchronized TestInfo getErrorInfo(int entry) @@ -80,8 +80,8 @@ /** * get the number of starts * - * @return - * @throws java.rmi.RemoteException + * @return the number of starts + * @throws RemoteException for network trouble */ public synchronized int getStartCount() throws RemoteException { return starts.size(); @@ -92,7 +92,7 @@ * * @param entry the list entry beginning at zero * @return a copy of the info - * @throws java.rmi.RemoteException + * @throws RemoteException for network trouble * @throws IndexOutOfBoundsException if the entry is out of range */ public synchronized TestInfo getStartInfo(int entry) @@ -103,8 +103,8 @@ /** * get the number of end * - * @return - * @throws java.rmi.RemoteException + * @return the end count + * @throws RemoteException for network trouble */ public synchronized int getEndCount() throws RemoteException { return ends.size(); @@ -115,7 +115,7 @@ * * @param entry the list entry beginning at zero * @return a copy of the info - * @throws java.rmi.RemoteException + * @throws RemoteException for network trouble * @throws IndexOutOfBoundsException if the entry is out of range */ public TestInfo getEndInfo(int entry) throws RemoteException, @@ -126,8 +126,8 @@ /** * get the number of failures * - * @return - * @throws java.rmi.RemoteException + * @return the failure count + * @throws RemoteException for network trouble */ public int getFailureCount() throws RemoteException { return failures.size(); @@ -138,7 +138,7 @@ * * @param entry the list entry beginning at zero * @return a copy of the info - * @throws java.rmi.RemoteException + * @throws RemoteException for network trouble * @throws IndexOutOfBoundsException if the entry is out of range */ public TestInfo getFailureInfo(int entry) throws RemoteException, @@ -150,7 +150,7 @@ * returns true iff all tests passed * * @return test success flag - * @throws java.rmi.RemoteException + * @throws RemoteException for network trouble */ public boolean testsWereSuccessful() throws RemoteException { return getFailureCount() == 0 && getErrorCount() == 0; @@ -160,7 +160,7 @@ * get the number of times that callers started listening * * @return and interface that should have events reported to it - * @throws java.rmi.RemoteException + * @throws RemoteException for network trouble */ public int getSessionStartCount() throws RemoteException { return sessionStartCount; @@ -174,7 +174,7 @@ * get the number of times that callers ended listening * * @return - * @throws java.rmi.RemoteException + * @throws RemoteException for network trouble */ public int getSessionEndCount() throws RemoteException { return sessionEndCount; @@ -235,6 +235,8 @@ /** * An error occurred. + * @param test the test + * @throws RemoteException for network trouble */ public synchronized void addError(TestInfo test) throws RemoteException { @@ -245,7 +247,7 @@ /** * make a clone of any test info * - * @param test + * @param test test to clone * @return cloned test information */ private TestInfo cloneTestInfo(TestInfo test) { @@ -261,6 +263,8 @@ /** * A failure occurred. + * @param test the test + * @throws RemoteException for network trouble */ public synchronized void addFailure(TestInfo test) throws RemoteException { @@ -270,6 +274,8 @@ /** * A test ended. + * @param test the test + * @throws RemoteException for network trouble */ public synchronized void endTest(TestInfo test) throws RemoteException { TestInfo cloned = cloneTestInfo(test); @@ -278,6 +284,8 @@ /** * A test started. + * @param test the test + * @throws RemoteException for network trouble */ public synchronized void startTest(TestInfo test) throws RemoteException { @@ -285,6 +293,11 @@ starts.add(cloned); } + /** + * Log an event + * @param event the entry to log + * @throws RemoteException for network trouble + */ public void log(LogEntry event) throws RemoteException { messages.add(event); } Modified: trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/ChainListenerImpl.java =================================================================== --- trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/ChainListenerImpl.java 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/ChainListenerImpl.java 2007-02-14 16:29:17 UTC (rev 3897) @@ -45,9 +45,11 @@ public static final String ATTR_LISTENERS="listeners"; private List<TestListenerFactory> factories; - private Log log; - private ComponentHelper helper = new ComponentHelper(this); + /** + * simple constructor + * @throws RemoteException + */ public ChainListenerImpl() throws RemoteException { } @@ -58,23 +60,22 @@ * heartbeat. Subclasses can override to provide additional deployment * behavior. * - * @throws org.smartfrog.sfcore.common.SmartFrogException + * @throws SmartFrogException * error while deploying * @throws java.rmi.RemoteException In case of network/rmi error */ public synchronized void sfDeploy() throws SmartFrogException, RemoteException { super.sfDeploy(); - log = helper.getLogger(); } /** * Can be called to start components. Subclasses should override to provide * functionality Do not block in this call, but spawn off any main loops! * - * @throws org.smartfrog.sfcore.common.SmartFrogException + * @throws SmartFrogException * failure while starting - * @throws java.rmi.RemoteException In case of network/rmi error + * @throws RemoteException In case of network/rmi error */ public synchronized void sfStart() throws SmartFrogException, RemoteException { Modified: trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/ConsoleListenerImpl.java =================================================================== --- trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/ConsoleListenerImpl.java 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/ConsoleListenerImpl.java 2007-02-14 16:29:17 UTC (rev 3897) @@ -80,14 +80,26 @@ } - public void println(String s) { - outputstream.println(s); + /** + * Print a line + * @param line + */ + public void println(String line) { + outputstream.println(line); } + /** + * flush the stream + */ public void flush() { outputstream.flush(); } + /** + * Log trouble + * @param message mesage + * @param test test info + */ private void logTrouble(String message, TestInfo test) { StringBuffer buffer = new StringBuffer(128); buffer.append(message); @@ -101,6 +113,10 @@ logTrace(test.getFault()); } + /** + * Log an exception, recursively + * @param fault fault to log + */ private void logTrace(ThrowableTraceInfo fault) { if (fault == null) { return; @@ -113,7 +129,10 @@ } flush(); //recurse - logTrace(fault.getCause()); + ThrowableTraceInfo cause = fault.getCause(); + if(cause!=null && cause!=fault) { + logTrace(cause); + } } /** Modified: trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/StatisticsTestListenerImpl.java =================================================================== --- trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/StatisticsTestListenerImpl.java 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/StatisticsTestListenerImpl.java 2007-02-14 16:29:17 UTC (rev 3897) @@ -25,7 +25,6 @@ import org.smartfrog.services.xunit.serial.LogEntry; import org.smartfrog.services.xunit.serial.TestInfo; import org.smartfrog.sfcore.common.SmartFrogException; -import org.smartfrog.sfcore.prim.PrimImpl; import java.rmi.RemoteException; @@ -65,35 +64,41 @@ * all references; they may no longer be valid. * <i>No further methods may be called</i> */ - public void endSuite() throws RemoteException, SmartFrogException { + public void endSuite() { } /** * An error occurred. */ - public synchronized void addError(TestInfo test) throws RemoteException, SmartFrogException { + public void addError(TestInfo test) { stats.incErrors(); } /** * A failure occurred. */ - public synchronized void addFailure(TestInfo test) throws RemoteException, SmartFrogException { + public void addFailure(TestInfo test) { stats.incFailures(); } /** * A test ended. */ - public synchronized void endTest(TestInfo test) throws RemoteException, SmartFrogException { + public void endTest(TestInfo test) { stats.incTestsRun(); } /** * A test started. */ - public synchronized void startTest(TestInfo test) throws RemoteException, SmartFrogException { + /** + * + * @param test + * @throws RemoteException + * @throws SmartFrogException + */ + public void startTest(TestInfo test) { stats.incTestsStarted(); } @@ -122,7 +127,11 @@ return stats; } - public void log(LogEntry event) throws RemoteException { + /** + * Log the fact that another message was logged + * @param event event to log + */ + public void log(LogEntry event) { stats.incLoggedMessages(); } } Modified: trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/html/HtmlTestIndexImpl.java =================================================================== --- trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/html/HtmlTestIndexImpl.java 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/html/HtmlTestIndexImpl.java 2007-02-14 16:29:17 UTC (rev 3897) @@ -47,9 +47,9 @@ * Can be called to start components. Subclasses should override to provide * functionality Do not block in this call, but spawn off any main loops! * - * @throws org.smartfrog.sfcore.common.SmartFrogException + * @throws SmartFrogException * failure while starting - * @throws java.rmi.RemoteException In case of network/rmi error + * @throws RemoteException In case of network/rmi error */ public synchronized void sfStart() throws SmartFrogException, RemoteException { Modified: trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/html/HtmlTestListenerComponent.java =================================================================== --- trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/html/HtmlTestListenerComponent.java 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/html/HtmlTestListenerComponent.java 2007-02-14 16:29:17 UTC (rev 3897) @@ -48,7 +48,7 @@ /** * construct a base interface * - * @throws java.rmi.RemoteException + * @throws RemoteException */ public HtmlTestListenerComponent() throws RemoteException { helper=new ComponentHelper(this); @@ -56,12 +56,9 @@ /** - * Can be called to start components. Subclasses should override to provide - * functionality Do not block in this call, but spawn off any main loops! - * - * @throws org.smartfrog.sfcore.common.SmartFrogException - * failure while starting - * @throws java.rmi.RemoteException In case of network/rmi error + * {@inheritDoc} + * @throws SmartFrogException error while deploying + * @throws RemoteException In case of network/rmi error */ public synchronized void sfStart() throws SmartFrogException, RemoteException { @@ -77,17 +74,9 @@ } /** - * Override point; create a new XML listener - * - * @param hostname - * @param destFile - * @param processname - * @param suitename - * @param start - * - * @return - * - * @throws IOException + * {@inheritDoc} + * @throws SmartFrogException error while deploying + * @throws RemoteException In case of network/rmi error */ protected OneHostXMLListener createNewSingleHostListener(String hostname, File destFile, @@ -111,9 +100,8 @@ /** * {@inheritDoc} * - * @throws org.smartfrog.sfcore.common.SmartFrogException - * error while deploying - * @throws java.rmi.RemoteException In case of network/rmi error + * @throws SmartFrogException error while deploying + * @throws RemoteException In case of network/rmi error */ public synchronized void sfDeploy() throws SmartFrogException, RemoteException { Modified: trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/html/OneHostHtmlListener.java =================================================================== --- trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/html/OneHostHtmlListener.java 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/html/OneHostHtmlListener.java 2007-02-14 16:29:17 UTC (rev 3897) @@ -61,6 +61,10 @@ return title; } + /** + * {@inheritDoc} + * @throws IOException IO trouble + */ protected void writeDocumentHeader() throws IOException { writeln(XML_DECLARATION); //a strict HTML 1.1 document @@ -104,6 +108,11 @@ exit("div"); } + /** + * {@inheritDoc} + * @throws IOException IO trouble + */ + protected void writeDocumentTail() throws IOException { writeSummary(); @@ -112,6 +121,11 @@ exit("html"); } + /** + * {@inheritDoc} + * @throws IOException IO trouble + */ + private void writeSummary() throws IOException { enter("div",style("summary") + attr("id", "summary")); writeln(div("summary-title","Test Summary")); @@ -168,6 +182,11 @@ exit("div"); } + /** + * {@inheritDoc} + * @param event event + * @throws RemoteException network trouble + */ public void log(LogEntry event) throws RemoteException { String type = style(event); @@ -206,6 +225,12 @@ return attr("class", style); } + /** + * {@inheritDoc} + * @param tag element name + * @param test test + * @return xml variant + */ protected String toXML(String tag, TestInfo test) { StringBuffer body=new StringBuffer(); enter(body,"div",style("testblock")); @@ -236,7 +261,7 @@ /** * return a fault tag * - * @param fault + * @param fault fault cause * @return empty string if fault is null, else an xml declaration */ protected String toXML(ThrowableTraceInfo fault) { @@ -284,6 +309,12 @@ return result; } + /** + * Enter an element + * @param buf buffer + * @param element element name + * @param attrs attributes + */ protected void enter(StringBuffer buf, String element, String attrs) { buf.append("<"); buf.append(element); @@ -294,6 +325,11 @@ buf.append(">\n"); } + /** + * Exit an element + * @param buf buffer + * @param element element name + */ protected void exit(StringBuffer buf, String element) { buf.append("</"); buf.append(element); Modified: trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/html/OneHostXMLListener.java =================================================================== --- trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/html/OneHostXMLListener.java 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/xunit/src/org/smartfrog/services/xunit/listeners/html/OneHostXMLListener.java 2007-02-14 16:29:17 UTC (rev 3897) @@ -165,7 +165,7 @@ /** * close the file * - * @throws IOException + * @throws IOException IO trouble */ public void close() throws IOException { if (!isOpen()) { @@ -190,6 +190,10 @@ destFile = null; } + /** + * Write the tail of the document out + * @throws IOException IO trouble + */ protected void writeDocumentTail() throws IOException { write("summary", attr("tests", testCount) @@ -213,18 +217,19 @@ /** * test for the file being open * - * @return + * @return true iff the file is not null */ public boolean isOpen() { return out != null; } /** - * Flush the output stream - * @throws IOException + * Flush the output stream. Harmless if the file is closed. + * @throws IOException IO trouble */ protected void flush() throws IOException { - out.flush(); + if(isOpen()) + out.flush(); } /** @@ -241,8 +246,9 @@ * end this test suite. After calling this, caller should discard all * references; they may no longer be valid. <i>No further methods may be * called</i> + * @throws SmartFrogException containing a nested IOException */ - public void endSuite() throws RemoteException, SmartFrogException { + public void endSuite() throws SmartFrogException { try { close(); tests=null; @@ -254,8 +260,7 @@ /** * An error occurred. */ - public void addError(TestInfo test) throws RemoteException, - SmartFrogException { + public void addError(TestInfo test) { errorCount++; tests.put(test.getText(),test); } @@ -263,8 +268,7 @@ /** * A failure occurred. */ - public void addFailure(TestInfo test) throws RemoteException, - SmartFrogException { + public void addFailure(TestInfo test) { failureCount++; tests.put(test.getText(), test); } @@ -272,8 +276,7 @@ /** * A test ended. */ - public void endTest(TestInfo test) throws RemoteException, - SmartFrogException { + public void endTest(TestInfo test) throws SmartFrogException { testCount++; TestInfo cached=tests.get(test.getText()); String type; @@ -293,8 +296,7 @@ /** * A test started. */ - public void startTest(TestInfo test) throws RemoteException, - SmartFrogException { + public void startTest(TestInfo test) { //do nothing } @@ -357,11 +359,11 @@ /** * nest a string into XML * - * @param tag - * @param attrs - * @param body - * @param escape - * @return + * @param tag element name + * @param attrs attribute string (can be null) + * @param body body (can be null) + * @param escape true if the body should be escaped + * @return a new element */ protected String element(String tag, String attrs, String body, boolean escape) { StringBuffer buf = new StringBuffer(); @@ -390,11 +392,11 @@ /** - * create an attr + * create an attribute. The string is escaped. * - * @param name - * @param value - * @return + * @param name attribute name + * @param value attribute value + * @return a new attribute/value assignment string */ protected String attr(String name, String value) { if(value==null) { @@ -406,11 +408,11 @@ /** - * create an attr + * create an attribute * - * @param name - * @param value - * @return + * @param name attribute name + * @param value attribute value + * @return a new attribute */ protected String attr(String name, long value) { return name + "=\"" + Long.toString(value) + "\" "; @@ -421,7 +423,7 @@ * * @param text text to escape * @param doublequotes flag to escape double quotes (for attributes) - * @return + * @return an escaped string */ protected String escape(String text, boolean doublequotes) { if (text == null) { @@ -437,9 +439,9 @@ /** * escape a single char * - * @param c - * @param doublequotes - * @return + * @param c character in + * @param doublequotes should doublequotes be escaped? + * @return a possibly escaped char sequence */ protected String escapeChar(char c, boolean doublequotes) { switch (c) { @@ -470,9 +472,9 @@ /** * XML-ify * - * @param tag - * @param test - * @return + * @param tag tag to use for the test + * @param test the test + * @return the XML version of the test */ protected String toXML(String tag, TestInfo test) { String body = element("text", null,test.getText(),true); @@ -491,7 +493,7 @@ /** * return a fault tag * - * @param fault + * @param fault the cause of the failure * @return empty string if fault is null, else an xml declaration */ protected String toXML(ThrowableTraceInfo fault) { @@ -532,18 +534,18 @@ /** * equality test does hostname and dir * - * @param o - * @return + * @param that other instance + * @return true for a match */ - public boolean equals(Object o) { - if (this == o) { + public boolean equals(Object that) { + if (this == that) { return true; } - if (!(o instanceof OneHostXMLListener)) { + if (!(that instanceof OneHostXMLListener)) { return false; } - final OneHostXMLListener oneHostXMLListener = (OneHostXMLListener) o; + final OneHostXMLListener oneHostXMLListener = (OneHostXMLListener) that; if (!destFile.equals(oneHostXMLListener.destFile)) { return false; @@ -553,10 +555,9 @@ } /** - * hashcode is hashcode of the session ID, which makes it easy to sort in a - * sensible table. + * hashcode is hashcode of the filename * - * @return + * @return a hash code */ public int hashCode() { return destFile.toString().hashCode(); @@ -571,15 +572,31 @@ return destFile.getAbsolutePath(); } + /** + * Write a line + * @param message text message + * @throws IOException io trouble + */ protected void writeln(String message) throws IOException { out.write(message); out.write('\n'); } + /** + * Enter an element + * @param element name + * @throws IOException io trouble + */ protected void enter(String element) throws IOException { enter(element,null); } + /** + * enter an element + * @param element element name + * @param attributes attribute string + * @throws IOException IO trouble + */ protected void enter(String element,String attributes) throws IOException { if(attributes!=null) { writeln("<"+element+" "+attributes+">"); @@ -588,6 +605,11 @@ } } + /** + * Exit a named element + * @param element name + * @throws IOException io trouble + */ protected void exit(String element) throws IOException { writeln("</" + element + ">"); } Modified: trunk/core/components/xunit/src/org/smartfrog/services/xunit/serial/LogEntry.java =================================================================== --- trunk/core/components/xunit/src/org/smartfrog/services/xunit/serial/LogEntry.java 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/xunit/src/org/smartfrog/services/xunit/serial/LogEntry.java 2007-02-14 16:29:17 UTC (rev 3897) @@ -133,7 +133,7 @@ /** * Convert the level enumeration into text - * @return + * @return the level as a text string */ public String levelToText() { switch(level) { Modified: trunk/core/components/xunit/src/org/smartfrog/services/xunit/serial/TestInfo.java =================================================================== --- trunk/core/components/xunit/src/org/smartfrog/services/xunit/serial/TestInfo.java 2007-02-14 16:26:58 UTC (rev 3896) +++ trunk/core/components/xunit/src/org/smartfrog/services/xunit/serial/TestInfo.java 2007-02-14 16:29:17 UTC (rev 3897) @@ -218,6 +218,7 @@ /** * get the duration of the call ... [truncated message content] |
From: <ju...@us...> - 2007-02-22 13:03:57
|
Revision: 3915 http://svn.sourceforge.net/smartfrog/?rev=3915&view=rev Author: julgui Date: 2007-02-22 05:03:54 -0800 (Thu, 22 Feb 2007) Log Message: ----------- updated JMX Modified Paths: -------------- trunk/core/components/jmx/build.xml trunk/core/components/jmx/ivy.xml trunk/core/components/libraries.properties Modified: trunk/core/components/jmx/build.xml =================================================================== --- trunk/core/components/jmx/build.xml 2007-02-22 01:46:32 UTC (rev 3914) +++ trunk/core/components/jmx/build.xml 2007-02-22 13:03:54 UTC (rev 3915) @@ -1,460 +1,194 @@ <?xml version="1.0"?> +<project name="sfJMX" default="default"> + <!-- - /** (C) Copyright 1998-2004 Hewlett-Packard Development Company, LP - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - For more information: www.smartfrog.org - */ +/** (C) Copyright 1998-2006 Hewlett-Packard Development Company, LP + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +For more information: www.smartfrog.org + +*/ --> -<project name="sfJMX" default="all" basedir="."> - <description> - Introduction - ============ - The build script for SmartFrog sfJMX components. - To run the build script ant must be installed - and ant executable should be in the system path. +<description> + Build file for Jetty. + After deploying point your browser at http://localhost:8080 to see the web + site. - Installing the build tools - ========================== - Please go though the installation guide and install ant 1.6.5 or later. - Reference URL:http://ant.apache.org + There is also a debug servlet that can change the debug setting of a + running server. It is configured by the component HttpServerAdmin and is + run on port 8081 as part of the standard Jetty demo. + + </description> - <!-- =================================================================== --> - <!-- Initialization target --> - <!-- =================================================================== --> - <target name="init"> - <tstamp/> - <property name="Name.System" value="sfJMX"/> - <property name="Name.Company" value="(C) Copyright 1998-2005 Hewlett-Packard Development Company, LP"/> - <property name="version" value="CORE"/> - <property name="year" value="2005"/> - <echo level="verbose"> - =================================================================== - = ${Name.System} ${version} - " - = ${Name.Company} - =================================================================== - (${ant.version}) - </echo> - <available property="nice.task.present" classname="org.apache.tools.ant.taskdefs.Nice"/> - </target> - <!-- =================================================================== --> - <!-- Help on usage --> - <!-- =================================================================== --> - <target name="help" depends="init" description="Help"> - <echo message=""/> - <echo message="-------------------------------------------------------------"/> - <echo message="${Name.System} ${version} Build file"/> - <echo message="-------------------------------------------------------------"/> - <echo message="* General: "/> - <echo message=" build --> recompiles and creates all packages"/> - <echo message=" dist --> prepares distribution package (Default)"/> - <echo message=" compile --> compiles the contributed source code"/> - <echo message=" sfParseTest --> runs sfParser for 'parsertargets' file"/> - <echo message=" jdocs --> generates the Java Docs API documentation"/> - <echo message=" clean --> restores the distribution to its clean state"/> - <echo message=" release --> clean, dist, jdocs"/> - <echo message=" all --> builds all the packages"/> - <echo message=" "/> - <echo message=" help --> this help"/> - <echo message="See the comments inside the build.xml file for more details."/> - <echo message="-------------------------------------------------------------"/> - <echo message=""/> - </target> + <property name="is.component" value="false" /> + <!-- override point --> + <property file="build.properties" /> + <property name="root.dir" location="../../" /> + <property name="ivy.enabled" value="false"/> + <property name="Name.System" value="sfJMX"/> + <!-- Import common stuff --> + <!--available file="../../common.xml" property="root.dir" value="../.."/--> + <import file="${root.dir}/common.xml"/> - <!-- =================================================================== --> - <!-- Global properties --> - <!-- =================================================================== --> - <property environment="env"/> - <property name="smartfrog.home" location="${env.SFHOME}" /> - - <!-- override point --> - <property file="build.properties"/> - - <!-- properties file to modify version.sf --> - <property file="${smartfrog.home}/smartfrog-version.properties"/> - <property file="sf-build-version.properties"/> - - <property name="Version" value="${sf.majorRelease}.${sf.minorRelease}.${sf.build}${sf.status}"/> - <echo level="verbose">sfJMX version=${Version}. Using SmartFrog core version=${sf.build.version} </echo> - <!-- =================================================================== --> - <!-- Initialization path (Libs needed for compiling) --> - <!-- =================================================================== --> - <path id="smartfrog.class.path"> - <pathelement location="${smartfrog.home}/lib/smartfrog-${sf.build.version}.jar"/> - <pathelement location="${smartfrog.home}/lib/sfServices-${sf.build.version}.jar"/> - <pathelement location="${smartfrog.home}/lib/sfExamples-${sf.build.version}.jar"/> - <pathelement location="lib/jmxri.jar"/> - <pathelement location="lib/mx4j-tools.jar"/> - <pathelement location="lib/sf-scripting.jar"/> - </path> - - <!-- Release Directories --> - <property name="src" value="src"/> - <!-- where the source is --> - <property name="src.dir" location="src"/> - <!-- where the source is --> - <property name="build" location="build"/> - <!-- where the files for the jar file go --> - <!-- where the files for the jar file go --> - <property name="build.classes.dir" location="${build}"/> - <property name="dist.dir" location="dist"/> - <!-- where the files to zip go --> - <property name="releases.dir" location="releases"/> - <!-- where the dated zips go, don't clean --> - <property name="bin" value="bin"/> - <!-- where all the executables go --> - <property name="lib" value="lib"/> - <!-- where all the jar files go --> - <property name="signedLib" value="signedLib"/> - <!-- all protected files --> - <property name="docs" value="docs"/> - <property name="jdocs" value="${docs}/jdocs"/> - <property name="SFjdocs" value="${docs}/SFjdocs"/> - <property name="dist.lib.dir" location="${dist.dir}/${lib}"/> - <property name="dist.bin.dir" location="${dist.dir}/${bin}"/> - <property name="dist.src.dir" location="${dist.dir}/${src}"/> - <property name="dist.docs.dir" location="${dist.dir}/${docs}"/> - <property name="dist.jdocs.dir" location="${dist.dir}/${jdocs}"/> - <property name="dist.SFjdocs.dir" location="${dist.dir}/${SFjdocs}"/> - <property name="java.class.path" location="${dist.dir}/${SFjdocs}"/> - <!--property name="redist" value="redist"/ --> - <property name="examplesFiles" value="org/smartfrog/examples/**/*"/> - <!-- a list of files for rmic --> - <property name="rmitargets" value="${basedir}/rmitargets"/> - <!-- assume the sun compiler --> - <property name="rmic.compiler" value="sun"/> - <!-- Compile options for Smartfrog Release --> - <property name="javac.debug.mode" value="on"/> - <!-- turn on compile -g --> - <property name="javac.debug.level" value="lines,vars,source"/> - <property name="javac.java.version" value="1.4"/> - <property name="build.compiler" value="modern"/> - <property name="javac.compiler" value="${build.compiler}"/> - <!-- override point for javacc --> - <property name="javacc.dir" location="javacc"/> - <!-- ================================================================== --> - <!-- running Version.java to generate version information --> - <!-- ================================================================== --> + + <!-- ========================================================== --> + <!-- ========================================================== --> - <target name="generateversion" depends="initbuild"> - <echo level="verbose">version=${Version}</echo> - </target> - <!-- =================================================================== --> - <!-- Release --> - <!-- =================================================================== --> - <target name="release" depends="clean, dist,jdocs" description="Creates clean new release"> </target> - <!-- =================================================================== --> - <!-- --> - <!-- =================================================================== --> - <target name="initbuild" depends="init"> - <mkdir dir="${build}"/> - <mkdir dir="${build.classes.dir}"/> - </target> - <!-- =================================================================== --> - <!-- --> - <!-- =================================================================== --> - <target name="initdist" depends="init"> - <mkdir dir="${dist.dir}"/> - <delete dir="${dist.lib.dir}" failonerror="false"/> - <mkdir dir="${dist.lib.dir}"/> - <mkdir dir="${dist.bin.dir}"/> - <mkdir dir="${dist.docs.dir}"/> - <mkdir dir="${dist.src.dir}"/> - </target> - <!-- =================================================================== --> - <!-- FixCRLF for different platforms only inside DIST! --> - <!-- =================================================================== --> - <target name="fixCRLF" depends="copybins" description="adapts CRLF for different OS"> </target> - <!-- =================================================================== --> - <!-- --> - <!-- =================================================================== --> - <target name="initrelease" depends="init"> - <!-- Create the time stamp --> + <target name="init" depends="init-standard-output-dirs,use-smartfrog-tasks"> + + <property name="example.path" value="/org/smartfrog/services/jmx/example"/> + <property name="deploy.sf" value="${example.path}/example1.sf"/> + <property name="manifestName" + value="${smartfrog.home}/private/sealManifest.mf"/> <tstamp/> - <mkdir dir="${releases.dir}"/> + + + <echo level="verbose">sfJMX home=${runtime.sfJMX.home}</echo> + </target> - <!-- =================================================================== --> - <!-- Compiles source directory --> - <!-- =================================================================== --> - <target name="compile-source" depends="initbuild" description="Compiles the source code"> - <!-- use better dependency logic --> - <!-- - <depend srcdir="${src.dir}" - destdir="${build.classes.dir}" - cache="${build}/testdepends" - closure="yes"/> - --> - <!-- Compile the java code --> - <echo>${javac.java.version} build.compiler=${build.compiler} javac.compiler=${javac.compiler}</echo> - <javac compiler="${javac.compiler}" srcdir="${src.dir}" includes="**/*.java" destdir="${build.classes.dir}" debug="${javac.debug.mode}" debuglevel="${javac.debug.level}" includeAntRuntime="false" source="${javac.java.version}" target="${javac.java.version}"> - <classpath refid="smartfrog.class.path"/> - </javac> + + <target name="all" depends="dist,test" + description="Create a distribution and run tests"/> + + <!-- ========================================================== --> + <!-- this is an override point --> + <!-- set the verified.ok property if everything needed is present --> + <!-- Do Not Fail. This test is used to control conditional builds --> + <!-- NB, set property verify.fail.message to something meaningful + for better diagnostic messages on failure (see assert-prerequisites) + --> + <!-- ========================================================== --> + <target name="verify-prerequisites" depends="pre-verify-prerequisites"> + <available property="verified.ok" + classname="mx4j.MX4JSystemKeys" + classpathref="compile.classpath" + ignoresystemclasses="false"/> + <property name="verify.fail.message" + value="No sfJMX found"/> </target> - <target name="compile-rmi" depends="compile-source"> - <!-- - the RMI compile is split in two, as the compiler could not - handle it otherwise. - It is tempting to run these in parallel, to get speedup on multiway - CPUs, but as the SunRmic adapter runs rmic in-VM, that is too dangerous. - We'd need to fork rmic to get decent isolation. - --> - <rmic includesfile="${rmitargets}" compiler="${rmic.compiler}" stubversion="1.2" base="${build.classes.dir}"> - <classpath refid="smartfrog.class.path"/> - </rmic> - </target> - <target name="compile" depends="compile-rmi" description="Compiles the source code"/> - <!-- =================================================================== --> - <!-- Copy default.sf and default.ini files to "src/org/smartfrog" directory --> - <!-- so that they can be used with security on --> - <!-- =================================================================== --> - <target name="copyDefault" depends="initbuild"> - <copy todir="${build.classes.dir}/org/smartfrog"> - <fileset dir="${bin}"> - <include name="default.sf"/> - <include name="default.ini"/> - </fileset> - </copy> - </target> - <!-- =================================================================== --> - <!-- Copy .sf files to "build" directories --> - <!-- =================================================================== --> - <target name="copySF" depends="initbuild"> - <copy todir="${build.classes.dir}"> - <fileset dir="${src.dir}"> - <include name="**/*.sf*"/> - </fileset> - </copy> - </target> - <!-- =================================================================== --> - <!-- Copy .sfcd files to "build" directories --> - <!-- These files should contain a list of configuration descriptors --> - <!-- =================================================================== --> - <target name="copySFCD" depends="initbuild"> - <copy todir="${build.classes.dir}"> - <fileset dir="${src.dir}"> - <include name="**/*.sfcd*"/> - </fileset> - </copy> - </target> - <!-- =================================================================== --> - <!-- Copy .bat files to "build" directories --> - <!-- =================================================================== --> - <target name="copyBAT" depends="initbuild"> - <copy todir="${build.classes.dir}"> - <fileset dir="${src.dir}"> - <include name="**/*.bat*"/> - </fileset> - </copy> - </target> - <!-- =================================================================== --> - <!-- Copy .html files to "build" directories --> - <!-- =================================================================== --> - <target name="copyHTML" depends="initbuild"> - <copy todir="${build.classes.dir}"> - <fileset dir="${src.dir}"> - <include name="**/*.htm*"/> - </fileset> - </copy> - </target> - <!-- =================================================================== --> - <!-- Copy Gif files to "build" directories --> - <!-- =================================================================== --> - <target name="copyGif" depends="initbuild"> - <copy todir="${build.classes.dir}"> - <fileset dir="${src.dir}"> - <include name="**/*.gif"/> - </fileset> - </copy> - </target> - <!-- =================================================================== --> - <!-- --> - <!-- =================================================================== --> - <target name="copylibs" depends="initdist"> - <copy todir="${dist.lib.dir}"> - <fileset dir="${lib}"> - <include name="**/*.jar"/> - </fileset> - </copy> - </target> - <!-- =================================================================== --> - <!-- Copy binary files. --> - <!-- execute permissions are set on binary stuff, permissions that get --> - <!-- lost --> - <!-- =================================================================== --> - <target name="copybins" depends="initdist"> - <copy todir="${dist.bin.dir}"> - <fileset dir="${bin}"> - <include name="**/*"/> - <exclude name="**/*.bak"/> - <exclude name="**/tools"/> - </fileset> - </copy> - <chmod dir="${dist.bin.dir}" perm="ugo+rx" excludes="**/*.ico, **/*.ini, **/*.sf*,**/*.bat"/> - <chmod dir="${dist.bin.dir}/security" perm="ugo+rx" excludes="**/*.ico, **/*.ini, **/*.sf*,**/*.bat"/> + <!-- ========================================================== --> + <!-- parse the file --> + <!-- ========================================================== --> + <target name="parse" depends="init,package" + description="parse the deployment descriptor"> + <sf-parse quiet="true" file="${src.dir}/org/smartfrog/services/jmx/example/sfJMXAgent.sf" + classpathref="exec.classpath"> + </sf-parse> + <sf-parse quiet="true" file="${src.dir}/org/smartfrog/services/jmx/example/sfmbean.sf" + classpathref="exec.classpath"> + </sf-parse> + <sf-parse quiet="true" file="${src.dir}/org/smartfrog/services/jmx/example/dynamicmbean.sf" + classpathref="exec.classpath"> + </sf-parse> + <sf-parse quiet="true" file="${src.dir}/org/smartfrog/services/jmx/example/modelmbean.sf" + classpathref="exec.classpath"> + </sf-parse> + <sf-parse quiet="true" file="${src.dir}/org/smartfrog/services/jmx/example/mbeanDeployer/jmxSubagents.sf" + classpathref="exec.classpath"> + </sf-parse> + <sf-parse quiet="true" file="${src.dir}/org/smartfrog/services/jmx/example/mbeanDeployer/simpleMBeanDeployerExample.sf" + classpathref="exec.classpath"> + </sf-parse> + <sf-parse quiet="true" file="${src.dir}/org/smartfrog/services/jmx/example/mbeanDeployer/jmxSimpleMasterAgent.sf" + classpathref="exec.classpath"> + </sf-parse> + <sf-parse quiet="true" file="${src.dir}/org/smartfrog/services/jmx/example/arithNetManager/launchSubagents.sf" + classpathref="exec.classpath"> + </sf-parse> + <sf-parse quiet="true" file="${src.dir}/org/smartfrog/services/jmx/example/arithNetManager/launchArithExample.sf" + classpathref="exec.classpath"> + </sf-parse> + </target> + + + <!-- ========================================================== --> + <!-- this is an override, as we add a manifest --> + <!-- create the jar --> + <!-- ========================================================== --> + <target name="dist" depends="common.dist,jdocs,parse" description="create a full distribution"> + <copy todir="${dist.lib.dir}"> + <fileset dir="${lib.dir}"/> + </copy> + + <copy todir="${dist.doc.dir}"> + <fileset dir="${doc.dir}"/> + </copy> + + <copy todir="${dist.src.dir}"> + <fileset dir="${src.dir}"> + <include name="**/examples/**"/> + </fileset> + </copy> + <copy tofile="${dist.dir}/build.xml" file="releaseBuild.xml"/> + <copy tofile="${dist.dir}/build.example.properties" file="build.example.properties" failonerror="false"/> </target> + <!-- =================================================================== --> - <!-- Copy PDF, HTML files from docs to dist/docs --> - <!-- =================================================================== --> - <target name="copydocs" depends="initdist"> - <copy todir="${dist.docs.dir}"> - <fileset dir="${docs}"> - <include name="**/*.pdf"/> - <include name="**/*.html"/> - <include name="**/*.htm"/> - </fileset> - </copy> - </target> - <!-- =================================================================== --> - <!-- --> - <!-- =================================================================== --> - <target name="copyexamples" depends="initdist"> - <copy todir="${dist.src.dir}"> - <fileset dir="${src.dir}"> - <include name="${examplesFiles}"/> - <exclude name="**/*.dfPackage"/> - </fileset> - </copy> - </target> - <!-- =================================================================== --> <!-- JDocs --> <!-- =================================================================== --> - <target name="jdocs" depends="initdist,generateversion" description="Generates the API documentation"> - <!-- Java Docs for all --> - <echo message=""/> - <echo message="------------------------------------------------------------------------"/> - <echo message=" Creating Java Docs for ${Name.System} ${version} [${dist.dir}/${jdocs}]"/> - <echo message="------------------------------------------------------------------------"/> - <mkdir dir="${dist.jdocs.dir}"/> - <javadoc - packagenames="org.smartfrog.*" - sourcepath="${src.dir}" - destdir="${dist.jdocs.dir}" - author="true" - version="true" - use="true" - windowtitle="${Name.System}" - Header="${Name.System} ${Version}" - Footer="${Name.System} ${version} ${Version}" - doctitle="${Name.System}" - bottom="${Name.Company}" - source="${javac.java.version}"> - <group title="SmartFrog Packages" packages="org.smartfrog.*"/> - <classpath refid="smartfrog.class.path"/> - </javadoc> - <!-- Java doc for the grammars --> - <exec executable="java"> - <arg line="-cp ${javacc.dir}/javacc.jar"/> - <arg line="jjdoc"/> - <arg line="-OUTPUT_FILE=${docs}/DefaultParser.html"/> - <arg line="${src}/org/smartfrog/sfcore/languages/sf/DefaultParser.jj"/> - </exec> - </target> - <!-- =================================================================== --> - <!-- BUILD --> - <!-- =================================================================== --> - <target name="prebuild" - depends="initbuild,generateversion,compile,copySF,copyGif,copyBAT,copyHTML,copyDefault,copySFCD" /> + <target name="jdocs" depends="javadoc" description="Generates the API documentation"/> - <target name="build" - depends="prebuild" - description="Recompile and create all packages"/> <!-- =================================================================== --> - <!-- Jar Files --> + <!-- system tests --> <!-- =================================================================== --> - - <target name="target-names" depends="init,generateversion"> - <property name="sfJMX.stub" value="sf-JMX-${Version}" /> - <property name="sfJMX.jar" - location="${dist.lib.dir}/${sfJMX.stub}.jar" /> + <target name="system-tests" depends="common.system-tests" + description="run system tests" + if="system.tests.enabled"> + <sf-functionaltest testTimeout="600" shutdownTime="10"> + <application> + <sf-startdaemon-debug failonerror="false" spawn="false"/> + </application> + <probe> + <socket port="${smartfrog.daemon.port}" server="localhost"/> + </probe> + <test> + <sf-junit + includeantruntime="true" + filtertrace="${filter.trace}" + errorproperty="failure" + failureproperty="failure" + > + <classpath + refid="tests.run.classpath"/> + <sysproperty key="test.files.dir" + value="${test.src.dir}/files"/> + <sysproperty key="sfJMX.home" + value="${test.src.dir}/files/sfjmxhome"/> + <syspropertyset> + <propertyref prefix="runtime"/> + </syspropertyset> + <batchtest todir="${test.data.dir}"> + <fileset dir="${test.classes.dir}"> + <include name="**/unit/*Test.class"/> + <include name="**/system/**/*Test.class" /> + </fileset> + </batchtest> + </sf-junit> + <fail if="failure">Junit failed</fail> + </test> + <teardown> + <sf-stopdaemon failonerror="false"/> + <sf-junitreport data="${test.data.dir}" + reports="${test.reports.dir}" + /> + </teardown> + </sf-functionaltest> </target> - - <!-- sfJMX Jar --> - <target name="sfJMXJar" depends="build,target-names"> - <jar jarfile="${sfJMX.jar}" basedir="${build.classes.dir}" includes="**/**" /> - </target> - - <target name="jars" depends="initdist,sfJMXJar"> - </target> - - - <!-- =================================================================== --> - <!-- create security buld file --> - <!-- =================================================================== --> - <target name="buildSetup"> - <copy tofile="${dist.dir}/parsertargets" file="parsertargets"/> - <copy tofile="${dist.dir}/COPYRIGHT.txt" file="COPYRIGHT.txt"/> - <copy tofile="${dist.dir}/LICENSE.txt" file="LICENSE.txt"/> - <copy tofile="${dist.dir}/changes.txt" file="changes.txt"/> - <copy tofile="${dist.dir}/readme.txt" file="readme.txt"/> - </target> - <!-- =================================================================== --> - <!-- DIST --> - <!-- =================================================================== --> - <target name="dist" depends="build,initdist,jars,copylibs,copybins,copydocs, copyexamples,buildSetup,fixCRLF,srczip" description="Prepares distribution package"> - </target> - <!-- =================================================================== --> - <!-- src.zip --> - <!-- =================================================================== --> - <target name="srczip" depends="initdist" description="Creates src.zip with SF sources"> - <zip destfile="${dist.dir}/src.zip"> - <zipfileset dir="${src}"> - <include name="**/**"/> - <exclude name="**/*.dfPackage"/> - </zipfileset> - </zip> - </target> - <!-- =================================================================== --> - <!-- clean --> - <!-- =================================================================== --> - <target name="clean" depends="init" description="Restores the distribution to its clean state"> - <!-- Delete the ${build} ${dist.dir} ${jdocs} directory trees --> - <!-- remove parser source files --> - <delete dir="${build}" failonerror="false"/> - <delete dir="${dist.dir}" failonerror="false"/> - </target> - <!-- =================================================================== --> - <!-- a clean distribution --> - <!-- =================================================================== --> - <target name="fromclean" depends="clean,sfParseTest,dist"/> - <!-- =================================================================== --> - <!-- sfParse parsertargets --> - <!-- =================================================================== --> - <target name="sfParseTest" depends="build,jars"> - <java classname="org.smartfrog.SFParse" failonerror="true" fork="true"> - <!--classpathref="smartfrog.run.class.path"--> - <classpath> - <pathelement location="${smartfrog.home}/lib/smartfrog-${sf.build.version}.jar"/> - <pathelement location="${smartfrog.home}/lib/sfServices-${sf.build.version}.jar"/> - <pathelement location="${smartfrog.home}/lib/sfExamples-${sf.build.version}.jar"/> - <pathelement location="${dist.lib.dir}/sf-scripting.jar"/> - <pathelement location="${dist.lib.dir}/sf-JMX-${Version}.jar"/> - </classpath> - <arg value="-R"/> - <!--<arg value="-r"/> --> - <arg value="-q"/> - <arg value="-f"/> - <arg file="parsertargets"/> - </java> - </target> - <!-- =================================================================== --> - <!-- do everything --> - <!-- =================================================================== --> - <target name="all" depends="dist,sfParseTest" description="creates all the packages required to run smartfrog, and validate any .sf in the package"> </target> - <target name="default" depends="all" description="default target for the project; invokes 'all'"/> - </project> -<!-- End of file --> Modified: trunk/core/components/jmx/ivy.xml =================================================================== --- trunk/core/components/jmx/ivy.xml 2007-02-22 01:46:32 UTC (rev 3914) +++ trunk/core/components/jmx/ivy.xml 2007-02-22 13:03:54 UTC (rev 3915) @@ -45,6 +45,11 @@ rev="latest.integration" conf="compile,runtime,daemon->services"/> <dependency org="org.smartfrog" + name="smartfrog" + changing="true" + rev="latest.integration" + conf="compile,runtime,daemon->examples"/> + <dependency org="org.smartfrog" name="sf-tasks" rev="latest.integration" conf="build->default"/> @@ -60,5 +65,9 @@ name="mx4j-remote" rev="${mx4j.version}" conf="compile,redist->default"/> + <dependency org="mx4j" + name="mx4j-tools" + rev="${mx4j.version}" + conf="compile,redist->default"/> </dependencies> </ivy-module> \ No newline at end of file Modified: trunk/core/components/libraries.properties =================================================================== --- trunk/core/components/libraries.properties 2007-02-22 01:46:32 UTC (rev 3914) +++ trunk/core/components/libraries.properties 2007-02-22 13:03:54 UTC (rev 3915) @@ -1,4 +1,4 @@ -#this file declares the libraries for use in +#this file declares the libraries for use in #a given release of the components #please keep in alphabetical order, after splitting to in Maven/not in maven This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-02-26 17:17:54
|
Revision: 3935 http://svn.sourceforge.net/smartfrog/?rev=3935&view=rev Author: steve_l Date: 2007-02-26 09:16:11 -0800 (Mon, 26 Feb 2007) Log Message: ----------- This is the mysql tests working. We can deploy mysql and run transactions as part of a workflow Modified Paths: -------------- trunk/core/components/database/src/org/smartfrog/services/database/core/components.sf trunk/core/components/database/src/org/smartfrog/services/database/core/operations.sf trunk/core/components/database/src/org/smartfrog/services/database/mysql/binding.sf trunk/core/components/database/src/org/smartfrog/services/database/mysql/operations.sf trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/components.sf trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/hsqldb/ConnectionOpenTest.sf trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/hsqldb/HsqldbTest.java trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/hsqldb/TableManipulationTest.sf trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/hsqldb/components.sf trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/IsMysqlLiveTest.sf trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/MysqlStartTest.sf trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/MysqlTest.java trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/ShutdownTest.sf trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/TableManipulationTest.sf trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/components.sf trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/mysql-sfunit.sf trunk/core/components/xunit/src/org/smartfrog/services/xunit/log/TestListenerLogImpl.java Added Paths: ----------- trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/CheckNoMysqlTest.sf trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/UserManipulationTest.sf Modified: trunk/core/components/database/src/org/smartfrog/services/database/core/components.sf =================================================================== --- trunk/core/components/database/src/org/smartfrog/services/database/core/components.sf 2007-02-26 14:58:02 UTC (rev 3934) +++ trunk/core/components/database/src/org/smartfrog/services/database/core/components.sf 2007-02-26 17:16:11 UTC (rev 3935) @@ -64,15 +64,9 @@ classpath extends OptionalCD { description "a classpath component describing classes needed by the JDBC driver"; } - }; - + } } - - - - - /** * an operation under a database */ Modified: trunk/core/components/database/src/org/smartfrog/services/database/core/operations.sf =================================================================== --- trunk/core/components/database/src/org/smartfrog/services/database/core/operations.sf 2007-02-26 14:58:02 UTC (rev 3934) +++ trunk/core/components/database/src/org/smartfrog/services/database/core/operations.sf 2007-02-26 17:16:11 UTC (rev 3935) @@ -25,6 +25,7 @@ /** Create any user + */ CreateUser extends Transaction { username TBD; @@ -62,4 +63,5 @@ sqlCommands [ ("DROP TABLE " ++ table) ]; - } \ No newline at end of file + } + Modified: trunk/core/components/database/src/org/smartfrog/services/database/mysql/binding.sf =================================================================== --- trunk/core/components/database/src/org/smartfrog/services/database/mysql/binding.sf 2007-02-26 14:58:02 UTC (rev 3934) +++ trunk/core/components/database/src/org/smartfrog/services/database/mysql/binding.sf 2007-02-26 17:16:11 UTC (rev 3935) @@ -41,16 +41,17 @@ } /** - * Add host and database names to the binding + * Add host, port and database names to the binding + * Note that SmartFrog requires a ++ to have spaces between things as it can be + * used in a reference name */ MysqlTargetedBinding extends MysqlBinding { - host locahost; + host "locahost"; //port port 3306; database ""; _db LAZY database; - - // url (((((binding_prefix ++ host) ++ ":" ) ++ port) ++ "/") ++ _db); + url (((((binding_prefix ++ host) ++ ":" ) ++ port) ++ "/") ++ _db); } /** Modified: trunk/core/components/database/src/org/smartfrog/services/database/mysql/operations.sf =================================================================== --- trunk/core/components/database/src/org/smartfrog/services/database/mysql/operations.sf 2007-02-26 14:58:02 UTC (rev 3934) +++ trunk/core/components/database/src/org/smartfrog/services/database/mysql/operations.sf 2007-02-26 17:16:11 UTC (rev 3935) @@ -1,4 +1,4 @@ -/** (C) Copyright 2006 Hewlett-Packard Development Company, LP +/** (C) Copyright 2007 Hewlett-Packard Development Company, LP This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -37,3 +37,22 @@ ]; } + /** + * create a database + */ + CreateDatabase extends Transaction { + name TBD; + sqlCommands [ + ("CREATE DATABASE " ++ name) + ]; + } + + /** + * drop a database + */ + DropDatabase extends Transaction { + name TBD; + sqlCommands [ + ("DROP DATABASE " ++ name) + ]; + } Modified: trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/components.sf =================================================================== --- trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/components.sf 2007-02-26 14:58:02 UTC (rev 3934) +++ trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/components.sf 2007-02-26 17:16:11 UTC (rev 3935) @@ -61,29 +61,3 @@ } - /** - Create any user - */ -/* - CreateUser extends Transaction { - username TBD; - password TBD; - sqlCommands [ - (("CREATE USER " ++ username ) ++ (" PASSWORD " ++ password)) - ]; - } - - DropUser extends Transaction { - username TBD; - sqlCommands [ - ("DROP USER " ++ username ) - ]; - } - - DropTable extends Transaction { - table TBD; - sqlCommands [ - ("DROP TABLE " ++ table) - ]; - } -*/ Modified: trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/hsqldb/ConnectionOpenTest.sf =================================================================== --- trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/hsqldb/ConnectionOpenTest.sf 2007-02-26 14:58:02 UTC (rev 3934) +++ trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/hsqldb/ConnectionOpenTest.sf 2007-02-26 17:16:11 UTC (rev 3935) @@ -1,4 +1,35 @@ +/** (C) Copyright 2007 Hewlett-Packard Development Company, LP + Disclaimer of Warranty + + The Software is provided "AS IS," without a warranty of any kind. ALL + EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, + INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A + PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE HEREBY + EXCLUDED. SmartFrog is not a Hewlett-Packard Product. The Software has + not undergone complete testing and may contain errors and defects. It + may not function properly and is subject to change or withdrawal at + any time. The user must assume the entire risk of using the + Software. No support or maintenance is provided with the Software by + Hewlett-Packard. Do not install the Software if you are not accustomed + to using experimental software. + + Limitation of Liability + + TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL HEWLETT-PACKARD + OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR + FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, + HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF + OR RELATED TO THE FURNISHING, PERFORMANCE, OR USE OF THE SOFTWARE, OR + THE INABILITY TO USE THE SOFTWARE, EVEN IF HEWLETT-PACKARD HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. FURTHERMORE, SINCE THE + SOFTWARE IS PROVIDED WITHOUT CHARGE, YOU AGREE THAT THERE HAS BEEN NO + BARGAIN MADE FOR ANY ASSUMPTIONS OF LIABILITY OR DAMAGES BY + HEWLETT-PACKARD FOR ANY REASON WHATSOEVER, RELATING TO THE SOFTWARE OR + ITS MEDIA, AND YOU HEREBY WAIVE ANY CLAIM IN THIS REGARD. + + */ + #include "/org/smartfrog/services/database/test/system/core/hsqldb/components.sf"; Modified: trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/hsqldb/HsqldbTest.java =================================================================== --- trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/hsqldb/HsqldbTest.java 2007-02-26 14:58:02 UTC (rev 3934) +++ trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/hsqldb/HsqldbTest.java 2007-02-26 17:16:11 UTC (rev 3935) @@ -1,3 +1,35 @@ +/** (C) Copyright 2007 Hewlett-Packard Development Company, LP + + Disclaimer of Warranty + + The Software is provided "AS IS," without a warranty of any kind. ALL + EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, + INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A + PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE HEREBY + EXCLUDED. SmartFrog is not a Hewlett-Packard Product. The Software has + not undergone complete testing and may contain errors and defects. It + may not function properly and is subject to change or withdrawal at + any time. The user must assume the entire risk of using the + Software. No support or maintenance is provided with the Software by + Hewlett-Packard. Do not install the Software if you are not accustomed + to using experimental software. + + Limitation of Liability + + TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL HEWLETT-PACKARD + OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR + FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, + HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF + OR RELATED TO THE FURNISHING, PERFORMANCE, OR USE OF THE SOFTWARE, OR + THE INABILITY TO USE THE SOFTWARE, EVEN IF HEWLETT-PACKARD HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. FURTHERMORE, SINCE THE + SOFTWARE IS PROVIDED WITHOUT CHARGE, YOU AGREE THAT THERE HAS BEEN NO + BARGAIN MADE FOR ANY ASSUMPTIONS OF LIABILITY OR DAMAGES BY + HEWLETT-PACKARD FOR ANY REASON WHATSOEVER, RELATING TO THE SOFTWARE OR + ITS MEDIA, AND YOU HEREBY WAIVE ANY CLAIM IN THIS REGARD. + + */ + package org.smartfrog.services.database.test.system.core.hsqldb; import org.smartfrog.test.DeployingTestBase; Modified: trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/hsqldb/TableManipulationTest.sf =================================================================== --- trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/hsqldb/TableManipulationTest.sf 2007-02-26 14:58:02 UTC (rev 3934) +++ trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/hsqldb/TableManipulationTest.sf 2007-02-26 17:16:11 UTC (rev 3935) @@ -1,4 +1,35 @@ +/** (C) Copyright 2007 Hewlett-Packard Development Company, LP +Disclaimer of Warranty + +The Software is provided "AS IS," without a warranty of any kind. ALL +EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, +INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE HEREBY +EXCLUDED. SmartFrog is not a Hewlett-Packard Product. The Software has +not undergone complete testing and may contain errors and defects. It +may not function properly and is subject to change or withdrawal at +any time. The user must assume the entire risk of using the +Software. No support or maintenance is provided with the Software by +Hewlett-Packard. Do not install the Software if you are not accustomed +to using experimental software. + +Limitation of Liability + +TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL HEWLETT-PACKARD +OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR +FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, +HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF +OR RELATED TO THE FURNISHING, PERFORMANCE, OR USE OF THE SOFTWARE, OR +THE INABILITY TO USE THE SOFTWARE, EVEN IF HEWLETT-PACKARD HAS BEEN +ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. FURTHERMORE, SINCE THE +SOFTWARE IS PROVIDED WITHOUT CHARGE, YOU AGREE THAT THERE HAS BEEN NO +BARGAIN MADE FOR ANY ASSUMPTIONS OF LIABILITY OR DAMAGES BY +HEWLETT-PACKARD FOR ANY REASON WHATSOEVER, RELATING TO THE SOFTWARE OR +ITS MEDIA, AND YOU HEREBY WAIVE ANY CLAIM IN THIS REGARD. + +*/ + #include "/org/smartfrog/services/database/test/system/core/hsqldb/components.sf"; Modified: trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/hsqldb/components.sf =================================================================== --- trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/hsqldb/components.sf 2007-02-26 14:58:02 UTC (rev 3934) +++ trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/hsqldb/components.sf 2007-02-26 17:16:11 UTC (rev 3935) @@ -26,10 +26,17 @@ #include "/org/smartfrog/services/database/test/system/core/components.sf"; #include "/org/smartfrog/services/database/hsqldb/components.sf"; - memorydb "memory"; - testUser "testUser"; - testPass "secret"; +Settings extends { + memorydb "memory"; + testUser "testUser"; + testPass "secret"; + } + + memorydb Settings:memorydb; + testUser Settings:testUser; + testPass Settings:testPass; + TestDB extends HsqldbBinding { url "jdbc:hsqldb:mem:test"; } Added: trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/CheckNoMysqlTest.sf =================================================================== --- trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/CheckNoMysqlTest.sf (rev 0) +++ trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/CheckNoMysqlTest.sf 2007-02-26 17:16:11 UTC (rev 3935) @@ -0,0 +1,57 @@ +/** (C) Copyright 2007 Hewlett-Packard Development Company, LP + +Disclaimer of Warranty + +The Software is provided "AS IS," without a warranty of any kind. ALL +EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, +INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE HEREBY +EXCLUDED. SmartFrog is not a Hewlett-Packard Product. The Software has +not undergone complete testing and may contain errors and defects. It +may not function properly and is subject to change or withdrawal at +any time. The user must assume the entire risk of using the +Software. No support or maintenance is provided with the Software by +Hewlett-Packard. Do not install the Software if you are not accustomed +to using experimental software. + +Limitation of Liability + +TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL HEWLETT-PACKARD +OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR +FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, +HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF +OR RELATED TO THE FURNISHING, PERFORMANCE, OR USE OF THE SOFTWARE, OR +THE INABILITY TO USE THE SOFTWARE, EVEN IF HEWLETT-PACKARD HAS BEEN +ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. FURTHERMORE, SINCE THE +SOFTWARE IS PROVIDED WITHOUT CHARGE, YOU AGREE THAT THERE HAS BEEN NO +BARGAIN MADE FOR ANY ASSUMPTIONS OF LIABILITY OR DAMAGES BY +HEWLETT-PACKARD FOR ANY REASON WHATSOEVER, RELATING TO THE SOFTWARE OR +ITS MEDIA, AND YOU HEREBY WAIVE ANY CLAIM IN THIS REGARD. + +*/ + +#include "/org/smartfrog/services/database/test/system/core/mysql/components.sf"; + +CheckNoMysqlTest extends TestCompound { + + description "check that mysql is not already running; fail if the port is in use"; + + sfShouldTerminate false; + + action extends MysqlBinding; + + database LAZY action; + + tests extends EvaluateCondition { + condition extends Not { + condition extends IsMysqlLive { + database LAZY PARENT:ATTRIB database; + } + } + message "Mysqld is already running on this machine and port"; + } + + } + + +sfConfig extends CheckNoMysqlTest; \ No newline at end of file Modified: trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/IsMysqlLiveTest.sf =================================================================== --- trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/IsMysqlLiveTest.sf 2007-02-26 14:58:02 UTC (rev 3934) +++ trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/IsMysqlLiveTest.sf 2007-02-26 17:16:11 UTC (rev 3935) @@ -1,4 +1,35 @@ +/** (C) Copyright 2007 Hewlett-Packard Development Company, LP +Disclaimer of Warranty + +The Software is provided "AS IS," without a warranty of any kind. ALL +EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, +INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE HEREBY +EXCLUDED. SmartFrog is not a Hewlett-Packard Product. The Software has +not undergone complete testing and may contain errors and defects. It +may not function properly and is subject to change or withdrawal at +any time. The user must assume the entire risk of using the +Software. No support or maintenance is provided with the Software by +Hewlett-Packard. Do not install the Software if you are not accustomed +to using experimental software. + +Limitation of Liability + +TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL HEWLETT-PACKARD +OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR +FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, +HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF +OR RELATED TO THE FURNISHING, PERFORMANCE, OR USE OF THE SOFTWARE, OR +THE INABILITY TO USE THE SOFTWARE, EVEN IF HEWLETT-PACKARD HAS BEEN +ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. FURTHERMORE, SINCE THE +SOFTWARE IS PROVIDED WITHOUT CHARGE, YOU AGREE THAT THERE HAS BEEN NO +BARGAIN MADE FOR ANY ASSUMPTIONS OF LIABILITY OR DAMAGES BY +HEWLETT-PACKARD FOR ANY REASON WHATSOEVER, RELATING TO THE SOFTWARE OR +ITS MEDIA, AND YOU HEREBY WAIVE ANY CLAIM IN THIS REGARD. + +*/ + #include "/org/smartfrog/services/database/test/system/core/mysql/ConnectionOpenTest.sf"; Modified: trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/MysqlStartTest.sf =================================================================== --- trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/MysqlStartTest.sf 2007-02-26 14:58:02 UTC (rev 3934) +++ trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/MysqlStartTest.sf 2007-02-26 17:16:11 UTC (rev 3935) @@ -1,4 +1,35 @@ +/** (C) Copyright 2007 Hewlett-Packard Development Company, LP +Disclaimer of Warranty + +The Software is provided "AS IS," without a warranty of any kind. ALL +EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, +INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE HEREBY +EXCLUDED. SmartFrog is not a Hewlett-Packard Product. The Software has +not undergone complete testing and may contain errors and defects. It +may not function properly and is subject to change or withdrawal at +any time. The user must assume the entire risk of using the +Software. No support or maintenance is provided with the Software by +Hewlett-Packard. Do not install the Software if you are not accustomed +to using experimental software. + +Limitation of Liability + +TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL HEWLETT-PACKARD +OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR +FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, +HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF +OR RELATED TO THE FURNISHING, PERFORMANCE, OR USE OF THE SOFTWARE, OR +THE INABILITY TO USE THE SOFTWARE, EVEN IF HEWLETT-PACKARD HAS BEEN +ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. FURTHERMORE, SINCE THE +SOFTWARE IS PROVIDED WITHOUT CHARGE, YOU AGREE THAT THERE HAS BEEN NO +BARGAIN MADE FOR ANY ASSUMPTIONS OF LIABILITY OR DAMAGES BY +HEWLETT-PACKARD FOR ANY REASON WHATSOEVER, RELATING TO THE SOFTWARE OR +ITS MEDIA, AND YOU HEREBY WAIVE ANY CLAIM IN THIS REGARD. + +*/ + #include "/org/smartfrog/services/database/test/system/core/mysql/ConnectionOpenTest.sf"; @@ -11,7 +42,7 @@ //pause for a bit delay extends Delay { - time mysql_startup_delay; + time Settings:mysql_startup_delay; } //look for the socket Modified: trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/MysqlTest.java =================================================================== --- trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/MysqlTest.java 2007-02-26 14:58:02 UTC (rev 3934) +++ trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/MysqlTest.java 2007-02-26 17:16:11 UTC (rev 3935) @@ -13,27 +13,38 @@ super(name); } - public void testTableManipulationTest() throws Throwable { - deployAndTerminate("TableManipulationTest"); + + public void testCheckNoMysql() throws Throwable { + deployAndTerminate("CheckNoMysqlTest"); } - public void testConnectionOpenTest() throws Throwable { deployAndTerminate("ConnectionOpenTest"); } - public void testIsMysqlLiveTest() throws Throwable { + public void testIsMysqlLive() throws Throwable { deployAndTerminate("IsMysqlLiveTest"); } - public void testMysqlStartTest() throws Throwable { + public void testMysqlStart() throws Throwable { deployAndTerminate("MysqlStartTest"); } - public void testShutdownTest() throws Throwable { + public void testShutdown() throws Throwable { deployAndTerminate("ShutdownTest"); } + public void testTableManipulation() throws Throwable { + deployAndTerminate("TableManipulationTest"); + } + + /* + *@skip: only works if you deploy mysql in grant-tables mode + */ + public void NotestUserManipulation() throws Throwable { + deployAndTerminate("UserManipulationTest"); + } + private void deployAndTerminate(String template) throws Throwable { application = deployExpectingSuccess( BASE + template +".sf", Modified: trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/ShutdownTest.sf =================================================================== --- trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/ShutdownTest.sf 2007-02-26 14:58:02 UTC (rev 3934) +++ trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/ShutdownTest.sf 2007-02-26 17:16:11 UTC (rev 3935) @@ -1,4 +1,34 @@ +/** (C) Copyright 2007 Hewlett-Packard Development Company, LP +Disclaimer of Warranty + +The Software is provided "AS IS," without a warranty of any kind. ALL +EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, +INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE HEREBY +EXCLUDED. SmartFrog is not a Hewlett-Packard Product. The Software has +not undergone complete testing and may contain errors and defects. It +may not function properly and is subject to change or withdrawal at +any time. The user must assume the entire risk of using the +Software. No support or maintenance is provided with the Software by +Hewlett-Packard. Do not install the Software if you are not accustomed +to using experimental software. + +Limitation of Liability + +TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL HEWLETT-PACKARD +OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR +FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, +HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF +OR RELATED TO THE FURNISHING, PERFORMANCE, OR USE OF THE SOFTWARE, OR +THE INABILITY TO USE THE SOFTWARE, EVEN IF HEWLETT-PACKARD HAS BEEN +ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. FURTHERMORE, SINCE THE +SOFTWARE IS PROVIDED WITHOUT CHARGE, YOU AGREE THAT THERE HAS BEEN NO +BARGAIN MADE FOR ANY ASSUMPTIONS OF LIABILITY OR DAMAGES BY +HEWLETT-PACKARD FOR ANY REASON WHATSOEVER, RELATING TO THE SOFTWARE OR +ITS MEDIA, AND YOU HEREBY WAIVE ANY CLAIM IN THIS REGARD. + +*/ #include "/org/smartfrog/services/database/test/system/core/mysql/ConnectionOpenTest.sf"; @@ -9,7 +39,7 @@ tests extends Sequence { delay extends Delay { - time mysql_startup_delay; + time Settings:mysql_startup_delay; action extends mysqladmin-shutdown { silent false; } Modified: trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/TableManipulationTest.sf =================================================================== --- trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/TableManipulationTest.sf 2007-02-26 14:58:02 UTC (rev 3934) +++ trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/TableManipulationTest.sf 2007-02-26 17:16:11 UTC (rev 3935) @@ -1,4 +1,36 @@ +/** (C) Copyright 200 +7 Hewlett-Packard Development Company, LP +Disclaimer of Warranty + +The Software is provided "AS IS," without a warranty of any kind. ALL +EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, +INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE HEREBY +EXCLUDED. SmartFrog is not a Hewlett-Packard Product. The Software has +not undergone complete testing and may contain errors and defects. It +may not function properly and is subject to change or withdrawal at +any time. The user must assume the entire risk of using the +Software. No support or maintenance is provided with the Software by +Hewlett-Packard. Do not install the Software if you are not accustomed +to using experimental software. + +Limitation of Liability + +TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL HEWLETT-PACKARD +OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR +FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, +HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF +OR RELATED TO THE FURNISHING, PERFORMANCE, OR USE OF THE SOFTWARE, OR +THE INABILITY TO USE THE SOFTWARE, EVEN IF HEWLETT-PACKARD HAS BEEN +ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. FURTHERMORE, SINCE THE +SOFTWARE IS PROVIDED WITHOUT CHARGE, YOU AGREE THAT THERE HAS BEEN NO +BARGAIN MADE FOR ANY ASSUMPTIONS OF LIABILITY OR DAMAGES BY +HEWLETT-PACKARD FOR ANY REASON WHATSOEVER, RELATING TO THE SOFTWARE OR +ITS MEDIA, AND YOU HEREBY WAIVE ANY CLAIM IN THIS REGARD. + +*/ + #include "/org/smartfrog/services/database/test/system/core/mysql/components.sf"; @@ -21,43 +53,40 @@ timeout 10000; } + dropDBNoError extends dropDB { + failOnSqlError false; + } - dropUser1 extends DropUser { + mkdb extends CreateDatabase { database LAZY ATTRIB action:binding; - username Settings:testUser; - failOnSqlError false; + name Settings:db; } //forward reference dropTable1 extends dropTable { + database LAZY ATTRIB action:diary; failOnSqlError false; } - newuser extends CreateUser { - database LAZY PARENT:PARENT:action:binding; - username Settings:testUser; - password Settings:testPass; - } - - events extends CreateEventsTable { - database LAZY ATTRIB action:binding; + database LAZY ATTRIB action:diary; } select extends Transaction { - database LAZY ATTRIB action:binding; + database LAZY ATTRIB action:diary; sqlCommands [ "SELECT * from events" ]; } dropTable extends DropTable { - database LAZY ATTRIB action:binding; + database LAZY ATTRIB action:diary; table "events"; } - dropUser2 extends dropUser1 { - failOnSqlError true; + dropDB extends DropDatabase { + database LAZY ATTRIB action:binding; + name Settings:db; } } Added: trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/UserManipulationTest.sf =================================================================== --- trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/UserManipulationTest.sf (rev 0) +++ trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/UserManipulationTest.sf 2007-02-26 17:16:11 UTC (rev 3935) @@ -0,0 +1,79 @@ +/** (C) Copyright 2007 Hewlett-Packard Development Company, LP + +Disclaimer of Warranty + +The Software is provided "AS IS," without a warranty of any kind. ALL +EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, +INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE HEREBY +EXCLUDED. SmartFrog is not a Hewlett-Packard Product. The Software has +not undergone complete testing and may contain errors and defects. It +may not function properly and is subject to change or withdrawal at +any time. The user must assume the entire risk of using the +Software. No support or maintenance is provided with the Software by +Hewlett-Packard. Do not install the Software if you are not accustomed +to using experimental software. + +Limitation of Liability + +TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL HEWLETT-PACKARD +OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR +FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, +HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF +OR RELATED TO THE FURNISHING, PERFORMANCE, OR USE OF THE SOFTWARE, OR +THE INABILITY TO USE THE SOFTWARE, EVEN IF HEWLETT-PACKARD HAS BEEN +ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. FURTHERMORE, SINCE THE +SOFTWARE IS PROVIDED WITHOUT CHARGE, YOU AGREE THAT THERE HAS BEEN NO +BARGAIN MADE FOR ANY ASSUMPTIONS OF LIABILITY OR DAMAGES BY +HEWLETT-PACKARD FOR ANY REASON WHATSOEVER, RELATING TO THE SOFTWARE OR +ITS MEDIA, AND YOU HEREBY WAIVE ANY CLAIM IN THIS REGARD. + +*/ + +#include "/org/smartfrog/services/database/test/system/core/mysql/components.sf"; + + +UserManipulationTest extends TestCompound { + + description "Creates users and tables"; + sfShouldTerminate false; + + action extends DatabaseAndBinding { + } + + tests extends Sequence { + + + wait extends FailingWaitFor { + condition extends IsJdbcConnectionOpen { + database LAZY action:binding; + } + interval Settings:poll_interval; + timeout Settings:mysql_startup_timeout; + } + + + dropUser1 extends DropUser { + database LAZY ATTRIB action:binding; + username Settings:testUser; + failOnSqlError false; + } + + newuser extends CreateUserNoPassword { + database LAZY PARENT:PARENT:action:binding; + username Settings:testUser; + password Settings:testPass; + } + + dropUser2 extends dropUser1 { + failOnSqlError true; + } + + } + } + +sfConfig extends UserManipulationTest { + + + +} \ No newline at end of file Modified: trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/components.sf =================================================================== --- trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/components.sf 2007-02-26 14:58:02 UTC (rev 3934) +++ trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/components.sf 2007-02-26 17:16:11 UTC (rev 3935) @@ -33,9 +33,15 @@ #include "/org/smartfrog/sfcore/logging/components.sf" Settings extends { - memorydb "memory"; + db "diary"; testUser "testUser"; testPass "secret"; + undeployTimeout 5000; + //how long should we give mysql before giving up? + mysql_startup_delay 10000; + mysql_startup_timeout 20000; + poll_interval 200; + } Mysqld extends mysqldaemon { @@ -51,7 +57,8 @@ } DiaryBinding extends MysqlTargetedBinding { - database "diary"; + host "localhost"; + database Settings:db; } TestUserBinding extends DiaryBinding { @@ -95,7 +102,6 @@ mysqld extends Mysqld { datadir LAZY PARENT:datadir:absolutePath; basedir datadir; - } @@ -107,25 +113,20 @@ //this is the mysql binding binding extends MysqlBinding; + diary extends DiaryBinding; } - /** - * how long should we give mysql before giving up? - */ - mysql_startup_delay 5000; BlockForMysqlConnection extends BlockForJdbcConnection { - timeout mysql_startup_delay ; + interval Settings:poll_interval; + timeout Settings:mysql_startup_timeout; } - BlockForMysqlLive extends FailingWaitFor { - database TBD; + BlockForMysqlLive extends BlockForMysqlConnection { condition extends IsMysqlLive { database LAZY PARENT:database; } - interval 200; - timeout mysql_startup_delay; } @@ -133,6 +134,9 @@ description "test compound for mysql tests"; + //autoshutdown + undeployAfter Settings:undeployTimeout; + sfShouldTerminate false; action extends DatabaseAndBinding ; Modified: trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/mysql-sfunit.sf =================================================================== --- trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/mysql-sfunit.sf 2007-02-26 14:58:02 UTC (rev 3934) +++ trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/mysql-sfunit.sf 2007-02-26 17:16:11 UTC (rev 3935) @@ -24,11 +24,14 @@ #include "/org/smartfrog/services/database/test/system/core/mysql/MysqlStartTest.sf" #include "/org/smartfrog/services/database/test/system/core/mysql/ShutdownTest.sf" #include "/org/smartfrog/services/database/test/system/core/mysql/TableManipulationTest.sf" -/*#include "" -#include ""*/ +#include "/org/smartfrog/services/database/test/system/core/mysql/CheckNoMysqlTest.sf" +/* +#include "" +*/ MysqlSfUnitTests extends SFUnitTestSuite { + -- extends CheckNoMysqlTest; connectionOpenTest extends ConnectionOpenTest; isMysqlLiveTest extends IsMysqlLiveTest; mysqlStartTest extends MysqlStartTest; Modified: trunk/core/components/xunit/src/org/smartfrog/services/xunit/log/TestListenerLogImpl.java =================================================================== --- trunk/core/components/xunit/src/org/smartfrog/services/xunit/log/TestListenerLogImpl.java 2007-02-26 14:58:02 UTC (rev 3934) +++ trunk/core/components/xunit/src/org/smartfrog/services/xunit/log/TestListenerLogImpl.java 2007-02-26 17:16:11 UTC (rev 3935) @@ -28,6 +28,7 @@ import java.util.List; /** + * This relays all log events to anythng listening for it * created 18-May-2006 15:37:08 */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-03-28 16:36:44
|
Revision: 4048 http://svn.sourceforge.net/smartfrog/?rev=4048&view=rev Author: steve_l Date: 2007-03-28 09:36:21 -0700 (Wed, 28 Mar 2007) Log Message: ----------- purge .cvsignore files. add .svnignore Added Paths: ----------- trunk/core/components/arithmetic-testharness/.svnignore trunk/core/components/dns/.svnignore trunk/core/components/ssh/.svnignore Removed Paths: ------------- trunk/core/components/.cvsignore trunk/core/components/arithmetic-testharness/.cvsignore trunk/core/components/dns/.cvsignore trunk/core/components/logger/.cvsignore trunk/core/components/sfcoreloggers/.cvsignore trunk/core/components/ssh/.cvsignore trunk/core/components/utils/.cvsignore Deleted: trunk/core/components/.cvsignore =================================================================== --- trunk/core/components/.cvsignore 2007-03-28 16:11:25 UTC (rev 4047) +++ trunk/core/components/.cvsignore 2007-03-28 16:36:21 UTC (rev 4048) @@ -1,14 +0,0 @@ -build -dist -build.properties -runtime.properties -common.properties -*.jpx -*.ipr -*.iml -*.iws -.classpath -.project -parsertargets_report.html -smartfrog-version.properties -version.properties \ No newline at end of file Deleted: trunk/core/components/arithmetic-testharness/.cvsignore =================================================================== --- trunk/core/components/arithmetic-testharness/.cvsignore 2007-03-28 16:11:25 UTC (rev 4047) +++ trunk/core/components/arithmetic-testharness/.cvsignore 2007-03-28 16:36:21 UTC (rev 4048) @@ -1,14 +0,0 @@ -build -dist -build.properties -runtime.properties -common.properties -*.jpx -*.ipr -*.iml -*.iws -.classpath -.project -parsertargets_report.html -smartfrog-version.properties -version.properties \ No newline at end of file Copied: trunk/core/components/arithmetic-testharness/.svnignore (from rev 4032, trunk/core/components/arithmetic-testharness/.cvsignore) =================================================================== --- trunk/core/components/arithmetic-testharness/.svnignore (rev 0) +++ trunk/core/components/arithmetic-testharness/.svnignore 2007-03-28 16:36:21 UTC (rev 4048) @@ -0,0 +1,14 @@ +build +dist +build.properties +runtime.properties +common.properties +*.jpx +*.ipr +*.iml +*.iws +.classpath +.project +parsertargets_report.html +smartfrog-version.properties +version.properties \ No newline at end of file Property changes on: trunk/core/components/arithmetic-testharness/.svnignore ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: trunk/core/components/dns/.cvsignore =================================================================== --- trunk/core/components/dns/.cvsignore 2007-03-28 16:11:25 UTC (rev 4047) +++ trunk/core/components/dns/.cvsignore 2007-03-28 16:36:21 UTC (rev 4048) @@ -1,14 +0,0 @@ -build -dist -build.properties -runtime.properties -common.properties -*.jpx -*.ipr -*.iml -*.iws -.classpath -.project -parsertargets_report.html -smartfrog-version.properties -version.properties \ No newline at end of file Copied: trunk/core/components/dns/.svnignore (from rev 4032, trunk/core/components/dns/.cvsignore) =================================================================== --- trunk/core/components/dns/.svnignore (rev 0) +++ trunk/core/components/dns/.svnignore 2007-03-28 16:36:21 UTC (rev 4048) @@ -0,0 +1,14 @@ +build +dist +build.properties +runtime.properties +common.properties +*.jpx +*.ipr +*.iml +*.iws +.classpath +.project +parsertargets_report.html +smartfrog-version.properties +version.properties \ No newline at end of file Property changes on: trunk/core/components/dns/.svnignore ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: trunk/core/components/logger/.cvsignore =================================================================== --- trunk/core/components/logger/.cvsignore 2007-03-28 16:11:25 UTC (rev 4047) +++ trunk/core/components/logger/.cvsignore 2007-03-28 16:36:21 UTC (rev 4048) @@ -1,3 +0,0 @@ -jetty.iml -build -dist Deleted: trunk/core/components/sfcoreloggers/.cvsignore =================================================================== --- trunk/core/components/sfcoreloggers/.cvsignore 2007-03-28 16:11:25 UTC (rev 4047) +++ trunk/core/components/sfcoreloggers/.cvsignore 2007-03-28 16:36:21 UTC (rev 4048) @@ -1,3 +0,0 @@ -jetty.iml -build -dist Deleted: trunk/core/components/ssh/.cvsignore =================================================================== --- trunk/core/components/ssh/.cvsignore 2007-03-28 16:11:25 UTC (rev 4047) +++ trunk/core/components/ssh/.cvsignore 2007-03-28 16:36:21 UTC (rev 4048) @@ -1,3 +0,0 @@ -jetty.iml -build -dist Added: trunk/core/components/ssh/.svnignore =================================================================== --- trunk/core/components/ssh/.svnignore (rev 0) +++ trunk/core/components/ssh/.svnignore 2007-03-28 16:36:21 UTC (rev 4048) @@ -0,0 +1,14 @@ +build +dist +build.properties +runtime.properties +common.properties +*.jpx +*.ipr +*.iml +*.iws +.classpath +.project +parsertargets_report.html +smartfrog-version.properties +version.properties \ No newline at end of file Deleted: trunk/core/components/utils/.cvsignore =================================================================== --- trunk/core/components/utils/.cvsignore 2007-03-28 16:11:25 UTC (rev 4047) +++ trunk/core/components/utils/.cvsignore 2007-03-28 16:36:21 UTC (rev 4048) @@ -1,3 +0,0 @@ -jetty.iml -build -dist This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-04-12 10:53:58
|
Revision: 4076 http://svn.sourceforge.net/smartfrog/?rev=4076&view=rev Author: steve_l Date: 2007-04-12 03:52:21 -0700 (Thu, 12 Apr 2007) Log Message: ----------- Mostly corrections to logging messages, javadocs. Renamed one constant to make it clear it was a constant. Modified Paths: -------------- trunk/core/components/database/src/org/smartfrog/services/database/core/AbstractJdbcOperation.java trunk/core/components/quartz/src/org/smartfrog/services/quartz/JobImpl.java trunk/core/components/quartz/src/org/smartfrog/services/quartz/MyJobListener.java trunk/core/components/quartz/src/org/smartfrog/services/quartz/monitor/MonitorImpl.java trunk/core/components/quartz/src/org/smartfrog/services/quartz/scheduler/SchedulerImpl.java Modified: trunk/core/components/database/src/org/smartfrog/services/database/core/AbstractJdbcOperation.java =================================================================== --- trunk/core/components/database/src/org/smartfrog/services/database/core/AbstractJdbcOperation.java 2007-04-10 15:44:54 UTC (rev 4075) +++ trunk/core/components/database/src/org/smartfrog/services/database/core/AbstractJdbcOperation.java 2007-04-12 10:52:21 UTC (rev 4076) @@ -49,7 +49,7 @@ private ComponentHelper helper; - public AbstractJdbcOperation() throws RemoteException { + protected AbstractJdbcOperation() throws RemoteException { } /** @@ -241,7 +241,7 @@ /** * query the autocommit flag - * @return + * @return the current autocommit value */ public boolean isAutocommit() { return autocommit; Modified: trunk/core/components/quartz/src/org/smartfrog/services/quartz/JobImpl.java =================================================================== --- trunk/core/components/quartz/src/org/smartfrog/services/quartz/JobImpl.java 2007-04-10 15:44:54 UTC (rev 4075) +++ trunk/core/components/quartz/src/org/smartfrog/services/quartz/JobImpl.java 2007-04-12 10:52:21 UTC (rev 4076) @@ -125,7 +125,7 @@ // find hostname from Collector - log.info("Number of machines to collect data from are=======" + machines.size()); + log.info("Number of machines to collect data from are:" + machines.size()); setTargetInstances(machines.size()); @@ -140,8 +140,10 @@ Object[] array = collect.toArray(); List list = Arrays.asList(array); Collections.sort(list); - for (int i = 0; i < list.size(); i++) { - log.debug("Element in sorted list===========" + (list.get(i)).toString()); + if(log.isDebugEnabled()) { + for (int i = 0; i < list.size(); i++) { + log.debug("Element in sorted list: " + (list.get(i)).toString()); + } } Enumeration keys = allValues.keys(); Object key = null; @@ -154,7 +156,7 @@ } } - log.info("Final machine for scheduling is===========" + key.toString()); + log.info("Final machine for scheduling is:" + key.toString()); //job.getJobDataMap().put("hostname", "localhost"); //job.getJobDataMap().put("hostname", machines.elementAt(0).toString()); Modified: trunk/core/components/quartz/src/org/smartfrog/services/quartz/MyJobListener.java =================================================================== --- trunk/core/components/quartz/src/org/smartfrog/services/quartz/MyJobListener.java 2007-04-10 15:44:54 UTC (rev 4075) +++ trunk/core/components/quartz/src/org/smartfrog/services/quartz/MyJobListener.java 2007-04-12 10:52:21 UTC (rev 4076) @@ -40,7 +40,7 @@ } public void jobExecutionVetoed(JobExecutionContext context) { - log.info("Job execution veoted"); + log.info("Job execution vetoed"); } public void jobWasExecuted(JobExecutionContext context, Modified: trunk/core/components/quartz/src/org/smartfrog/services/quartz/monitor/MonitorImpl.java =================================================================== --- trunk/core/components/quartz/src/org/smartfrog/services/quartz/monitor/MonitorImpl.java 2007-04-10 15:44:54 UTC (rev 4075) +++ trunk/core/components/quartz/src/org/smartfrog/services/quartz/monitor/MonitorImpl.java 2007-04-12 10:52:21 UTC (rev 4076) @@ -58,7 +58,7 @@ * </p> */ public class MonitorImpl extends PrimImpl implements Prim, Runnable, Monitor, DataSource { - private static final String cmd = "vmstat -n "; + private static final String VMSTAT_COMMAND = "vmstat -n "; private Process process = null; private BufferedReader pOut = null; private BufferedReader pErr = null; @@ -67,7 +67,7 @@ private Log log; private int perMinute = 60 / delay; - private String vmstatCmd = cmd + delay + "\n"; + private String vmstatCmd = VMSTAT_COMMAND + delay + "\n"; private int splitIndex = 14; private Vector last10 = new Vector(10); @@ -88,7 +88,7 @@ log=sfLog(); delay = sfResolve(DELAY, 5, false); - vmstatCmd = org.smartfrog.services.quartz.monitor.MonitorImpl.cmd + delay + ((char) 10); + vmstatCmd =VMSTAT_COMMAND + delay + ((char) 10); perMinute = 60 / delay; name = sfCompleteName().toString(); Modified: trunk/core/components/quartz/src/org/smartfrog/services/quartz/scheduler/SchedulerImpl.java =================================================================== --- trunk/core/components/quartz/src/org/smartfrog/services/quartz/scheduler/SchedulerImpl.java 2007-04-10 15:44:54 UTC (rev 4075) +++ trunk/core/components/quartz/src/org/smartfrog/services/quartz/scheduler/SchedulerImpl.java 2007-04-12 10:52:21 UTC (rev 4076) @@ -72,7 +72,7 @@ log.info("Shutdown Complete"); } } catch (Exception ex) { - log.error("when shutting down the schedulur",ex); + log.error("when shutting down the scheduler",ex); } finally { scheduler=null; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-04-13 10:13:48
|
Revision: 4091 http://svn.sourceforge.net/smartfrog/?rev=4091&view=rev Author: steve_l Date: 2007-04-13 03:13:45 -0700 (Fri, 13 Apr 2007) Log Message: ----------- build process tuning...removing content cut and pasted from smartfrog/core/build.xml and placing ../common.xml in charge of everything Modified Paths: -------------- trunk/core/components/ant/build.xml trunk/core/components/jmx/.svnignore trunk/core/components/jmx/build.xml trunk/core/components/libraries.properties trunk/core/components/net/build.xml trunk/core/components/quartz/build.xml trunk/core/components/sfinstaller/build.xml Removed Paths: ------------- trunk/core/components/jmx/COPYRIGHT.txt trunk/core/components/jmx/build_old.xml trunk/core/components/jmx/changes.txt trunk/core/components/jmx/readme.txt trunk/core/components/jmx/rmitargets Modified: trunk/core/components/ant/build.xml =================================================================== --- trunk/core/components/ant/build.xml 2007-04-13 10:12:24 UTC (rev 4090) +++ trunk/core/components/ant/build.xml 2007-04-13 10:13:45 UTC (rev 4091) @@ -51,43 +51,12 @@ <import file="${root.dir}/common.xml"/> - <!--property name="doc.dir" location="doc"/--> - <!-- Important property to select the package that is compiled and the jar file name--> - <property name="Name.System" value="Ant"/> - <!-- =================================================================== --> - <!-- Initialization target --> - <!-- =================================================================== --> - <target name="init" depends="init-standard-output-dirs, use-smartfrog-tasks"> - <tstamp/> - <property name="Name.Company" value="(C) Copyright 1998-2006 Hewlett-Packard Development Company, LP"/> - <property name="version" value="smartfrog components"/> - <!--property name="Version" value="1.00.000_beta"/--> - <property name="year" value="2006"/> - <echo message=""/> + + <target name="init" depends="common.init"> <echo message="==================================================================="/> - <echo message="= ${Name.System} ${version}, ${Name.Company} (${ant.version}) "/> - <available property="nice.task.present" classname="org.apache.tools.ant.taskdefs.Nice" /> + <echo message="= ${ant.project.name}"/> </target> - <!-- =================================================================== --> - <!-- Help on usage --> - <!-- =================================================================== --> - <target name="help" depends="init" description="Help"> - <echo message=""/> - <echo message="-------------------------------------------------------------"/> - <echo message="${Name.System} ${version} Build file"/> - <echo message="-------------------------------------------------------------"/> - <echo message="* General: "/> - <echo message=" build --> recompiles and creates all packages"/> - <echo message=" dist --> prepares distribution package (Default)"/> - <echo message=" compile --> compiles the contributed source code"/> - <echo message=" clean --> restores the distribution to its clean state"/> - <echo message=" "/> - <echo message=" help --> this help"/> - <echo message="See the comments inside the build.xml file for more details."/> - <echo message="-------------------------------------------------------------"/> - <echo message=""/> - </target> <!-- =================================================================== --> @@ -95,19 +64,13 @@ <!-- =================================================================== --> - <!--property name="redist" value="redist"/ --> <property name="examplesFiles" value="org/smartfrog/examples/**/*"/> <!-- a list of files for rmic --> <property name="rmitargets" value="${basedir}/rmitargets"/> - <!-- Compile options for Smartfrog Release --> - <property name="javac.debug.mode" value="on"/> <!-- turn on compile -g --> - <property name="javac.debug.level" value="lines,vars,source" /> - <property name="javac.runtime.target" value="1.4" /> - <!-- Security related files ================================================================= <property name="manifestName" value="${private}/sealManifest.mf"/> Modified: trunk/core/components/jmx/.svnignore =================================================================== --- trunk/core/components/jmx/.svnignore 2007-04-13 10:12:24 UTC (rev 4090) +++ trunk/core/components/jmx/.svnignore 2007-04-13 10:13:45 UTC (rev 4091) @@ -3,3 +3,4 @@ build dist build.properties +version.properties Deleted: trunk/core/components/jmx/COPYRIGHT.txt =================================================================== --- trunk/core/components/jmx/COPYRIGHT.txt 2007-04-13 10:12:24 UTC (rev 4090) +++ trunk/core/components/jmx/COPYRIGHT.txt 2007-04-13 10:13:45 UTC (rev 4091) @@ -1,19 +0,0 @@ -/** (C) Copyright 1998-2004 Hewlett-Packard Development Company, LP - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -For more information: www.smartfrog.org - -*/ \ No newline at end of file Modified: trunk/core/components/jmx/build.xml =================================================================== --- trunk/core/components/jmx/build.xml 2007-04-13 10:12:24 UTC (rev 4090) +++ trunk/core/components/jmx/build.xml 2007-04-13 10:13:45 UTC (rev 4091) @@ -129,8 +129,7 @@ <include name="**/examples/**"/> </fileset> </copy> - <copy tofile="${dist.dir}/build.xml" file="releaseBuild.xml"/> - <copy tofile="${dist.dir}/build.example.properties" file="build.example.properties" failonerror="false"/> + <copy tofile="${dist.dir}/build.xml" file="build.xml"/> </target> <!-- =================================================================== --> Deleted: trunk/core/components/jmx/build_old.xml =================================================================== --- trunk/core/components/jmx/build_old.xml 2007-04-13 10:12:24 UTC (rev 4090) +++ trunk/core/components/jmx/build_old.xml 2007-04-13 10:13:45 UTC (rev 4091) @@ -1,469 +0,0 @@ -<?xml version="1.0"?> -<!-- - /** (C) Copyright 1998-2004 Hewlett-Packard Development Company, LP - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - For more information: www.smartfrog.org - */ ---> - -<project name="sfJMX" default="all" basedir="."> - <description> - Introduction - ============ - The build script for SmartFrog sfJMX components. - To run the build script ant must be installed - and ant executable should be in the system path. - - Installing the build tools - ========================== - Please go though the installation guide and install ant 1.6.5 or later. - Reference URL:http://ant.apache.org -</description> - <!-- =================================================================== --> - <!-- Initialization target --> - <!-- =================================================================== --> - <target name="init"> - <tstamp/> - <property name="Name.System" value="sfJMX"/> - <property name="Name.Company" value="(C) Copyright 1998-2005 Hewlett-Packard Development Company, LP"/> - <property name="version" value="CORE"/> - <property name="year" value="2005"/> - <echo level="verbose"> - =================================================================== - = ${Name.System} ${version} - " - - = ${Name.Company} - =================================================================== - (${ant.version}) - </echo> - <available property="nice.task.present" classname="org.apache.tools.ant.taskdefs.Nice"/> - </target> - <!-- =================================================================== --> - <!-- Help on usage --> - <!-- =================================================================== --> - <target name="help" depends="init" description="Help"> - <echo message=""/> - <echo message="-------------------------------------------------------------"/> - <echo message="${Name.System} ${version} Build file"/> - <echo message="-------------------------------------------------------------"/> - <echo message="* General: "/> - <echo message=" build --> recompiles and creates all packages"/> - <echo message=" dist --> prepares distribution package (Default)"/> - <echo message=" compile --> compiles the contributed source code"/> - <echo message=" sfParseTest --> runs sfParser for 'parsertargets' file"/> - <echo message=" jdocs --> generates the Java Docs API documentation"/> - <echo message=" clean --> restores the distribution to its clean state"/> - <echo message=" release --> clean, dist, jdocs"/> - <echo message=" all --> builds all the packages"/> - <echo message=" "/> - <echo message=" help --> this help"/> - <echo message="See the comments inside the build.xml file for more details."/> - <echo message="-------------------------------------------------------------"/> - <echo message=""/> - </target> - - <!-- =================================================================== --> - <!-- Global properties --> - <!-- =================================================================== --> - <property environment="env"/> - <property name="smartfrog.home" location="${env.SFHOME}" /> - - <!-- override point --> - <property file="build.properties"/> - - <!-- properties file to modify version.sf --> - <property file="${smartfrog.home}/smartfrog-version.properties"/> - <property file="sf-build-version.properties"/> - - <property name="Version" value="${sf.majorRelease}.${sf.minorRelease}.${sf.build}${sf.status}"/> - <echo level="verbose">sfJMX version=${Version}. Using SmartFrog core version=${sf.build.version} </echo> - <!-- =================================================================== --> - <!-- Initialization path (Libs needed for compiling) --> - <!-- =================================================================== --> - <path id="smartfrog.class.path"> - <pathelement location="${smartfrog.home}/lib/smartfrog-${sf.build.version}.jar"/> - <pathelement location="${smartfrog.home}/lib/sfServices-${sf.build.version}.jar"/> - <pathelement location="${smartfrog.home}/lib/sfExamples-${sf.build.version}.jar"/> - <pathelement location="lib/mx4j.jar"/> - <pathelement location="lib/mx4j-jmx.jar"/> - <pathelement location="lib/mx4j-tools.jar"/> - <pathelement location="lib/mx4j-examples.jar"/> - <pathelement location="lib/mx4j-impl.jar"/> - <pathelement location="lib/mx4j-remote.jar"/> - <pathelement location="lib/mx4j-rimpl.jar"/> - <pathelement location="lib/mx4j-rjmx.jar"/> - <pathelement location="lib/sf-scripting.jar"/> - </path> - - <!-- Release Directories --> - <property name="src" value="src"/> - <!-- where the source is --> - <property name="src.dir" location="src"/> - <!-- where the source is --> - <property name="build" location="build"/> - <!-- where the files for the jar file go --> - <!-- where the files for the jar file go --> - <property name="build.classes.dir" location="${build}"/> - <property name="dist.dir" location="dist"/> - <!-- where the files to zip go --> - <property name="releases.dir" location="releases"/> - <!-- where the dated zips go, don't clean --> - <property name="bin" value="bin"/> - <!-- where all the executables go --> - <property name="lib" value="lib"/> - <!-- where all the jar files go --> - <property name="signedLib" value="signedLib"/> - <!-- all protected files --> - <property name="docs" value="docs"/> - <property name="jdocs" value="${docs}/jdocs"/> - <property name="SFjdocs" value="${docs}/SFjdocs"/> - <property name="dist.lib.dir" location="${dist.dir}/${lib}"/> - <property name="dist.bin.dir" location="${dist.dir}/${bin}"/> - <property name="dist.src.dir" location="${dist.dir}/${src}"/> - <property name="dist.docs.dir" location="${dist.dir}/${docs}"/> - <property name="dist.jdocs.dir" location="${dist.dir}/${jdocs}"/> - <property name="dist.SFjdocs.dir" location="${dist.dir}/${SFjdocs}"/> - <property name="java.class.path" location="${dist.dir}/${SFjdocs}"/> - <!--property name="redist" value="redist"/ --> - <property name="examplesFiles" value="org/smartfrog/examples/**/*"/> - <!-- a list of files for rmic --> - <property name="rmitargets" value="${basedir}/rmitargets"/> - <!-- assume the sun compiler --> - <property name="rmic.compiler" value="sun"/> - <!-- Compile options for Smartfrog Release --> - <property name="javac.debug.mode" value="on"/> - <!-- turn on compile -g --> - <property name="javac.debug.level" value="lines,vars,source"/> - <property name="javac.java.version" value="1.4"/> - <property name="build.compiler" value="modern"/> - <property name="javac.compiler" value="${build.compiler}"/> - <!-- override point for javacc --> - <property name="javacc.dir" location="javacc"/> - <property name="private" value="private"/> - <!--property name="manifestName" value="${smartfrog.home}/${private}/sealManifest.mf"/--> - <property name="manifestName" location="sealManifest.mf"/> - <!-- ================================================================== --> - <!-- running Version.java to generate version information --> - <!-- ================================================================== --> - - <target name="generateversion" depends="initbuild"> - <echo level="verbose">version=${Version}</echo> - </target> - <!-- =================================================================== --> - <!-- Release --> - <!-- =================================================================== --> - <target name="release" depends="clean, dist,jdocs" description="Creates clean new release"> </target> - <!-- =================================================================== --> - <!-- --> - <!-- =================================================================== --> - <target name="initbuild" depends="init"> - <mkdir dir="${build}"/> - <mkdir dir="${build.classes.dir}"/> - </target> - <!-- =================================================================== --> - <!-- --> - <!-- =================================================================== --> - <target name="initdist" depends="init"> - <mkdir dir="${dist.dir}"/> - <delete dir="${dist.lib.dir}" failonerror="false"/> - <mkdir dir="${dist.lib.dir}"/> - <mkdir dir="${dist.bin.dir}"/> - <mkdir dir="${dist.docs.dir}"/> - <mkdir dir="${dist.src.dir}"/> - </target> - <!-- =================================================================== --> - <!-- FixCRLF for different platforms only inside DIST! --> - <!-- =================================================================== --> - <target name="fixCRLF" depends="copybins" description="adapts CRLF for different OS"> </target> - <!-- =================================================================== --> - <!-- --> - <!-- =================================================================== --> - <target name="initrelease" depends="init"> - <!-- Create the time stamp --> - <tstamp/> - <mkdir dir="${releases.dir}"/> - </target> - <!-- =================================================================== --> - <!-- Compiles source directory --> - <!-- =================================================================== --> - <target name="compile-source" depends="initbuild" description="Compiles the source code"> - <!-- use better dependency logic --> - <!-- - <depend srcdir="${src.dir}" - destdir="${build.classes.dir}" - cache="${build}/testdepends" - closure="yes"/> - --> - <!-- Compile the java code --> - <echo>${javac.java.version} build.compiler=${build.compiler} javac.compiler=${javac.compiler}</echo> - <javac compiler="${javac.compiler}" srcdir="${src.dir}" includes="**/*.java" destdir="${build.classes.dir}" debug="${javac.debug.mode}" debuglevel="${javac.debug.level}" includeAntRuntime="false" source="${javac.java.version}" target="${javac.java.version}"> - <classpath refid="smartfrog.class.path"/> - </javac> - </target> - <target name="compile-rmi" depends="compile-source"> - <!-- - the RMI compile is split in two, as the compiler could not - handle it otherwise. - It is tempting to run these in parallel, to get speedup on multiway - CPUs, but as the SunRmic adapter runs rmic in-VM, that is too dangerous. - We'd need to fork rmic to get decent isolation. - --> - <rmic includesfile="${rmitargets}" compiler="${rmic.compiler}" stubversion="1.2" base="${build.classes.dir}"> - <classpath refid="smartfrog.class.path"/> - </rmic> - </target> - <target name="compile" depends="compile-rmi" description="Compiles the source code"/> - <!-- =================================================================== --> - <!-- Copy default.sf and default.ini files to "src/org/smartfrog" directory --> - <!-- so that they can be used with security on --> - <!-- =================================================================== --> - <target name="copyDefault" depends="initbuild"> - <copy todir="${build.classes.dir}/org/smartfrog"> - <fileset dir="${bin}"> - <include name="default.sf"/> - <include name="default.ini"/> - </fileset> - </copy> - </target> - <!-- =================================================================== --> - <!-- Copy .sf files to "build" directories --> - <!-- =================================================================== --> - <target name="copySF" depends="initbuild"> - <copy todir="${build.classes.dir}"> - <fileset dir="${src.dir}"> - <include name="**/*.sf*"/> - </fileset> - </copy> - </target> - <!-- =================================================================== --> - <!-- Copy .sfcd files to "build" directories --> - <!-- These files should contain a list of configuration descriptors --> - <!-- =================================================================== --> - <target name="copySFCD" depends="initbuild"> - <copy todir="${build.classes.dir}"> - <fileset dir="${src.dir}"> - <include name="**/*.sfcd*"/> - </fileset> - </copy> - </target> - <!-- =================================================================== --> - <!-- Copy .bat files to "build" directories --> - <!-- =================================================================== --> - <target name="copyBAT" depends="initbuild"> - <copy todir="${build.classes.dir}"> - <fileset dir="${src.dir}"> - <include name="**/*.bat*"/> - </fileset> - </copy> - </target> - <!-- =================================================================== --> - <!-- Copy .html files to "build" directories --> - <!-- =================================================================== --> - <target name="copyHTML" depends="initbuild"> - <copy todir="${build.classes.dir}"> - <fileset dir="${src.dir}"> - <include name="**/*.htm*"/> - </fileset> - </copy> - </target> - <!-- =================================================================== --> - <!-- Copy Gif files to "build" directories --> - <!-- =================================================================== --> - <target name="copyGif" depends="initbuild"> - <copy todir="${build.classes.dir}"> - <fileset dir="${src.dir}"> - <include name="**/*.gif"/> - </fileset> - </copy> - </target> - <!-- =================================================================== --> - <!-- --> - <!-- =================================================================== --> - <target name="copylibs" depends="initdist"> - <copy todir="${dist.lib.dir}"> - <fileset dir="${lib}"> - <include name="**/*.jar"/> - </fileset> - </copy> - </target> - - <!-- =================================================================== --> - <!-- Copy binary files. --> - <!-- execute permissions are set on binary stuff, permissions that get --> - <!-- lost --> - <!-- =================================================================== --> - <target name="copybins" depends="initdist"> - <copy todir="${dist.bin.dir}"> - <fileset dir="${bin}"> - <include name="**/*"/> - <exclude name="**/*.bak"/> - <exclude name="**/tools"/> - </fileset> - </copy> - <chmod dir="${dist.bin.dir}" perm="ugo+rx" excludes="**/*.ico, **/*.ini, **/*.sf*,**/*.bat"/> - <chmod dir="${dist.bin.dir}/security" perm="ugo+rx" excludes="**/*.ico, **/*.ini, **/*.sf*,**/*.bat"/> - </target> - <!-- =================================================================== --> - <!-- Copy PDF, HTML files from docs to dist/docs --> - <!-- =================================================================== --> - <target name="copydocs" depends="initdist"> - <copy todir="${dist.docs.dir}"> - <fileset dir="${docs}"> - <include name="**/*.pdf"/> - <include name="**/*.html"/> - <include name="**/*.htm"/> - </fileset> - </copy> - </target> - <!-- =================================================================== --> - <!-- --> - <!-- =================================================================== --> - <target name="copyexamples" depends="initdist"> - <copy todir="${dist.src.dir}"> - <fileset dir="${src.dir}"> - <include name="${examplesFiles}"/> - <exclude name="**/*.dfPackage"/> - </fileset> - </copy> - </target> - <!-- =================================================================== --> - <!-- JDocs --> - <!-- =================================================================== --> - <target name="jdocs" depends="initdist,generateversion" description="Generates the API documentation"> - <!-- Java Docs for all --> - <echo message=""/> - <echo message="------------------------------------------------------------------------"/> - <echo message=" Creating Java Docs for ${Name.System} ${version} [${dist.dir}/${jdocs}]"/> - <echo message="------------------------------------------------------------------------"/> - <mkdir dir="${dist.jdocs.dir}"/> - <javadoc - packagenames="org.smartfrog.*" - sourcepath="${src.dir}" - destdir="${dist.jdocs.dir}" - author="true" - version="true" - use="true" - windowtitle="${Name.System}" - Header="${Name.System} ${Version}" - Footer="${Name.System} ${version} ${Version}" - doctitle="${Name.System}" - bottom="${Name.Company}" - source="${javac.java.version}"> - <group title="SmartFrog Packages" packages="org.smartfrog.*"/> - <classpath refid="smartfrog.class.path"/> - </javadoc> - <!-- Java doc for the grammars --> - <exec executable="java"> - <arg line="-cp ${javacc.dir}/javacc.jar"/> - <arg line="jjdoc"/> - <arg line="-OUTPUT_FILE=${docs}/DefaultParser.html"/> - <arg line="${src}/org/smartfrog/sfcore/languages/sf/DefaultParser.jj"/> - </exec> - </target> - <!-- =================================================================== --> - <!-- BUILD --> - <!-- =================================================================== --> - <target name="prebuild" - depends="initbuild,generateversion,compile,copySF,copyGif,copyBAT,copyHTML,copyDefault,copySFCD" /> - - <target name="build" - depends="prebuild" - description="Recompile and create all packages"/> - - <!-- =================================================================== --> - <!-- Jar Files --> - <!-- =================================================================== --> - - <target name="target-names" depends="init,generateversion"> - <property name="sfJMX.stub" value="sf-JMX-${Version}" /> - <property name="sfJMX.jar" - location="${dist.lib.dir}/${sfJMX.stub}.jar" /> - </target> - - <!-- sfJMX Jar --> - <target name="sfJMXJar" depends="build,target-names"> - <jar jarfile="${sfJMX.jar}" basedir="${build.classes.dir}" includes="**/**" manifest="${manifestName}"/> - </target> - - <target name="jars" depends="initdist,sfJMXJar"> - </target> - - - <!-- =================================================================== --> - <!-- create security buld file --> - <!-- =================================================================== --> - <target name="buildSetup"> - <copy tofile="${dist.dir}/parsertargets" file="parsertargets"/> - <copy tofile="${dist.dir}/COPYRIGHT.txt" file="COPYRIGHT.txt"/> - <copy tofile="${dist.dir}/LICENSE.txt" file="LICENSE.txt"/> - <copy tofile="${dist.dir}/changes.txt" file="changes.txt"/> - <copy tofile="${dist.dir}/readme.txt" file="readme.txt"/> - </target> - <!-- =================================================================== --> - <!-- DIST --> - <!-- =================================================================== --> - <target name="dist" depends="build,initdist,jars,copylibs,copybins,copydocs, copyexamples,buildSetup,fixCRLF,srczip" description="Prepares distribution package"> - </target> - <!-- =================================================================== --> - <!-- src.zip --> - <!-- =================================================================== --> - <target name="srczip" depends="initdist" description="Creates src.zip with SF sources"> - <zip destfile="${dist.dir}/src.zip"> - <zipfileset dir="${src}"> - <include name="**/**"/> - <exclude name="**/*.dfPackage"/> - </zipfileset> - </zip> - </target> - <!-- =================================================================== --> - <!-- clean --> - <!-- =================================================================== --> - <target name="clean" depends="init" description="Restores the distribution to its clean state"> - <!-- Delete the ${build} ${dist.dir} ${jdocs} directory trees --> - <!-- remove parser source files --> - <delete dir="${build}" failonerror="false"/> - <delete dir="${dist.dir}" failonerror="false"/> - </target> - <!-- =================================================================== --> - <!-- a clean distribution --> - <!-- =================================================================== --> - <target name="fromclean" depends="clean,sfParseTest,dist"/> - <!-- =================================================================== --> - <!-- sfParse parsertargets --> - <!-- =================================================================== --> - <target name="sfParseTest" depends="build,jars"> - <java classname="org.smartfrog.SFParse" failonerror="true" fork="true"> - <!--classpathref="smartfrog.run.class.path"--> - <classpath> - <pathelement location="${smartfrog.home}/lib/smartfrog-${sf.build.version}.jar"/> - <pathelement location="${smartfrog.home}/lib/sfServices-${sf.build.version}.jar"/> - <pathelement location="${smartfrog.home}/lib/sfExamples-${sf.build.version}.jar"/> - <pathelement location="${dist.lib.dir}/sf-scripting.jar"/> - <pathelement location="${dist.lib.dir}/sf-JMX-${Version}.jar"/> - </classpath> - <arg value="-R"/> - <!--<arg value="-r"/> --> - <arg value="-q"/> - <arg value="-f"/> - <arg file="parsertargets"/> - </java> - </target> - <!-- =================================================================== --> - <!-- do everything --> - <!-- =================================================================== --> - <target name="all" depends="dist,sfParseTest" description="creates all the packages required to run smartfrog, and validate any .sf in the package"> </target> - <target name="default" depends="all" description="default target for the project; invokes 'all'"/> - -</project> -<!-- End of file --> Deleted: trunk/core/components/jmx/changes.txt =================================================================== --- trunk/core/components/jmx/changes.txt 2007-04-13 10:12:24 UTC (rev 4090) +++ trunk/core/components/jmx/changes.txt 2007-04-13 10:13:45 UTC (rev 4091) @@ -1,2 +0,0 @@ -release 3_06_000_rc1 ----------------------- Deleted: trunk/core/components/jmx/readme.txt =================================================================== --- trunk/core/components/jmx/readme.txt 2007-04-13 10:12:24 UTC (rev 4090) +++ trunk/core/components/jmx/readme.txt 2007-04-13 10:13:45 UTC (rev 4091) @@ -1,38 +0,0 @@ -/** (C) Copyright 1998-2004 Hewlett-Packard Development Company, LP - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -For more information: www.smartfrog.org - -*/ - -Note: <SF> = 'smartfrog' directory - -Where to start: - -- Web site: www.smartfrog.org - -- User manual: <SF>/dist/docs/sfUserManual.pdf - -- Reference manual: <SF>/dist/docs/sfReferenceManual.pdf - -- Java docs: <SF>/dist/docs/jdocs/index.html - -- Examples: <SF>/dist/src/org/smartfrog/examples/examples.html - -- Dynamic Web Server Example: <SF>/dist/docs/sfDynamicWebServerExample.pdf - -- Build process: <SF>/docs/build.html (only in _ALL distribution) - Deleted: trunk/core/components/jmx/rmitargets =================================================================== --- trunk/core/components/jmx/rmitargets 2007-04-13 10:12:24 UTC (rev 4090) +++ trunk/core/components/jmx/rmitargets 2007-04-13 10:13:45 UTC (rev 4091) @@ -1,24 +0,0 @@ -org/smartfrog/services/jmx/agent/SFJMXAgentImpl.class -org/smartfrog/services/jmx/deployer/MBeanDeployer.class -org/smartfrog/services/jmx/communication/rmi/RemoteNotificationListenerWrapper.class -org/smartfrog/services/jmx/communication/rmi/RmiMBeanServerInvoker.class -org/smartfrog/services/jmx/notification/RemoteNotificationListenerWrapper.class -org/smartfrog/services/jmx/deployment/DeploymentAnalyzer.class -org/smartfrog/services/jmx/mbeanbrowser/MBeanBrowser.class -org/smartfrog/services/jmx/prim/RemotePrimImpl.class -org/smartfrog/services/jmx/prim/RemoteListenerPrimImpl.class -org/smartfrog/services/jmx/example/ArithmeticManager.class -org/smartfrog/services/jmx/example/SleepyGenerator.class -org/smartfrog/services/jmx/example/StorePrinter.class - -com/hp/sfServices/slp/OnResults.class -com/hp/sfServices/slp/OnPrimResults.class -com/hp/sfServices/slp/SFDALauncher.class -com/hp/sfServices/slp/SFSLPLocator.class -com/hp/sfServices/slp/SFSLPAdvertiser.class -com/hp/sfServices/slp/PrimAdvertiser.class -com/hp/sfServices/slp/SLPResultsCollector.class -com/hp/sfServices/slp/PrimResultsCollector.class -com/hp/sfServices/slp/ProcessCompoundAdvertiser.class - - Modified: trunk/core/components/libraries.properties =================================================================== --- trunk/core/components/libraries.properties 2007-04-13 10:12:24 UTC (rev 4090) +++ trunk/core/components/libraries.properties 2007-04-13 10:13:45 UTC (rev 4091) @@ -9,6 +9,7 @@ ant-testutil.version=${apache.ant.version} ant.m2.version=1.6.5 bsh.version=2.0b4 +bsh-core.version=${bsh.version} cargo.version=0.8 #httpclient dependency commons-codec.version=1.2 Modified: trunk/core/components/net/build.xml =================================================================== --- trunk/core/components/net/build.xml 2007-04-13 10:12:24 UTC (rev 4090) +++ trunk/core/components/net/build.xml 2007-04-13 10:13:45 UTC (rev 4091) @@ -38,50 +38,17 @@ <!--available file="../../common.xml" property="root.dir" value="../.."/--> <import file="${root.dir}/common.xml"/> - <!-- =================================================================== --> - <!-- JDocs --> - <!-- =================================================================== --> - <target name="jdocs" depends="javadoc" description="Generates the API documentation"/> - - <property name="Name.System" value="Net"/> - <!-- ========================================================== --> - <!-- ========================================================== --> - <target name="init" depends="init-standard-output-dirs,use-smartfrog-tasks"> - - <!-- the compile time path includes net--> -<!-- <path id="compile.classpath"> - <path refid="smartfrog.classpath"/> - <fileset dir="${net.lib.dir}"> - <include name="**/*.jar"/> - </fileset> - </path> - - <path id="run.classpath"> - <path refid="compile.classpath"/> - <path location="${target.jar}" /> - </path> - --> - - <tstamp/> - <property name="Name.Company" value="(C) Copyright 1998-2006 Hewlett-Packard Development Company, LP"/> - <property name="version" value="smartfrog components"/> - <!--property name="Version" value="1.00.000_beta"/--> - <property name="year" value="2004"/> - - <echo message=""/> -<echo message="==================================================================="/> - <echo message="= ${Name.System} ${version}, ${Name.Company} (${ant.version})"/> + <target name="init" depends="common.init"> + <echo message="==================================================================="/> + <echo message="= ${ant.project.name}"/> </target> - - - <!-- ========================================================== --> <!-- create the jar --> <!-- ========================================================== --> - <target name="dist" depends="common.dist,jdocs" description="create the jar files"> + <target name="dist" depends="common.dist,javadoc" description="create the jar files"> <copy todir = "${dist.lib.dir}"> <fileset dir ="${lib.dir}" /> </copy> Modified: trunk/core/components/quartz/build.xml =================================================================== --- trunk/core/components/quartz/build.xml 2007-04-13 10:12:24 UTC (rev 4090) +++ trunk/core/components/quartz/build.xml 2007-04-13 10:13:45 UTC (rev 4091) @@ -31,10 +31,8 @@ <property name="is.component" value="true"/> <!-- override point --> <property file="build.properties"/> - <!-- + <property name="ivy.enabled" value="true"/> - --> - <property name="ivy.enabled" value="true"/> <property name="root.dir" location="../.."/> <!-- Import common stuff --> Modified: trunk/core/components/sfinstaller/build.xml =================================================================== --- trunk/core/components/sfinstaller/build.xml 2007-04-13 10:12:24 UTC (rev 4090) +++ trunk/core/components/sfinstaller/build.xml 2007-04-13 10:13:45 UTC (rev 4091) @@ -2,7 +2,7 @@ <project name="sfinstaller" default="default"> <!-- -/** (C) Copyright 1998-2006 Hewlett-Packard Development Company, LP +/** (C) Copyright 1998-2007 Hewlett-Packard Development Company, LP This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -44,33 +44,12 @@ <property name="Name.System" value="SFInstaller"/> <!-- ========================================================== --> <!-- ========================================================== --> - <target name="init" depends="init-standard-output-dirs"> + <target name="init" depends="common.init"> + <echo message="==================================================================="/> + <echo message="= ${ant.project.name}"/> + </target> - - <!-- the compile time path includes ssh--> -<!-- <path id="compile.classpath"> - <path refid="smartfrog.classpath"/> - <fileset dir="${lib.dir}"> - <include name="**/*.jar"/> - </fileset> - </path> - - <path id="run.classpath"> - <path refid="compile.classpath"/> - <path location="${target.jar}" /> - </path> --> - <tstamp/> - <property name="Name.Company" value="(C) Copyright 1998-2007 Hewlett-Packard Development Company, LP"/> - <property name="version" value="smartfrog components"/> - <!--property name="Version" value="1.00.000_beta"/--> - <property name="year" value="2007"/> - <echo message=""/> -<echo message="==================================================================="/> - <echo message="= ${Name.System} ${version}, ${Name.Company} (${ant.version})"/> - </target> - - <!-- ========================================================== --> <!-- this is an override point --> <!-- set the verified.ok property if everything needed is present --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-04-20 12:03:07
|
Revision: 4100 http://svn.sourceforge.net/smartfrog/?rev=4100&view=rev Author: steve_l Date: 2007-04-20 05:03:01 -0700 (Fri, 20 Apr 2007) Log Message: ----------- stub atom stuff, nothing much Added Paths: ----------- trunk/core/components/atom/ trunk/core/components/atom/src/ trunk/core/components/atom/src/org/ trunk/core/components/atom/src/org/smartfrog/ trunk/core/components/atom/src/org/smartfrog/services/ trunk/core/components/atom/src/org/smartfrog/services/atom/ trunk/core/components/atom/src/org/smartfrog/services/atom/logger/ trunk/core/components/atom/src/org/smartfrog/services/atom/server/ trunk/core/components/atom/src/org/smartfrog/services/atom/server/AtomServlet.java trunk/core/components/atom/src/org/smartfrog/services/www/ trunk/core/components/atom/src/org/smartfrog/services/www/servlet/ trunk/core/components/atom/src/org/smartfrog/services/www/servlet/LocalServlet.java trunk/core/components/atom/src/org/smartfrog/services/www/servlet/RelayServlet.java trunk/core/components/atom/src/org/smartfrog/services/www/servlet/RemoteServlet.java Added: trunk/core/components/atom/src/org/smartfrog/services/atom/server/AtomServlet.java =================================================================== --- trunk/core/components/atom/src/org/smartfrog/services/atom/server/AtomServlet.java (rev 0) +++ trunk/core/components/atom/src/org/smartfrog/services/atom/server/AtomServlet.java 2007-04-20 12:03:01 UTC (rev 4100) @@ -0,0 +1,69 @@ +/** (C) Copyright 2007 Hewlett-Packard Development Company, LP + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + For more information: www.smartfrog.org + + */ +package org.smartfrog.services.atom.server; + +import com.sun.syndication.feed.synd.SyndFeed; +import com.sun.syndication.io.FeedException; +import com.sun.syndication.io.SyndFeedOutput; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** created 13-Apr-2007 12:33:16 */ + +public class AtomServlet extends HttpServlet { + private static final String APPLICATION_XML = "application/xml"; + private static final String ATOM_1_0 = "atom_1.0"; + + + SyndFeed lookupFeed(HttpServletRequest request) { + return null; + } + + /** + * process a GET request + * + * @param request request + * @param response response + * @throws ServletException if the feed doesn't work + * @throws IOException on IO problems + */ + protected void doGet(HttpServletRequest request, + HttpServletResponse response) + throws ServletException, IOException { + + try { + SyndFeed feed = lookupFeed(request); + feed.setFeedType(ATOM_1_0); + response.setContentType(APPLICATION_XML); + SyndFeedOutput output = new SyndFeedOutput(); + output.output(feed, response.getWriter()); + } + catch (FeedException e) { + //wrap and throw; let the stack handle it. + ServletException se = + new ServletException("When creating feed", e); + throw se; + } + } +} Added: trunk/core/components/atom/src/org/smartfrog/services/www/servlet/LocalServlet.java =================================================================== --- trunk/core/components/atom/src/org/smartfrog/services/www/servlet/LocalServlet.java (rev 0) +++ trunk/core/components/atom/src/org/smartfrog/services/www/servlet/LocalServlet.java 2007-04-20 12:03:01 UTC (rev 4100) @@ -0,0 +1,48 @@ +/** (C) Copyright 2007 Hewlett-Packard Development Company, LP + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + For more information: www.smartfrog.org + + */ +package org.smartfrog.services.www.servlet; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * This is an interface that anything that is a local servlet must implement to handle incoming requests created + * 18-Apr-2007 17:11:00 + */ + + +public interface LocalServlet { + + /** + * Get the last modified time + * + * @param request + * @return time in seconds since last modified, or -1 for not known + */ + long getLastModified(HttpServletRequest request); + + void doDelete(HttpServletRequest req, HttpServletResponse resp); + + void doPut(HttpServletRequest req, HttpServletResponse resp); + + void doPost(HttpServletRequest req, HttpServletResponse resp); + + void doGet(HttpServletRequest req, HttpServletResponse resp); +} Added: trunk/core/components/atom/src/org/smartfrog/services/www/servlet/RelayServlet.java =================================================================== --- trunk/core/components/atom/src/org/smartfrog/services/www/servlet/RelayServlet.java (rev 0) +++ trunk/core/components/atom/src/org/smartfrog/services/www/servlet/RelayServlet.java 2007-04-20 12:03:01 UTC (rev 4100) @@ -0,0 +1,169 @@ +/** (C) Copyright 2007 Hewlett-Packard Development Company, LP + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + For more information: www.smartfrog.org + + */ +package org.smartfrog.services.www.servlet; + +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** created 18-Apr-2007 17:11:44 */ + +public class RelayServlet extends HttpServlet { + + /** + * do the mapping from a request to a target + * + * @param request + * @return + */ + LocalServlet getTarget(HttpServletRequest request) { + return null; + } + + + /** + * Returns the time the <code>HttpServletRequest</code> object was last modified, in milliseconds since midnight + * January 1, 1970 GMT. If the time is unknown, this method returns a negative number (the default). + * + * <p>Servlets that support HTTP GET requests and can quickly determine their last modification time should override + * this method. This makes browser and proxy caches work more effectively, reducing the load on server and network + * resources. + * + * @param req the <code>HttpServletRequest</code> object that is sent to the servlet + * @return a <code>long</code> integer specifying the time the <code>HttpServletRequest</code> object was last + * modified, in milliseconds since midnight, January 1, 1970 GMT, or -1 if the time is not known + */ + + protected long getLastModified(HttpServletRequest req) { + return getTarget(req).getLastModified(req); + } + + + /** + * Called by the server (via the <code>service</code> method) to allow a servlet to handle a GET request. + * + * <p>Overriding this method to support a GET request also automatically supports an HTTP HEAD request. A HEAD + * request is a GET request that returns no body in the response, only the request header fields. + * + * @param req an {@link HttpServletRequest} object that contains the request the client has made of the servlet + * @param resp an {@link HttpServletResponse} object that contains the response the servlet sends to the client + * @throws IOException if an input or output error is detected when the servlet handles the GET request + * @throws ServletException if the request for the GET could not be handled + * @see ServletResponse#setContentType + */ + + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + getTarget(req).doGet(req, resp); + } + + + /** + * Called by the server (via the <code>service</code> method) to allow a servlet to handle a POST request. + * + * The HTTP POST method allows the client to send data of unlimited length to the Web server a single time and is + * useful when posting information such as credit card numbers. + * + * <p>When overriding this method, read the request data, write the response headers, get the response's writer or + * output stream object, and finally, write the response data. It's best to include content type and encoding. When + * using a <code>PrintWriter</code> object to return the response, set the content type before accessing the + * <code>PrintWriter</code> object. + * + * <p>The servlet container must write the headers before committing the response, because in HTTP the headers must + * be sent before the response body. + * + * <p>Where possible, set the Content-Length header (with the {@link ServletResponse#setContentLength} method), to + * allow the servlet container to use a persistent connection to return its response to the client, improving + * performance. The content length is automatically set if the entire response fits inside the response buffer. + * + * <p>When using HTTP 1.1 chunked encoding (which means that the response has a Transfer-Encoding header), do not + * set the Content-Length header. + * + * <p>This method does not need to be either safe or idempotent. Operations requested through POST can have side + * effects for which the user can be held accountable, for example, updating stored data or buying items online. + * + * <p>If the HTTP POST request is incorrectly formatted, <code>doPost</code> returns an HTTP "Bad Request" message. + * + * @param req an {@link HttpServletRequest} object that contains the request the client has made of the servlet + * @param resp an {@link HttpServletResponse} object that contains the response the servlet sends to the client + * @throws IOException if an input or output error is detected when the servlet handles the request + * @throws ServletException if the request for the POST could not be handled + * @see ServletOutputStream + * @see ServletResponse#setContentType + */ + + protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + getTarget(req).doPost(req, resp); + } + + + /** + * Called by the server (via the <code>service</code> method) to allow a servlet to handle a PUT request. + * + * The PUT operation allows a client to place a file on the server and is similar to sending a file by FTP. + * + * <p>When overriding this method, leave intact any content headers sent with the request (including Content-Length, + * Content-Type, Content-Transfer-Encoding, Content-Encoding, Content-Base, Content-Language, Content-Location, + * Content-MD5, and Content-Range). If your method cannot handle a content header, it must issue an error message + * (HTTP 501 - Not Implemented) and discard the request. For more information on HTTP 1.1, see RFC 2068 <a + * href="http://info.internet.isi.edu:80/in-notes/rfc/files/rfc2068.txt"></a>. + * + * <p>This method does not need to be either safe or idempotent. Operations that <code>doPut</code> performs can + * have side effects for which the user can be held accountable. When using this method, it may be useful to save a + * copy of the affected URL in temporary storage. + * + * <p>If the HTTP PUT request is incorrectly formatted, <code>doPut</code> returns an HTTP "Bad Request" message. + * + * @param req the {@link HttpServletRequest} object that contains the request the client made of the servlet + * @param resp the {@link HttpServletResponse} object that contains the response the servlet returns to the client + * @throws IOException if an input or output error occurs while the servlet is handling the PUT request + * @throws ServletException if the request for the PUT cannot be handled + */ + + protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + getTarget(req).doPut(req, resp); + } + + + /** + * Called by the server (via the <code>service</code> method) to allow a servlet to handle a DELETE request. + * + * The DELETE operation allows a client to remove a document or Web page from the server. + * + * <p>This method does not need to be either safe or idempotent. Operations requested through DELETE can have side + * effects for which users can be held accountable. When using this method, it may be useful to save a copy of the + * affected URL in temporary storage. + * + * <p>If the HTTP DELETE request is incorrectly formatted, <code>doDelete</code> returns an HTTP "Bad Request" + * message. + * + * @param req the {@link HttpServletRequest} object that contains the request the client made of the servlet + * @param resp the {@link HttpServletResponse} object that contains the response the servlet returns to the client + * @throws IOException if an input or output error occurs while the servlet is handling the DELETE request + * @throws ServletException if the request for the DELETE cannot be handled + */ + + protected void doDelete(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + getTarget(req).doDelete(req, resp); + } +} Added: trunk/core/components/atom/src/org/smartfrog/services/www/servlet/RemoteServlet.java =================================================================== --- trunk/core/components/atom/src/org/smartfrog/services/www/servlet/RemoteServlet.java (rev 0) +++ trunk/core/components/atom/src/org/smartfrog/services/www/servlet/RemoteServlet.java 2007-04-20 12:03:01 UTC (rev 4100) @@ -0,0 +1,26 @@ +/** (C) Copyright 2007 Hewlett-Packard Development Company, LP + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + For more information: www.smartfrog.org + + */ +package org.smartfrog.services.www.servlet; + +/** created 13-Apr-2007 16:54:56 */ + + +public interface RemoteServlet { +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-04-30 16:31:39
|
Revision: 4115 http://svn.sourceforge.net/smartfrog/?rev=4115&view=rev Author: steve_l Date: 2007-04-30 09:31:37 -0700 (Mon, 30 Apr 2007) Log Message: ----------- xmpp fixup, remind people not to pull in all of commons-logging Modified Paths: -------------- trunk/core/components/loggingservices/ivy.xml trunk/core/components/xmpp/build.xml Modified: trunk/core/components/loggingservices/ivy.xml =================================================================== --- trunk/core/components/loggingservices/ivy.xml 2007-04-30 15:47:03 UTC (rev 4114) +++ trunk/core/components/loggingservices/ivy.xml 2007-04-30 16:31:37 UTC (rev 4115) @@ -54,6 +54,10 @@ rev="${log4j.version}" conf="compile,redist->default" /> + <!--it is essential that only the master JAR of commons logging + is pulled in, as its dependencies are usually a mess, including things + like out of date servlet APIs, bits of Avalon, etc. + --> <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}" Modified: trunk/core/components/xmpp/build.xml =================================================================== --- trunk/core/components/xmpp/build.xml 2007-04-30 15:47:03 UTC (rev 4114) +++ trunk/core/components/xmpp/build.xml 2007-04-30 16:31:37 UTC (rev 4115) @@ -67,7 +67,7 @@ <!-- ========================================================== --> <!-- parse the file --> <!-- ========================================================== --> - <target name="parse" depends="init,dist,init-codebase" + <target name="parse" depends="init,dist,package-tests,init-codebase" description="parse the deployment descriptor"> <property name="parse.quiet" value="true"/> <sf-parse quiet="${parse.quiet}"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2007-05-01 14:49:40
|
Revision: 4120 http://svn.sourceforge.net/smartfrog/?rev=4120&view=rev Author: julgui Date: 2007-05-01 07:49:09 -0700 (Tue, 01 May 2007) Log Message: ----------- Javadoc cleaning. Modified Paths: -------------- trunk/core/components/jetty/src/org/smartfrog/services/jetty/JettyIntf.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/agent/AgentNotFoundException.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/agent/AgentTerminatingNotification.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/agent/DiscoveryEventHandler.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/agent/SFJMXAgentImpl.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/cascading/Cascader.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/cascading/CascaderMBean.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/common/MetadataParser.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/common/SFAttribute.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/common/Utilities.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/CommunicatorMBean.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/ConnectionFactory.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/ConnectorClient.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/HeartBeatHandler.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/HeartBeatNotification.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/ObjectID.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/RuntimeConnectionException.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/ServerAddress.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/html/HtmlAdaptor.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/html/HtmlAdaptorMBean.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/HeartBeatHandlerImpl.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RemoteMBeanServer.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RmiConnectorClient.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RmiConnectorServer.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RmiConnectorServerMBean.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RmiMBeanServerInvoker.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RmiServerAddress.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployer/MBeanDeployer.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployer/MBeanDeployerMBean.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployment/DeploymentAnalyzer.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployment/DeploymentAnalyzerMBean.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployment/NonManageableAttributeException.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployment/NonManageableMethodException.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployment/NonReadableAttributeException.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployment/NonWritableAttributeException.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/discovery/AgentDescriptor.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/discovery/CommunicatorDescriptor.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/discovery/DiscoveryNotification.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/ArithmeticManager.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/ArithmeticManagerMBean.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/ArithmeticManager_StubMBean.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/SleepyGenerator.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/SleepyGeneratorMBean.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/SleepyGenerator_StubMBean.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/StorePrinter.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/StorePrinterMBean.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/StorePrinter_StubMBean.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbean/MBeanProxy.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/BooleanCellEditor.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/DeployTreeModel.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/HeartBeatDialog.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/ListenerImpl.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MBeanBrowser.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MainFrame.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MainFrame_AboutBox.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MonitorDialog.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/NotificationFrame.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/NotificationViewer.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/OperationDialog.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/OperationListElement.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/OperationPanel.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/ParameterTableModel.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/PropertyTableModel.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/QueryPanel.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/QueryPopupMenu.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/SFAttributeComparator.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/SFNode.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/SFPropertyPopupMenu.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/SFPropertyTableModel.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/SettingDialog.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/TreePanel.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/TreePopupMenu.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/modelmbean/SFModelMBean.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/modelmbean/SFModelMBeanInfoBuilder.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/notification/NotificationListenerWrapper.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/notification/RemoteNotificationBroadcaster.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/notification/RemoteNotificationBroadcasterSupport.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/notification/RemoteNotificationListener.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/notification/RemoteNotificationListenerWrapper.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/prim/RemoteListenerPrimImpl.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/prim/RemotePrimImpl.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/prim/SerializablePrimImpl.java Modified: trunk/core/components/jetty/src/org/smartfrog/services/jetty/JettyIntf.java =================================================================== --- trunk/core/components/jetty/src/org/smartfrog/services/jetty/JettyIntf.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jetty/src/org/smartfrog/services/jetty/JettyIntf.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -30,35 +30,30 @@ public interface JettyIntf extends JavaWebApplicationServer { /** - * jetty home attribute - * @value + * jetty home attribute. Value: @value */ public static final String ATTR_JETTY_HOME = "jettyhome"; /** - * cached jetty server - * @value + * cached jetty server attribute. Value: @value */ public static final String ATTR_JETTY_SERVER = "Jetty Server"; /** - * logging flag. - * @value + * logging flag attribute. Value: @value */ public static final String ATTR_ENABLE_LOGGING="enableLogging"; /** - * log dir. - * @value + * log dir attribute. Value: @value */ public static final String ATTR_LOGDIR="logDir"; /** - * log pattern. - * @value + * log pattern attribute. Value: @value */ public static final String ATTR_LOGPATTERN="logPattern"; Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/agent/AgentNotFoundException.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/agent/AgentNotFoundException.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/agent/AgentNotFoundException.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -29,9 +29,8 @@ * Title: sfJMX Description: JMX-based Management Framework for SmartFrog * Applications Copyright: Copyright (c) 2001 Company: Hewlett Packard * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/agent/AgentTerminatingNotification.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/agent/AgentTerminatingNotification.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/agent/AgentTerminatingNotification.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -25,9 +25,9 @@ /** * * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/agent/DiscoveryEventHandler.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/agent/DiscoveryEventHandler.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/agent/DiscoveryEventHandler.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -44,9 +44,9 @@ * listening for new service registrations in the SLP Directory Agent. This DiscoveryEventHandler * creates a new CascaderMBean to master every SubAgent found by the SLP UA. * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/agent/SFJMXAgentImpl.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/agent/SFJMXAgentImpl.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/agent/SFJMXAgentImpl.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -47,9 +47,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/cascading/Cascader.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/cascading/Cascader.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/cascading/Cascader.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -51,9 +51,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/cascading/CascaderMBean.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/cascading/CascaderMBean.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/cascading/CascaderMBean.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -27,9 +27,9 @@ /** * Description of the Interface * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/common/MetadataParser.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/common/MetadataParser.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/common/MetadataParser.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -36,9 +36,9 @@ /** * This class parse SF ComponentDescriptions matchin JMX metadata * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/common/SFAttribute.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/common/SFAttribute.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/common/SFAttribute.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -25,9 +25,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/common/Utilities.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/common/Utilities.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/common/Utilities.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -43,9 +43,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ @@ -54,9 +54,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ @@ -114,9 +114,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/CommunicatorMBean.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/CommunicatorMBean.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/CommunicatorMBean.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -27,9 +27,9 @@ * It extends NotificationBroadcaster interface so that the Communicator * can notify a change of state from inactive to active and vice versa. * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/ConnectionFactory.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/ConnectionFactory.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/ConnectionFactory.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -34,9 +34,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/ConnectorClient.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/ConnectorClient.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/ConnectorClient.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -26,9 +26,9 @@ /** * Description of the Interface * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/HeartBeatHandler.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/HeartBeatHandler.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/HeartBeatHandler.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -26,9 +26,9 @@ /** * Description of the Interface * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/HeartBeatNotification.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/HeartBeatNotification.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/HeartBeatNotification.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -25,9 +25,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/ObjectID.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/ObjectID.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/ObjectID.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -26,9 +26,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/RuntimeConnectionException.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/RuntimeConnectionException.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/RuntimeConnectionException.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -25,9 +25,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/ServerAddress.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/ServerAddress.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/ServerAddress.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -25,9 +25,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/html/HtmlAdaptor.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/html/HtmlAdaptor.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/html/HtmlAdaptor.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -50,9 +50,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/html/HtmlAdaptorMBean.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/html/HtmlAdaptorMBean.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/html/HtmlAdaptorMBean.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -31,9 +31,9 @@ /** * Description of the Interface * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/HeartBeatHandlerImpl.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/HeartBeatHandlerImpl.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/HeartBeatHandlerImpl.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -33,9 +33,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RemoteMBeanServer.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RemoteMBeanServer.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RemoteMBeanServer.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -29,9 +29,9 @@ /** * Description of the Interface * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RmiConnectorClient.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RmiConnectorClient.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RmiConnectorClient.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -36,9 +36,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RmiConnectorServer.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RmiConnectorServer.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RmiConnectorServer.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -33,9 +33,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard sfResolve * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RmiConnectorServerMBean.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RmiConnectorServerMBean.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RmiConnectorServerMBean.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -25,9 +25,9 @@ /** * Description of the Interface * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RmiMBeanServerInvoker.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RmiMBeanServerInvoker.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RmiMBeanServerInvoker.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -38,9 +38,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ @@ -213,9 +213,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RmiServerAddress.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RmiServerAddress.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RmiServerAddress.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -27,9 +27,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployer/MBeanDeployer.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployer/MBeanDeployer.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployer/MBeanDeployer.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -47,9 +47,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployer/MBeanDeployerMBean.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployer/MBeanDeployerMBean.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployer/MBeanDeployerMBean.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -32,9 +32,9 @@ * * Company: Hewlett Packard</p> * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployment/DeploymentAnalyzer.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployment/DeploymentAnalyzer.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployment/DeploymentAnalyzer.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -45,9 +45,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 *@created 25 January 2002 Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployment/DeploymentAnalyzerMBean.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployment/DeploymentAnalyzerMBean.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployment/DeploymentAnalyzerMBean.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -23,9 +23,9 @@ /** * Description of the Interface * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployment/NonManageableAttributeException.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployment/NonManageableAttributeException.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployment/NonManageableAttributeException.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -23,9 +23,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployment/NonManageableMethodException.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployment/NonManageableMethodException.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployment/NonManageableMethodException.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -23,9 +23,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployment/NonReadableAttributeException.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployment/NonReadableAttributeException.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployment/NonReadableAttributeException.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -23,9 +23,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployment/NonWritableAttributeException.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployment/NonWritableAttributeException.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployment/NonWritableAttributeException.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -23,9 +23,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/discovery/AgentDescriptor.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/discovery/AgentDescriptor.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/discovery/AgentDescriptor.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -6,9 +6,9 @@ /** * Provides a description of a given discovered JMX Agent * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard *@author Serrano *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/discovery/CommunicatorDescriptor.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/discovery/CommunicatorDescriptor.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/discovery/CommunicatorDescriptor.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -27,9 +27,9 @@ * Provides a description of a given advertised service <p> * * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard *@author Serrano *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/discovery/DiscoveryNotification.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/discovery/DiscoveryNotification.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/discovery/DiscoveryNotification.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -38,9 +38,9 @@ * * Company: Hewlett Packard</p> * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard *@author Serrano *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/ArithmeticManager.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/ArithmeticManager.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/ArithmeticManager.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -31,9 +31,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/ArithmeticManagerMBean.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/ArithmeticManagerMBean.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/ArithmeticManagerMBean.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -25,9 +25,9 @@ /** * Description of the Interface * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/ArithmeticManager_StubMBean.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/ArithmeticManager_StubMBean.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/ArithmeticManager_StubMBean.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -25,9 +25,9 @@ /** * Description of the Interface * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/SleepyGenerator.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/SleepyGenerator.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/SleepyGenerator.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -26,9 +26,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/SleepyGeneratorMBean.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/SleepyGeneratorMBean.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/SleepyGeneratorMBean.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -25,9 +25,9 @@ /** * Description of the Interface * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/SleepyGenerator_StubMBean.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/SleepyGenerator_StubMBean.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/SleepyGenerator_StubMBean.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -25,9 +25,9 @@ /** * Description of the Interface * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/StorePrinter.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/StorePrinter.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/StorePrinter.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -32,9 +32,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/StorePrinterMBean.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/StorePrinterMBean.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/StorePrinterMBean.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -25,9 +25,9 @@ /** * Description of the Interface * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/StorePrinter_StubMBean.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/StorePrinter_StubMBean.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/StorePrinter_StubMBean.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -25,9 +25,9 @@ /** * Description of the Interface * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbean/MBeanProxy.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbean/MBeanProxy.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbean/MBeanProxy.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -43,9 +43,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/BooleanCellEditor.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/BooleanCellEditor.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/BooleanCellEditor.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -28,9 +28,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/DeployTreeModel.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/DeployTreeModel.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/DeployTreeModel.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -29,9 +29,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/HeartBeatDialog.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/HeartBeatDialog.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/HeartBeatDialog.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -27,9 +27,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/ListenerImpl.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/ListenerImpl.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/ListenerImpl.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -31,9 +31,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ @@ -100,9 +100,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MBeanBrowser.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MBeanBrowser.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MBeanBrowser.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -42,9 +42,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MainFrame.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MainFrame.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MainFrame.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -38,9 +38,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MainFrame_AboutBox.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MainFrame_AboutBox.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MainFrame_AboutBox.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -28,9 +28,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MonitorDialog.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MonitorDialog.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MonitorDialog.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -40,9 +40,9 @@ * framework for SmartFrog applications using JMX technology. Copyright: * Copyright (c) 2001 Company: Hewlett Packard * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/NotificationFrame.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/NotificationFrame.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/NotificationFrame.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -30,9 +30,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/NotificationViewer.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/NotificationViewer.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/NotificationViewer.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -25,9 +25,9 @@ /** * Description of the Interface * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/OperationDialog.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/OperationDialog.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/OperationDialog.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -34,9 +34,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/OperationListElement.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/OperationListElement.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/OperationListElement.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -25,9 +25,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/OperationPanel.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/OperationPanel.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/OperationPanel.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -35,9 +35,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ @@ -397,9 +397,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/ParameterTableModel.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/ParameterTableModel.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/ParameterTableModel.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -28,9 +28,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/PropertyTableModel.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/PropertyTableModel.java 2007-05-01 13:23:39 UTC (rev 4119) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/PropertyTableModel.java 2007-05-01 14:49:09 UTC (rev 4120) @@ -35,9 +35,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ @@ -302,9 +302,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ @@ -337,9 +337,9 @@ /** * Description of the Class * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company Hewlett Packard + * sfJMX + * JMX-based Management Framework for SmartFrog Applications + * Hewlett Packard * *@version 1.0 */ @@ -378,9 +378,9 @@ /** * TODO JavaDoc class AttributeComparator * - *@title sfJMX - *@description JMX-based Management Framework for SmartFrog Applications - *@company ... [truncated message content] |
From: <st...@us...> - 2007-05-17 12:26:10
|
Revision: 4148 http://svn.sourceforge.net/smartfrog/?rev=4148&view=rev Author: steve_l Date: 2007-05-17 05:26:08 -0700 (Thu, 17 May 2007) Log Message: ----------- SFOS-133 javadoc fixup Modified Paths: -------------- trunk/core/components/ant/src/org/smartfrog/services/ant/AntProject.java trunk/core/components/anubis/src/org/smartfrog/services/anubis/partition/comms/multicast/HeartbeatComms.java trunk/core/components/net/src/org/smartfrog/services/net/TelnetImpl.java trunk/core/components/ssh/src/org/smartfrog/services/ssh/UserInfoImpl.java Modified: trunk/core/components/ant/src/org/smartfrog/services/ant/AntProject.java =================================================================== --- trunk/core/components/ant/src/org/smartfrog/services/ant/AntProject.java 2007-05-17 12:20:13 UTC (rev 4147) +++ trunk/core/components/ant/src/org/smartfrog/services/ant/AntProject.java 2007-05-17 12:26:08 UTC (rev 4148) @@ -51,16 +51,16 @@ /** * A wrapper around an Ant project. -// * TODO: References - How are they resolved? -// * TODO: Split in: Project, Target, Task -// * TODO: Try to make the different parts remotable -// * TODO: Integrate build listener and log -// * TODO: improve error messages -// * TODO: test typdef and taskdef -// * TODO: how to do properties -// * TODO: overload sfResolve for project and even task -// * TODO: review the creation of an element inside a project (task=null) -// */ + * TODO: References - How are they resolved? + * TODO: Split in: Project, Target, Task + * TODO: Try to make the different parts remotable + * TODO: Integrate build listener and log + * TODO: improve error messages + * TODO: test typdef and taskdef + * TODO: how to do properties + * TODO: overload sfResolve for project and even task + * TODO: review the creation of an element inside a project (task=null) + */ public class AntProject { private org.apache.tools.ant.Project project = null; Modified: trunk/core/components/anubis/src/org/smartfrog/services/anubis/partition/comms/multicast/HeartbeatComms.java =================================================================== --- trunk/core/components/anubis/src/org/smartfrog/services/anubis/partition/comms/multicast/HeartbeatComms.java 2007-05-17 12:20:13 UTC (rev 4147) +++ trunk/core/components/anubis/src/org/smartfrog/services/anubis/partition/comms/multicast/HeartbeatComms.java 2007-05-17 12:26:08 UTC (rev 4148) @@ -128,6 +128,11 @@ */ //public void sendObject(Object obj) { return; } + /** + * Send a heartbeat message. + * Logs a failure at the error level. + * @param msg message to send. + */ public void sendHeartbeat(HeartbeatMsg msg) { try { super.sendObject(msg.toWire()); } catch (Exception ex) { Modified: trunk/core/components/net/src/org/smartfrog/services/net/TelnetImpl.java =================================================================== --- trunk/core/components/net/src/org/smartfrog/services/net/TelnetImpl.java 2007-05-17 12:20:13 UTC (rev 4147) +++ trunk/core/components/net/src/org/smartfrog/services/net/TelnetImpl.java 2007-05-17 12:26:08 UTC (rev 4148) @@ -48,7 +48,7 @@ * It uses apache commons net libraries * @author Ashish Awasthi */ -public class TelnetImpl extends PrimImpl implements Telnet, +public class TelnetImpl extends PrimImpl implements Telnet, TelnetNotificationHandler { private final int DEFAULT_TIMEOUT = 30000; @@ -272,7 +272,7 @@ } } /** - * Helper method. waits for a string with timeout + * Waits for a string with timeout. * @param is Input Stream which is searched * @param end String to search * @param timeout Timeout Modified: trunk/core/components/ssh/src/org/smartfrog/services/ssh/UserInfoImpl.java =================================================================== --- trunk/core/components/ssh/src/org/smartfrog/services/ssh/UserInfoImpl.java 2007-05-17 12:20:13 UTC (rev 4147) +++ trunk/core/components/ssh/src/org/smartfrog/services/ssh/UserInfoImpl.java 2007-05-17 12:26:08 UTC (rev 4148) @@ -67,7 +67,7 @@ /** * prompt for a string - * @returns false always + * @return false always */ public boolean prompt(String str) { return false; @@ -75,7 +75,7 @@ /** * Retry - * @returns false always + * @return false always */ public boolean retry() { return false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-05-18 09:50:38
|
Revision: 4154 http://svn.sourceforge.net/smartfrog/?rev=4154&view=rev Author: steve_l Date: 2007-05-18 02:50:29 -0700 (Fri, 18 May 2007) Log Message: ----------- add testharness and sf-junit to cargo and database Modified Paths: -------------- trunk/core/components/cargo/ivy.xml trunk/core/components/database/ivy.xml trunk/core/components/junit/ivy.xml Modified: trunk/core/components/cargo/ivy.xml =================================================================== --- trunk/core/components/cargo/ivy.xml 2007-05-18 09:44:32 UTC (rev 4153) +++ trunk/core/components/cargo/ivy.xml 2007-05-18 09:50:29 UTC (rev 4154) @@ -51,6 +51,18 @@ changing="true" rev="latest.integration" conf="build->default"/> + <!--testharness for test time--> + <dependency org="org.smartfrog" + name="sf-testharness" + changing="true" + rev="latest.integration" + conf="test->default"/> + <!--and junit/xunit for advanced testing--> + <dependency org="org.smartfrog" + name="sf-junit" + changing="true" + rev="latest.integration" + conf="test->default"/> <!--get the ant redistributables--> <dependency org="org.smartfrog" name="sf-ant" Modified: trunk/core/components/database/ivy.xml =================================================================== --- trunk/core/components/database/ivy.xml 2007-05-18 09:44:32 UTC (rev 4153) +++ trunk/core/components/database/ivy.xml 2007-05-18 09:50:29 UTC (rev 4154) @@ -55,6 +55,12 @@ changing="true" rev="latest.integration" conf="test->default"/> + <!--and junit/xunit for advanced testing--> + <dependency org="org.smartfrog" + name="sf-junit" + changing="true" + rev="latest.integration" + conf="test->default"/> <dependency org="mysql" name="mysql-connector-java" rev="${mysql.version}" Modified: trunk/core/components/junit/ivy.xml =================================================================== --- trunk/core/components/junit/ivy.xml 2007-05-18 09:44:32 UTC (rev 4153) +++ trunk/core/components/junit/ivy.xml 2007-05-18 09:50:29 UTC (rev 4154) @@ -60,11 +60,5 @@ name="junit" rev="${junit.version}" conf="compile->master;redist->default"/> -<!-- - <dependency org="testng" - name="testng" - rev="${testng.version}" - conf="compile->master;runtime->default"/> ---> </dependencies> </ivy-module> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-05-25 12:44:23
|
Revision: 4195 http://svn.sourceforge.net/smartfrog/?rev=4195&view=rev Author: steve_l Date: 2007-05-25 05:44:20 -0700 (Fri, 25 May 2007) Log Message: ----------- SFOS-146, getting jetty tests to pass. Modified Paths: -------------- trunk/core/components/jetty/build.xml trunk/core/components/www/build.xml trunk/core/components/www/doc/www_readme.sxw trunk/core/components/www/ivy.xml Added Paths: ----------- trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/JettyTCPTest.java Removed Paths: ------------- trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/JettyTest.java trunk/core/components/www/testwar/resources/happy.jsp Modified: trunk/core/components/jetty/build.xml =================================================================== --- trunk/core/components/jetty/build.xml 2007-05-25 10:21:37 UTC (rev 4194) +++ trunk/core/components/jetty/build.xml 2007-05-25 12:44:20 UTC (rev 4195) @@ -41,6 +41,8 @@ <property name="root.dir" location="../../" /> <property name="ivy.enabled" value="true"/> <property name="Name.System" value="jetty"/> + <!-- System tests turned off to make CC build over them--> + <property name="system.tests" value="false" /> <!-- Import common stuff --> <!--available file="../../common.xml" property="root.dir" value="../.."/--> <import file="${root.dir}/common.xml"/> @@ -80,6 +82,13 @@ ignoresystemclasses="false"/> <property name="verify.fail.message" value="No Jetty found"/> + <available property="jasper.found" + classname="org.apache.jasper.servlet.JspServlet" + classpathref="tests.run.classpath" + ignoresystemclasses="true"/> + <echo level="verbose"> + jasper.found=${jasper.found} + </echo> </target> <!-- ========================================================== --> @@ -166,6 +175,7 @@ <fileset dir="${test.classes.dir}"> <include name="**/unit/*Test.class"/> <include name="**/system/**/*Test.class" /> + <exclude name="**/system/full/*Test.class" unless="jasper.found" /> </fileset> </batchtest> </sf-junit> Copied: trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/JettyTCPTest.java (from rev 4193, trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/JettyTest.java) =================================================================== --- trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/JettyTCPTest.java (rev 0) +++ trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/JettyTCPTest.java 2007-05-25 12:44:20 UTC (rev 4195) @@ -0,0 +1,237 @@ +/** (C) Copyright 2004 Hewlett-Packard Development Company, LP + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + For more information: www.smartfrog.org + + */ + + +package org.smartfrog.services.www.jetty.test.system.full; + +import org.smartfrog.services.filesystem.FileSystem; +import org.smartfrog.sfcore.prim.Prim; +import org.smartfrog.test.SmartFrogTestBase; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; +import java.net.URLConnection; + + +/** + * JUnit test class for test cases related to "jetty" component This test suite + * needs jetty to be fully installed somewhere, and the jetty home location + * passed down to the program. This can be done by <ol> <li>setting the system + * property jetty.home</li> <li>setting the system property + * runtime.jetty.home</li> </ol> + */ +public class JettyTCPTest + extends SmartFrogTestBase { + + private static final String FILES = "org/smartfrog/services/www/jetty/test/system/full/"; + private static final String JETTY_HOME = "jetty.home"; + private static final String RUNTIME_JETTY_HOME = "runtime." + JETTY_HOME; + + private static final String ROOT_DOC = "/";//""/jetty/index.html"; + + public JettyTCPTest(String s) { + super(s); + } + + /** + * Sets up the fixture, for example, open a network connection. This method + * is called before a test is executed. + */ + protected void setUp() throws Exception { + super.setUp(); + String runtimeJettyHome = System.getProperty(RUNTIME_JETTY_HOME); + String jettyHome = System.getProperty(JETTY_HOME); + if (jettyHome == null && runtimeJettyHome != null) { + System.setProperty(JETTY_HOME, runtimeJettyHome); + } + if (System.getProperty(JETTY_HOME) == null) { + fail("Undefined property " + JETTY_HOME + " or " + RUNTIME_JETTY_HOME); + } + } + + + public void testCaseTCPJettyCore() throws Throwable { + application = deployExpectingSuccess(FILES + "tcp_jetty_core.sf", + "tcp_jetty_core"); + assertNotNull(application); + } + + public void testCaseTCN52() throws Exception { + deployExpectingException(FILES + "tcn52.sf", + "tcn52", + EXCEPTION_LIFECYCLE, + "sfStart", + EXCEPTION_DEPLOYMENT, + "Illegal ClassType"); + } + + + public void testCaseTCN53() throws Exception { + deployExpectingException(FILES + "tcn53.sf", + "tcn53", + EXCEPTION_LIFECYCLE, + "sfStart", + EXCEPTION_DEPLOYMENT, + "java.net.UnknownHostException: no-hostname"); + } + + public void NotestCaseTCN54() throws Exception { + deployExpectingException(FILES + "tcn54.sf", + "tcn54", + EXCEPTION_DEPLOYMENT, + "unnamed component", + EXCEPTION_RESOLUTION, + "java.lang.StackOverflowError"); + } + + public void testCaseTCN55() throws Exception { + deployExpectingException(FILES + "tcn55.sf", + "tcn55", + EXCEPTION_DEPLOYMENT, + "unnamed component", + EXCEPTION_RESOLUTION, + "non-optional attribute 'jettyhome' is missing"); + } + + public void testCaseTCN56() throws Exception { + deployExpectingException(FILES + "tcn56.sf", + "tcn56", + EXCEPTION_DEPLOYMENT, + "unnamed component", + EXCEPTION_RESOLUTION, + "error in schema: non-optional attribute 'listenerPort' is missing"); + } + + public void testCaseTCN57() throws Exception { + deployExpectingException(FILES + "tcn57.sf", + "tcn57", + EXCEPTION_LIFECYCLE, + "unnamed component"); + +/* + EXCEPTION_RESOLUTION, + "error in schema: wrong class found for attribute 'server', expected: java.lang.String"); +*/ + } + + public void testCaseTCP19() throws Throwable { + Prim application = deployExpectingSuccess(FILES + "tcp19.sf", "tcp19"); + assertNotNull(application); + int port = 0; + String hostname = application.sfResolve("serverHost", + (String) null, + true); + port = application.sfResolve("port", port, true); + URL url = new URL("http", hostname, port, ROOT_DOC); + HttpURLConnection connection = null; + connection = (HttpURLConnection) url.openConnection(); + int errorcode = 0; + try { + connection.connect(); + errorcode = connection.getResponseCode(); + } catch (FileNotFoundException e) { + //if this is a 404 error, we have succeeded. + errorcode = connection.getResponseCode(); + } + assertEquals("Expected a 404 response from " + url + " but got " + errorcode, + HttpURLConnection.HTTP_NOT_FOUND, errorcode); + } + + public void testCaseTCP20() throws Throwable { + Prim application = deployExpectingSuccess(FILES + "tcp20.sf", "tcp20"); + assertNotNull(application); + Prim server1 = (Prim) application.sfResolveHere("server1"); + Prim server2 = (Prim) application.sfResolveHere("server2"); + String hostname1 = server1.sfResolve("serverHost", (String) null, true); + Prim listener1 = (Prim) server1.sfResolveHere("listener"); + int port1 = listener1.sfResolve("listenerPort", 0, true); + String hostname2 = server2.sfResolve("serverHost", (String) null, true); + Prim listener2 = (Prim) server2.sfResolveHere("listener"); + int port2 = listener2.sfResolve("listenerPort", 0, true); + URL url1 = new URL("http", hostname1, port1, ROOT_DOC); + URLConnection urlConnection1 = url1.openConnection(); + URL url2 = new URL("http", hostname2, port2, ROOT_DOC); + URLConnection urlConnection2 = url2.openConnection(); + + BufferedReader in1 = null; + BufferedReader in2 = null; + + try { + in1 = new BufferedReader( + new InputStreamReader( + urlConnection1.getInputStream())); + in2 = new BufferedReader( + new InputStreamReader( + urlConnection2.getInputStream())); + String inputLine1; + String inputLine2 = null; + + while ((inputLine1 = in1.readLine()) != null && (inputLine2 = in2.readLine()) != null) + { + assertEquals(inputLine1, inputLine2); + } + } finally { + FileSystem.close(in1); + FileSystem.close(in2); + } + } + + public void testCaseTCP21() throws Throwable { + Prim application = deployExpectingSuccess(FILES + "tcp21.sf", "tcp21"); + assertNotNull(application); + Prim server = (Prim) application.sfResolve("server"); + String jettyhome = server.sfResolve("jettyhome", (String) null, true); + String filename = jettyhome.concat( + File.separator + "demo" + + File.separator + "webapps" + + File.separator + "root" + + File.separator + "index.html"); + File file = new File(filename); + File jettyfile = new File(jettyhome); + + assertTrue("Not found" + file, file.exists()); + assertTrue("Not found" + jettyfile, jettyfile.exists()); + assertFalse("Shound not be a directory " + file, file.isDirectory()); + assertTrue("Should be a directory " + jettyfile, + jettyfile.isDirectory()); + } + + public void testCaseTCP22() throws Throwable { + Prim application = deployExpectingSuccess(FILES + "tcp22.sf", "tcp22"); + assertNotNull(application); + Prim server = (Prim) application.sfResolve("adminServer"); + String hostname = server.sfResolve("httpserverHost", + (String) null, + true); + int port = server.sfResolve("listenerPort", 0, true); + URL url = new URL("http", hostname, port, "/"); + HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection(); + String expectedmessage = "Unauthorized"; + String actualmessage = urlConnection.getResponseMessage(); + int expectedcode = 401; + int actualcode = urlConnection.getResponseCode(); + assertEquals(expectedmessage, actualmessage); + assertEquals(expectedcode, actualcode); + } +} Property changes on: trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/JettyTCPTest.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/JettyTest.java =================================================================== --- trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/JettyTest.java 2007-05-25 10:21:37 UTC (rev 4194) +++ trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/JettyTest.java 2007-05-25 12:44:20 UTC (rev 4195) @@ -1,237 +0,0 @@ -/** (C) Copyright 2004 Hewlett-Packard Development Company, LP - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - For more information: www.smartfrog.org - - */ - - -package org.smartfrog.services.www.jetty.test.system.full; - -import org.smartfrog.services.filesystem.FileSystem; -import org.smartfrog.sfcore.prim.Prim; -import org.smartfrog.test.SmartFrogTestBase; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.URL; -import java.net.URLConnection; - - -/** - * JUnit test class for test cases related to "jetty" component This test suite - * needs jetty to be fully installed somewhere, and the jetty home location - * passed down to the program. This can be done by <ol> <li>setting the system - * property jetty.home</li> <li>setting the system property - * runtime.jetty.home</li> </ol> - */ -public class JettyTest - extends SmartFrogTestBase { - - private static final String FILES = "org/smartfrog/services/www/jetty/test/system/full/"; - private static final String JETTY_HOME = "jetty.home"; - private static final String RUNTIME_JETTY_HOME = "runtime." + JETTY_HOME; - - private static final String ROOT_DOC = "/";//""/jetty/index.html"; - - public JettyTest(String s) { - super(s); - } - - /** - * Sets up the fixture, for example, open a network connection. This method - * is called before a test is executed. - */ - protected void setUp() throws Exception { - super.setUp(); - String runtimeJettyHome = System.getProperty(RUNTIME_JETTY_HOME); - String jettyHome = System.getProperty(JETTY_HOME); - if (jettyHome == null && runtimeJettyHome != null) { - System.setProperty(JETTY_HOME, runtimeJettyHome); - } - if (System.getProperty(JETTY_HOME) == null) { - fail("Undefined property " + JETTY_HOME + " or " + RUNTIME_JETTY_HOME); - } - } - - - public void testCaseTCPJettyCore() throws Throwable { - application = deployExpectingSuccess(FILES + "tcp_jetty_core.sf", - "tcp_jetty_core"); - assertNotNull(application); - } - - public void testCaseTCN52() throws Exception { - deployExpectingException(FILES + "tcn52.sf", - "tcn52", - EXCEPTION_LIFECYCLE, - "sfStart", - EXCEPTION_DEPLOYMENT, - "Illegal ClassType"); - } - - - public void testCaseTCN53() throws Exception { - deployExpectingException(FILES + "tcn53.sf", - "tcn53", - EXCEPTION_LIFECYCLE, - "sfStart", - EXCEPTION_DEPLOYMENT, - "java.net.UnknownHostException: no-hostname"); - } - - public void NotestCaseTCN54() throws Exception { - deployExpectingException(FILES + "tcn54.sf", - "tcn54", - EXCEPTION_DEPLOYMENT, - "unnamed component", - EXCEPTION_RESOLUTION, - "java.lang.StackOverflowError"); - } - - public void testCaseTCN55() throws Exception { - deployExpectingException(FILES + "tcn55.sf", - "tcn55", - EXCEPTION_DEPLOYMENT, - "unnamed component", - EXCEPTION_RESOLUTION, - "non-optional attribute 'jettyhome' is missing"); - } - - public void testCaseTCN56() throws Exception { - deployExpectingException(FILES + "tcn56.sf", - "tcn56", - EXCEPTION_DEPLOYMENT, - "unnamed component", - EXCEPTION_RESOLUTION, - "error in schema: non-optional attribute 'listenerPort' is missing"); - } - - public void testCaseTCN57() throws Exception { - deployExpectingException(FILES + "tcn57.sf", - "tcn57", - EXCEPTION_LIFECYCLE, - "unnamed component"); - -/* - EXCEPTION_RESOLUTION, - "error in schema: wrong class found for attribute 'server', expected: java.lang.String"); -*/ - } - - public void testCaseTCP19() throws Throwable { - Prim application = deployExpectingSuccess(FILES + "tcp19.sf", "tcp19"); - assertNotNull(application); - int port = 0; - String hostname = application.sfResolve("serverHost", - (String) null, - true); - port = application.sfResolve("port", port, true); - URL url = new URL("http", hostname, port, ROOT_DOC); - HttpURLConnection connection = null; - connection = (HttpURLConnection) url.openConnection(); - int errorcode = 0; - try { - connection.connect(); - errorcode = connection.getResponseCode(); - } catch (FileNotFoundException e) { - //if this is a 404 error, we have succeeded. - errorcode = connection.getResponseCode(); - } - assertEquals("Expected a 404 response from " + url + " but got " + errorcode, - HttpURLConnection.HTTP_NOT_FOUND, errorcode); - } - - public void testCaseTCP20() throws Throwable { - Prim application = deployExpectingSuccess(FILES + "tcp20.sf", "tcp20"); - assertNotNull(application); - Prim server1 = (Prim) application.sfResolveHere("server1"); - Prim server2 = (Prim) application.sfResolveHere("server2"); - String hostname1 = server1.sfResolve("serverHost", (String) null, true); - Prim listener1 = (Prim) server1.sfResolveHere("listener"); - int port1 = listener1.sfResolve("listenerPort", 0, true); - String hostname2 = server2.sfResolve("serverHost", (String) null, true); - Prim listener2 = (Prim) server2.sfResolveHere("listener"); - int port2 = listener2.sfResolve("listenerPort", 0, true); - URL url1 = new URL("http", hostname1, port1, ROOT_DOC); - URLConnection urlConnection1 = url1.openConnection(); - URL url2 = new URL("http", hostname2, port2, ROOT_DOC); - URLConnection urlConnection2 = url2.openConnection(); - - BufferedReader in1 = null; - BufferedReader in2 = null; - - try { - in1 = new BufferedReader( - new InputStreamReader( - urlConnection1.getInputStream())); - in2 = new BufferedReader( - new InputStreamReader( - urlConnection2.getInputStream())); - String inputLine1; - String inputLine2 = null; - - while ((inputLine1 = in1.readLine()) != null && (inputLine2 = in2.readLine()) != null) - { - assertEquals(inputLine1, inputLine2); - } - } finally { - FileSystem.close(in1); - FileSystem.close(in2); - } - } - - public void testCaseTCP21() throws Throwable { - Prim application = deployExpectingSuccess(FILES + "tcp21.sf", "tcp21"); - assertNotNull(application); - Prim server = (Prim) application.sfResolve("server"); - String jettyhome = server.sfResolve("jettyhome", (String) null, true); - String filename = jettyhome.concat( - File.separator + "demo" - + File.separator + "webapps" - + File.separator + "root" - + File.separator + "index.html"); - File file = new File(filename); - File jettyfile = new File(jettyhome); - - assertTrue("Not found" + file, file.exists()); - assertTrue("Not found" + jettyfile, jettyfile.exists()); - assertFalse("Shound not be a directory " + file, file.isDirectory()); - assertTrue("Should be a directory " + jettyfile, - jettyfile.isDirectory()); - } - - public void testCaseTCP22() throws Throwable { - Prim application = deployExpectingSuccess(FILES + "tcp22.sf", "tcp22"); - assertNotNull(application); - Prim server = (Prim) application.sfResolve("adminServer"); - String hostname = server.sfResolve("httpserverHost", - (String) null, - true); - int port = server.sfResolve("listenerPort", 0, true); - URL url = new URL("http", hostname, port, "/"); - HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection(); - String expectedmessage = "Unauthorized"; - String actualmessage = urlConnection.getResponseMessage(); - int expectedcode = 401; - int actualcode = urlConnection.getResponseCode(); - assertEquals(expectedmessage, actualmessage); - assertEquals(expectedcode, actualcode); - } -} Modified: trunk/core/components/www/build.xml =================================================================== --- trunk/core/components/www/build.xml 2007-05-25 10:21:37 UTC (rev 4194) +++ trunk/core/components/www/build.xml 2007-05-25 12:44:20 UTC (rev 4195) @@ -49,9 +49,12 @@ <!-- make the WAR file --> <target name="war.init" depends="init-standard-output-dirs"> <property name="target.war.name" - value="sf-testwar-${Version}.war"/> + value="sf-testwar-${smartfrog.version}.war"/> + <property name="dist.war.dir" + location="${dist.dir}/lib"/> + <mkdir dir="${dist.war.dir}" /> <property name="testwar.war" - location="${dist.dir}/${target.war.name}"/> + location="${dist.war.dir}/${target.war.name}"/> <property name="testwar.dir" location="testwar"/> <property name="testwar.lib.dir" @@ -88,30 +91,9 @@ </war> </target> - <target name="war-installed" - depends="war,ivy-publish" - description="install the war file to the m2 repository" - xmlns:m2="antlib:org.apache.maven.artifact.ant"> -<!-- - <property name="testwar.pom.file" location="${build.dir}/testwar.pom"/> - <echo file="${testwar.pom.file}"><![CDATA[<project> - <modelVersion>4.0.0</modelVersion> - <groupId>${m2.groupID}</groupId> - <artifactId>testwar</artifactId> - <packaging>war</packaging> - <version>0.1-SNAPSHOT</version> -</project> -]]></echo> - <m2:pom id="testwar.pom" file="${testwar.pom.file}"/> - <m2:install file="${testwar.war}"> - <pom refid="testwar.pom"/> - </m2:install> ---> - </target> - <!-- ========================================================== --> - <!-- clean --> - <!-- ========================================================== --> + <target name="ready-to-publish-all" + depends="common.ready-to-publish-all,war" /> <target name="dist" depends="common.dist,published,jdocs"> <copy todir = "${dist.lib.dir}"> Modified: trunk/core/components/www/doc/www_readme.sxw =================================================================== (Binary files differ) Modified: trunk/core/components/www/ivy.xml =================================================================== --- trunk/core/components/www/ivy.xml 2007-05-25 10:21:37 UTC (rev 4194) +++ trunk/core/components/www/ivy.xml 2007-05-25 12:44:20 UTC (rev 4195) @@ -26,7 +26,7 @@ <conf name="redist" description="redistributals excluding smartfrog artifacts"/> <conf name="runtime" description="runtime but not the artifact" extends="redist"/> - <conf name="war" description="compile pathfor the test war"/> + <conf name="war" description="compile path for the test war"/> <conf name="documentation" description="all documentation artifacts"/> </configurations> @@ -36,7 +36,7 @@ <artifact name="sf-www-javadocs" conf="documentation" ext="zip"/> <artifact name="sf-www-documentation" conf="documentation" ext="zip"/> <!--the war conf publishes a new artifact--> -<!-- <artifact name="" conf="war"/>--> + <artifact name="sf-testwar" conf="war" type="war"/> </publications> <dependencies> <dependency org="org.smartfrog" Deleted: trunk/core/components/www/testwar/resources/happy.jsp =================================================================== --- trunk/core/components/www/testwar/resources/happy.jsp 2007-05-25 10:21:37 UTC (rev 4194) +++ trunk/core/components/www/testwar/resources/happy.jsp 2007-05-25 12:44:20 UTC (rev 4195) @@ -1,115 +0,0 @@ -<%@ page import="java.io.IOException" %> -<%@ page import="java.sql.Connection" %> -<%@ page import="java.sql.DriverManager" %> -<%@ page import="java.sql.SQLException" %> -<%@ page import="java.io.StringWriter" %> -<%@ page import="java.io.PrintWriter" %> -<%-- - ---%> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%! - private String property(String propname) { - return System.getProperty(propname); -} - - public static final String PROP_USER = "db.port"; - public static final String PROP_PASS = "db.passwd"; - public static final String PROP_URL = "db.url"; - public static final String PROP_DRIVER = "db.driver"; - - public boolean isSet(JspWriter out, String propname) throws IOException { - String value = property(propname); - if (value == null) { - out.println("<p>missing property:" + propname + "<p>"); - return false; - } - if (value.length() == 0) { - out.println("empty property:" + propname + "<p>"); - return false; - } - return true; - } - - /* - * this bit of happiness logic absolutely requires that - * 1. the db.host param is set - * 2. the db.passwd param is set - * 3. the db.port is set - */ - - public boolean areDatabasePropsSet(JspWriter out) throws IOException { - boolean driver = isSet(out, PROP_DRIVER); - boolean url = isSet(out, PROP_URL); - boolean pass = isSet(out, PROP_PASS); - boolean user = isSet(out, PROP_USER); - return url && pass && user; - } - - private void logThrown(JspWriter out, Throwable thrown) throws IOException { - out.println("Exception " + thrown.toString()); - StringWriter sw = new StringWriter(); - out.println("<pre>"); - PrintWriter pw = new PrintWriter(sw); - thrown.printStackTrace(pw); - pw.flush(); - out.println(sw.toString()); - out.println("</pre>"); - } - - - public boolean checkDatabaseConnection(JspWriter out) throws IOException { - String url = property(PROP_URL); - String user = property(PROP_USER); - String pass = property(PROP_PASS); - String driver = property(PROP_DRIVER); - Throwable t = null; - try { - Class.forName(driver).newInstance(); - Connection connection; - connection = DriverManager.getConnection(url, user, pass); - connection.close(); - return true; - } catch (ClassNotFoundException e) { - t = e; - } catch (SQLException e) { - t = e; - } catch (InstantiationException e) { - t = e; - } catch (IllegalAccessException e) { - t = e; - } - logThrown(out, t); - return false; - } -%> - -<html> -<head><title>Happiness page</title></head> - -<body> -<h1>Verifying database configuration</h1></body> - -<% - boolean happy = true; - String message = "<i>The database is configured </i><p>"; - happy = areDatabasePropsSet(out); - - if (happy) { - happy = checkDatabaseConnection(out); - if (!happy) { - message = "<i>Unable to connect to the database</i>"; - } - } else { - message = "<i>Database configuration parameters are missing</i>"; - } - if (!happy) { - response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - } - out.write(message); - -%> - - - -</html> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-06-04 15:56:56
|
Revision: 4232 http://svn.sourceforge.net/smartfrog/?rev=4232&view=rev Author: steve_l Date: 2007-06-04 08:56:55 -0700 (Mon, 04 Jun 2007) Log Message: ----------- Moving these to the new test presetdefs for system testing Modified Paths: -------------- trunk/core/components/cargo/build.xml trunk/core/components/jetty/build.xml trunk/core/components/xmpp/build.xml Modified: trunk/core/components/cargo/build.xml =================================================================== --- trunk/core/components/cargo/build.xml 2007-06-04 15:51:55 UTC (rev 4231) +++ trunk/core/components/cargo/build.xml 2007-06-04 15:56:55 UTC (rev 4232) @@ -124,31 +124,17 @@ <!-- =================================================================== --> <!-- system tests --> <!-- =================================================================== --> - <target name="system-tests" depends="common.system-tests" - description="run system tests" - if="system.tests.enabled"> - <sf-functionaltest testTimeout="600" shutdownTime="10"> - <application> - <sf-startdaemon-debug failonerror="false" spawn="false" - classpathref="tests.run.classpath"/> - </application> - <probe> - <socket port="${smartfrog.daemon.port}" server="localhost"/> - </probe> + + <target name="system-tests" depends="ready-to-test" + if="system.tests.enabled" description="run system tests"> + <sf-system-test> <test> - <sf-junit - includeantruntime="true" - filtertrace="${filter.trace}" - errorproperty="failure" - failureproperty="failure" - > - <classpath - refid="tests.run.classpath"/> + <sf-system-test-junit> <sysproperty key="test.files.dir" value="${test.src.dir}/files"/> - <syspropertyset> - <propertyref prefix="runtime"/> - </syspropertyset> + <!--Root directory for jetty--> + <sysproperty key="jetty.home" + value="${test.src.dir}/files/jettyhome"/> <batchtest todir="${test.data.dir}"> <fileset dir="${test.classes.dir}"> <include name="**/unit/*Test.class"/> @@ -157,18 +143,12 @@ <exclude name="**/tomcat/**" unless="runtime.tomcat.home"/> </fileset> </batchtest> - </sf-junit> - <fail if="failure">Junit failed</fail> + </sf-system-test-junit> + <fail if="system.test.failed">System Tests failed - see + ${test.reports.dir} + </fail> </test> - <teardown> - <sf-stopdaemon failonerror="false"/> - <sf-junitreport data="${test.data.dir}" - reports="${test.reports.dir}" - /> - <echo>Test reports are in -${test.reports.dir}/index.html - </echo> - </teardown> - </sf-functionaltest> + </sf-system-test> </target> + </project> Modified: trunk/core/components/jetty/build.xml =================================================================== --- trunk/core/components/jetty/build.xml 2007-06-04 15:51:55 UTC (rev 4231) +++ trunk/core/components/jetty/build.xml 2007-06-04 15:56:55 UTC (rev 4232) @@ -140,53 +140,36 @@ <target name="jdocs" depends="javadoc" description="Generates the API documentation"/> - <!-- =================================================================== --> + <!-- ========================================================== --> <!-- system tests --> - <!-- =================================================================== --> - <target name="system-tests" depends="common.system-tests" - description="run system tests" - if="system.tests.enabled"> - <sf-functionaltest testTimeout="600" shutdownTime="10"> - <application> - <sf-startdaemon-debug failonerror="false" spawn="false" - classpathref="tests.run.classpath"/> - </application> - <probe> - <socket port="${smartfrog.daemon.port}" server="localhost"/> - </probe> + <!-- ========================================================== --> + + + <target name="system-tests" depends="ready-to-test" + if="run.system.tests" description="run system tests"> + <sf-system-test> <test> - <sf-junit - includeantruntime="true" - filtertrace="${filter.trace}" - errorproperty="failure" - failureproperty="failure" - > - <classpath - refid="tests.run.classpath"/> + <sf-system-test-junit> <sysproperty key="test.files.dir" value="${test.src.dir}/files"/> <!--Root directory for jetty--> <sysproperty key="jetty.home" value="${test.src.dir}/files/jettyhome"/> - <syspropertyset> - <propertyref prefix="runtime"/> - </syspropertyset> <batchtest todir="${test.data.dir}"> <fileset dir="${test.classes.dir}"> <include name="**/unit/*Test.class"/> - <include name="**/system/**/*Test.class" /> - <exclude name="**/system/full/*Test.class" unless="jasper.found" /> + <include name="**/system/**/*Test.class"/> + <exclude name="**/system/full/*Test.class" unless="jasper.found"/> </fileset> </batchtest> - </sf-junit> - <fail if="failure">Junit failed</fail> + </sf-system-test-junit> + <fail if="system.test.failed">System Tests failed - see +${test.reports.dir} + </fail> </test> - <teardown> - <sf-stopdaemon failonerror="false"/> - <sf-junitreport data="${test.data.dir}" - reports="${test.reports.dir}" - /> - </teardown> - </sf-functionaltest> + </sf-system-test> + </target> + + </project> Modified: trunk/core/components/xmpp/build.xml =================================================================== --- trunk/core/components/xmpp/build.xml 2007-06-04 15:51:55 UTC (rev 4231) +++ trunk/core/components/xmpp/build.xml 2007-06-04 15:56:55 UTC (rev 4232) @@ -149,7 +149,7 @@ </target> <target name="system-tests" depends="ready-to-test" - if="run.system.tests" description="run system tests"> + if="system.tests.enabled" description="run system tests"> <sf-system-test-batch-run /> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-06-07 11:31:38
|
Revision: 4261 http://svn.sourceforge.net/smartfrog/?rev=4261&view=rev Author: steve_l Date: 2007-06-07 04:31:35 -0700 (Thu, 07 Jun 2007) Log Message: ----------- Forked the documentation code into their own project Added Paths: ----------- trunk/core/components/documentation/ trunk/core/components/documentation/build.xml trunk/core/components/documentation/ivy.xml trunk/core/components/documentation/master/ trunk/core/components/documentation/master/documentation/ trunk/core/components/documentation/master/documentation/skinconf.xml trunk/core/components/documentation/master/skin/ trunk/core/components/documentation/master/skin/SFComponents.xml trunk/core/components/documentation/master/skin/SFCore.xml trunk/core/components/documentation/master/skin/SFExamples.xml trunk/core/components/documentation/master/skin/anubis.xml trunk/core/components/documentation/master/skin/anubisdeployer.xml trunk/core/components/documentation/master/skin/cddlm.xml trunk/core/components/documentation/master/skin/database.xml trunk/core/components/documentation/master/skin/emailer.xml trunk/core/components/documentation/master/skin/forrest.properties trunk/core/components/documentation/master/skin/frog.gif trunk/core/components/documentation/master/skin/index.xml trunk/core/components/documentation/master/skin/jetty.xml trunk/core/components/documentation/master/skin/logger.xml trunk/core/components/documentation/master/skin/loggingservices.xml trunk/core/components/documentation/master/skin/net.xml trunk/core/components/documentation/master/skin/overview_html_39c627ce.gif trunk/core/components/documentation/master/skin/scripting.xml trunk/core/components/documentation/master/skin/sf.gif trunk/core/components/documentation/master/skin/sf.jpg trunk/core/components/documentation/master/skin/sfcoreloggers.xml trunk/core/components/documentation/master/skin/sfinstaller.xml trunk/core/components/documentation/master/skin/site.xml trunk/core/components/documentation/master/skin/skinconf.xml trunk/core/components/documentation/master/skin/slp.xml trunk/core/components/documentation/master/skin/sourceforge.gif trunk/core/components/documentation/master/skin/ssh.xml trunk/core/components/documentation/master/skin/tabs.xml trunk/core/components/documentation/master/skin/testing.xml trunk/core/components/documentation/master/skin/utils.xml trunk/core/components/documentation/master/skin/www.xml Added: trunk/core/components/documentation/build.xml =================================================================== --- trunk/core/components/documentation/build.xml (rev 0) +++ trunk/core/components/documentation/build.xml 2007-06-07 11:31:35 UTC (rev 4261) @@ -0,0 +1,256 @@ +<?xml version="1.0"?> +<project name="documentation" default="default" basedir="."> + + + <!-- + /** (C) Copyright 1998-2007 Hewlett-Packard Development Company, LP + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + For more information: www.smartfrog.org + + */ + --> + + + <description> + This build file runs Forrest, from http://forrest.apache.org + + Forrest is built on Cocoon and Ant, and must be installed on the machine, otherwise this + project just prints at error level and publishes empty artifacts. + + Why publish empty zip files? So that things downstream will still build even + if Forrest is out of the running. + + + </description> + + <!-- =================================================================== --> + <!-- Generate Forrest Documentation --> + <!-- =================================================================== --> + + + <property environment="env"/> + <property name="is.component" value="true"/> + + + <property name="root.dir" location="../.."/> + + <!-- Import common stuff --> + + <property file="${root.dir}/build.properties"/> + + + <fail unless="env.FORREST_HOME"> + forrest.home is not defined. + To create the documentation, you need Forrest 1.5.x on your system, and + the environment variable FORREST_HOME set up to point to it, or + the property forrest.home set in ${root.dir}/build.properties + </fail> + + <import file="../../antbuild/xml/core.xml" /> + <import file="../../antbuild/xml/state.xml" /> + + <import file="${env.FORREST_HOME}/main/forrest.build.xml"/> + <import file="${env.FORREST_HOME}/main/forrest.antproxy.xml"/> + + + <!-- ignore these; they are merely there for steve to uncomment to set up --> + <!-- + + + <import file="../../../forrest/main/forrest.build.xml"/> + + <import file="../../../forrest/main/forrest.antproxy.xml"/> +--> + + + <target name="init" depends="core.init,forrest.init"> + <echo level="verbose">Created forrest project template</echo> + <property name="forrest.src.dir" location="src"/> + <property name="documentation.dir" location="${forrest.src.dir}/documentation"/> + <property name="comp.home" location="."/> + <property name="xdocs.skin.dir" location="${forrest.src.dir}/content/xdocs"/> + <property name="xdocs.dir" location="${xdocs.skin.dir}/smartfrogdoc"/> + <property name="src.xdocs.dir" location="master/xdocs"/> + <property name="src.content.dir" location="master/content"/> + <property name="src.documentation.dir" location="master/documentation"/> + <property name="src.skin.dir" location="master/skin"/> + <property name="skin.dir" location="${forrest.src.dir}/skin"/> + + + + <!--override this to set up the options for FORREST --> + <property name="ant.opts.forrest" value=""/> + + <macrodef name="forrest-component"> + <attribute name="component" description="component to copy"/> + <attribute name="includes" default="**/*" + description="inclusion pattern; defaults to **/*"/> + <sequential> + <!--dest dir --> + <mkdir dir="${xdocs.dir}/@{component}"/> + <!-- copy the docs --> + <copy todir="${xdocs.dir}/@{component}"> + <fileset dir="${smartfrog.components.dir}/@{component}/doc"> + <include name="@{includes}"/> + </fileset> + <!-- skin --> + <fileset dir="${skin.dir}"> + <include name="@{component}.xml"/> + </fileset> + </copy> + </sequential> + </macrodef> + + </target> + + <target name="clean" depends="core.clean"> + <delete dir="src" /> + </target> + + <target name="mkdirs" depends="init"> + <mkdir dir="${skin.dir}"/> + <mkdir dir="${xdocs.dir}"/> + </target> + + <target name="copy-properties" depends="mkdirs"> + <copy todir="${forrest.src.dir}" file="${src.skin.dir}/forrest.properties"/> + </target> + + + <target name="seedforrest" depends="seed" description="Creates forrest project template"> + <echo>Created forrest project template</echo> + </target> + + <target name="prepare-docs" depends="seedforrest,copy-properties"> + + + <copy todir="${xdocs.dir}"> + <fileset dir="${src.skin.dir}"> + <include name="SFComponents.xml"/> + <include name="overview_html_39c627ce.gif"/> + </fileset> + + </copy> + + <copy todir="${xdocs.skin.dir}" overwrite="true"> + <fileset dir="${src.skin.dir}"> + <include name="index.xml"/> + <include name="site.xml"/> + <include name="tabs.xml"/> + </fileset> + </copy> + + <forrest-component component="ant"/> + <forrest-component component="anubis"/> + <!--forrest-component component="anubisdeployer" /--> + <forrest-component component="database"/> + <forrest-component component="dns"/> + <forrest-component component="emailer"/> + <forrest-component component="jetty"/> + <forrest-component component="jmx"/> + <forrest-component component="net"/> + <forrest-component component="loggingservices"/> + <forrest-component component="quartz"/> + <forrest-component component="sfinstaller"/> + <forrest-component component="ssh"/> + <forrest-component component="scripting"/> + <forrest-component component="slp"/> + <forrest-component component="www"/> + <forrest-component component="xml"/> + <!--<forrest-component component="xmpp" />--> + + + <copy todir="${src.documentation.dir}" overwrite="true" + file="${src.skin.dir}/skinconf.xml"> + </copy> + + <copy todir="${xdocs.skin.dir}/images"> + <fileset dir="${src.skin.dir}"> + <include name="sf.*"/> + <include name="frog.*"/> + <include name="sourceforge.*"/> + </fileset> + </copy> + + <echo level="verbose">${comp.home}</echo> + </target> + + <target name="forrest-presets" depends="init"> + <presetdef name="run-forrest"> + <exec dir="${comp.home}" failonerror="true"> + <env key="FORREST_HOME" value="${env.FORREST_HOME}"/> + <env key="ANT_OPTS" value="${ant.opts.forrest}"/> + </exec> + </presetdef> + <presetdef name="run-forrest-on-windows"> + <run-forrest executable="${env.FORREST_HOME}/bin/forrest.bat" + osfamily="windows"> + <arg value="-Dforrest.jvmargs\=true"/> + <arg value="-Djava.awt.headless\=true"/> + </run-forrest> + </presetdef> + <presetdef name="run-forrest-on-unix"> + <run-forrest executable="${env.FORREST_HOME}/bin/forrest" + osfamily="unix"> + <!--<arg value="-Dforrest.jvmargs=true"/>--> + <arg value="-Djava.awt.headless=true"/> + </run-forrest> + </presetdef> + </target> + + <target name="generate-site" depends="forrest-presets,prepare-docs"> + + <!--antcall target="site"/--> + <run-forrest-on-windows> + <arg value="site"/> + </run-forrest-on-windows> + <run-forrest-on-unix> + <arg value="site"/> + </run-forrest-on-unix> + </target> + + + <target name="copy-forrest-docs" depends="generate-site"> + <copy todir="${dist.doc.dir}"> + <fileset dir="${comp.home}/build/site"> + <include name="**/*.*"/> + <exclude name="samples/*.*"/> + <exclude name="test1.html"/> + <exclude name="test2.html"/> + <exclude name="hello.pdf"/> + <exclude name="linkmap.*"/> + </fileset> + </copy> + + <copy todir="${dist.doc.dir}/smartfrogdoc/"> + <fileset dir="${src.skin.dir}"> + <include name="overview_html_39c627ce.gif"/> + </fileset> + </copy> + </target> + + <target name="docs" depends="copy-forrest-docs" description="Document Generation"> + </target> + + <target name="default" depends="docs" description="Document Generation"> + </target> + + <target name="validate-xdocs"> + <echo>Skipping forrest.validate-xdocs</echo> + </target> + +</project> Property changes on: trunk/core/components/documentation/build.xml ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/core/components/documentation/ivy.xml =================================================================== --- trunk/core/components/documentation/ivy.xml (rev 0) +++ trunk/core/components/documentation/ivy.xml 2007-06-07 11:31:35 UTC (rev 4261) @@ -0,0 +1,55 @@ +<?xml version="1.0" ?> +<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?> +<ivy-module version="1.0"> + <info organisation="org.smartfrog" module="sf-documentation"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description> + Documentation generation. + This module uses Apache Forrest to create the documentation for the site. + It then publishes the site as a document. + Created 05-Jun-2007 by slo + </description> + </info> +<!-- FIXME: Ivy 1.4.1 buildlist bug + <configurations defaultconfmapping="default"> + <include file="../../antbuild/ivy/configurations.xml"/> + </configurations> + --> +<configurations defaultconfmapping="default"> + <conf name="default" extends="master,runtime"/> + <conf name="build" visibility="private" + description="artifacts needed to build the application"/> + <conf name="compile" visibility="private" + description="artifacts needed to compile the application"/> + <conf name="daemon" visibility="private" + description="the classpath needed to run smartfrog daemons"/> + <conf name="test" extends="default" + description="the classpath needed to run tests"/> + <conf name="master" description="contains the artifact but no dependencies"/> + <conf name="redist" description="redistributals excluding smartfrog artifacts"/> + <conf name="runtime" description="runtime but not the artifact" + extends="redist"/> +</configurations> + + <publications> + <!--get the artifact from our module name--> + <artifact conf="master"/> + </publications> + <dependencies> + <dependency org="org.smartfrog" + name="smartfrog" + changing="true" + rev="latest.integration" + conf="compile,runtime,daemon->services"/> + <dependency org="org.smartfrog" + name="sf-tasks" + rev="latest.integration" + conf="build->default"/> + <dependency org="org.smartfrog" + name="sf-testharness" + rev="latest.integration" + conf="test->default"/> + + </dependencies> +</ivy-module> \ No newline at end of file Property changes on: trunk/core/components/documentation/ivy.xml ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/core/components/documentation/master/documentation/skinconf.xml =================================================================== --- trunk/core/components/documentation/master/documentation/skinconf.xml (rev 0) +++ trunk/core/components/documentation/master/documentation/skinconf.xml 2007-06-07 11:31:35 UTC (rev 4261) @@ -0,0 +1,442 @@ +<?xml version="1.0"?> +<!-- + Copyright 2002-2005 The Apache Software Foundation or its licensors, + as applicable. + + 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. +--> + +<!-- +Skin configuration file. This file contains details of your project, +which will be used to configure the chosen Forrest skin. +--> + +<!DOCTYPE skinconfig PUBLIC "-//APACHE//DTD Skin Configuration V0.7-1//EN" "http://forrest.apache.org/dtd/skinconfig-v07-1.dtd"> +<skinconfig> + <!-- To enable lucene search add provider="lucene" (default is google). + Add box-location="alt" to move the search box to an alternate location + (if the skin supports it) and box-location="all" to show it in all + available locations on the page. Remove the <search> element to show + no search box. @domain will enable sitesearch for the specific domain with google. + In other words google will search the @domain for the query string. + --> + <!--search name="MyProject" domain="mydomain" provider="google"/--> + + <!-- Disable the print link? If enabled, invalid HTML 4.0.1 --> + <disable-print-link>true</disable-print-link> + <!-- Disable the PDF link? --> + <disable-pdf-link>false</disable-pdf-link> + <!-- Disable the POD link? --> + <disable-pod-link>true</disable-pod-link> + <!-- Disable the Text link? FIXME: NOT YET IMPLEMENETED. --> + <disable-txt-link>true</disable-txt-link> + <!-- Disable the xml source link? --> + <!-- The xml source link makes it possible to access the xml rendition + of the source frim the html page, and to have it generated statically. + This can be used to enable other sites and services to reuse the + xml format for their uses. Keep this disabled if you don't want other + sites to easily reuse your pages.--> + <disable-xml-link>true</disable-xml-link> + + <!-- Disable navigation icons on all external links? --> + <disable-external-link-image>false</disable-external-link-image> + + <!-- Disable w3c compliance links? + Use e.g. align="center" to move the compliance links logos to + an alternate location default is left. + (if the skin supports it) --> + <disable-compliance-links>true</disable-compliance-links> + + <!-- Render mailto: links unrecognisable by spam harvesters? --> + <obfuscate-mail-links>true</obfuscate-mail-links> + <obfuscate-mail-value>.at.</obfuscate-mail-value> + + <!-- Disable the javascript facility to change the font size --> + <disable-font-script>true</disable-font-script> + + <!-- mandatory project logo + default skin: renders it at the top --> + <project-url>http://www.smartfrog.org</project-url> + + + <!-- Alternative static image:--> + <project-logo>images/frog.gif</project-logo> + + <!-- optional group logo + default skin: renders it at the top-left corner --> + <group-name>SmartFrog</group-name> + <group-description>SmartFrog</group-description> + <group-url>http://www.smartfrog.org/</group-url> + <group-logo>images/group.png</group-logo> + + <!-- Alternative static image: + <group-logo>images/group-logo.gif</group-logo> --> + + <!-- optional host logo (e.g. sourceforge logo) + default skin: renders it at the bottom-left corner --> + <host-url>http://sourceforge.net/projects/smartfrog</host-url> + <host-logo>images/sourceforge.gif</host-logo> + + <!-- relative url of a favicon file, normally favicon.ico --> + <favicon-url>images/frogb.ico</favicon-url> + + <!-- The following are used to construct a copyright statement --> + <year>1998-2007</year> + <vendor>Hewlett Packard Company</vendor> + <!-- The optional copyright-link URL will be used as a link in the + copyright statement + <copyright-link>http://www.apache.org/licenses/</copyright-link> + --> + + <!-- Some skins use this to form a 'breadcrumb trail' of links. + Use location="alt" to move the trail to an alternate location + (if the skin supports it). + Omit the location attribute to display the trail in the default location. + Use location="none" to not display the trail (if the skin supports it). + For some skins just set the attributes to blank. + + NOTE: If a breadcrumb entry points at a local file the href must + be complete, that is it must point to the file itself, not to a + directory. + --> + <trail> + <link1 name="" href=""/> + <link2 name="" href=""/> + <link3 name="" href=""/> + </trail> + + <!-- Configure the TOC, i.e. the Table of Contents. + @max-depth + how many "section" levels need to be included in the + generated Table of Contents (TOC). + @min-sections + Minimum required to create a TOC. + @location ("page","menu","page,menu", "none") + Where to show the TOC. + --> + <toc max-depth="2" min-sections="1" location="page"/> + + <!-- Heading types can be clean|underlined|boxed --> + <headings type="boxed"/> + + <!-- The optional feedback element will be used to construct a + feedback link in the footer with the page pathname appended: + <a href="@href">{@to}</a> + + <feedback to="sma...@hp..." + href="mailto:web...@fo...?subject=Feedback " > + Send feedback about the website to: + </feedback> + --> + + <!-- Optional message of the day (MOTD). + Note: This is only implemented in the pelt skin. + If the optional <motd> element is used, then messages will be appended + depending on the URI string pattern. + motd-option : Specifies a pattern to match and provides small text content. + motd-title : This text will be added in brackets after the <html><title> + motd-page : This text will be added in a panel on the face of the page, + with the "motd-page-url" being the hyperlink "More". + Values for the "location" attribute are: + page : on the face of the page, e.g. in the spare space of the toc + alt : at the bottom of the left-hand navigation panel + both : both + --> +<!-- + <motd> + <motd-option pattern="docs_0_80"> + <motd-title>v0.8-dev</motd-title> + <motd-page location="both"> + This is documentation for development version v0.8 + </motd-page> + <motd-page-url>/versions/index.html</motd-page-url> + </motd-option> + <motd-option pattern="docs_0_70"> + <motd-title>v0.7</motd-title> + <motd-page location="both"> + This is documentation for current version v0.7 + </motd-page> + <motd-page-url>/versions/index.html</motd-page-url> + </motd-option> + </motd> +--> + + <!-- + extra-css - here you can define custom css-elements that are + A) overriding the fallback elements or + B) adding the css definition from new elements that you may have + used in your documentation. + --> + <extra-css> + <!--Example of reason B: + To define the css definition of a new element that you may have used + in the class attribute of a <p> node. + e.g. <p class="quote"/> + --> + p.quote { + margin-left: 2em; + padding: .5em; + background-color: #f0f0f0; + font-family: monospace; + } + <!--Example: + To override the colours of links only in the footer. + --> + #footer a { color: #0F3660; } + #footer a:visited { color: #009999; } + </extra-css> + + <colors> + <!-- These values are used for the generated CSS files. + They essentially "override" the default colors defined in the chosen skin. + There are four duplicate "groups" of colors below, denoted by comments: + Color group: Forrest, Krysalis, Collabnet, and Lenya using Pelt. + They are provided for example only. To customize the colors of any skin, + uncomment one of these groups of color elements and change the values + of the particular color elements that you wish to change. + Note that by default, all color groups are commented-out which means that + the default colors provided by the skin are being used. + --> + + <!-- Color group: Forrest: example colors similar to forrest.apache.org + Some of the element names are obscure, so comments are added to show how + the "pelt" skin uses them, other skins might use these elements in a different way. + Tip: temporarily change the value of an element to red (#ff0000) and see the effect. + pelt: breadtrail: the strip at the top of the page and the second strip under the tabs + pelt: header: top strip containing project and group logos + pelt: heading|subheading: section headings within the content + pelt: navstrip: the strip under the tabs which contains the published date + pelt: menu: the left-hand navigation panel + pelt: toolbox: the selected menu item + pelt: searchbox: the background of the searchbox + pelt: border: line border around selected menu item + pelt: body: any remaining parts, e.g. the bottom of the page + pelt: footer: the second from bottom strip containing credit logos and published date + pelt: feedback: the optional bottom strip containing feedback link + --> + <color name="breadtrail" value="#cedfef" font="#0F3660" link="#0F3660" vlink="#0F3660" hlink="#000066"/> + <color name="header" value="#294563"/> + <color name="tab-selected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/> + <color name="tab-unselected" value="#b5c7e7" link="#0F3660" vlink="#0F3660" hlink="#000066"/> + <color name="subtab-selected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/> + <color name="subtab-unselected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/> + <color name="heading" value="#294563"/> + <color name="subheading" value="#4a6d8c"/> + <color name="published" value="#4C6C8F" font="#FFFFFF"/> + <color name="feedback" value="#4C6C8F" font="#FFFFFF" align="center"/> + <color name="navstrip" value="#4a6d8c" font="#ffffff" link="#0F3660" vlink="#0F3660" hlink="#000066"/> + <color name="menu" value="#4a6d8c" font="#cedfef" link="#ffffff" vlink="#ffffff" hlink="#ffcf00"/> + <color name="toolbox" value="#4a6d8c"/> + <color name="border" value="#294563"/> + <color name="dialog" value="#4a6d8c"/> + <color name="searchbox" value="#4a6d8c" font="#000000"/> + <color name="body" value="#ffffff" link="#0F3660" vlink="#009999" hlink="#000066"/> + <color name="table" value="#7099C5"/> + <color name="table-cell" value="#f0f0ff"/> + <color name="highlight" value="#ffff00"/> + <color name="fixme" value="#cc6600"/> + <color name="note" value="#006699"/> + <color name="warning" value="#990000"/> + <color name="code" value="#CFDCED"/> + <color name="footer" value="#cedfef"/> + + <!-- Color group: Krysalis --> + +<!-- + <color name="header" value="#FFFFFF"/> + + <color name="tab-selected" value="#a5b6c6" link="#000000" vlink="#000000" hlink="#000000"/> + <color name="tab-unselected" value="#F7F7F7" link="#000000" vlink="#000000" hlink="#000000"/> + <color name="subtab-selected" value="#a5b6c6" link="#000000" vlink="#000000" hlink="#000000"/> + <color name="subtab-unselected" value="#a5b6c6" link="#000000" vlink="#000000" hlink="#000000"/> + + <color name="heading" value="#a5b6c6"/> + <color name="subheading" value="#CFDCED"/> + + <color name="navstrip" value="#CFDCED" font="#000000" link="#000000" vlink="#000000" hlink="#000000"/> + <color name="toolbox" value="#a5b6c6"/> + <color name="border" value="#a5b6c6"/> + + <color name="menu" value="#F7F7F7" link="#000000" vlink="#000000" hlink="#000000"/> + <color name="dialog" value="#F7F7F7"/> + + <color name="body" value="#ffffff" link="#0F3660" vlink="#009999" hlink="#000066"/> + + <color name="table" value="#a5b6c6"/> + <color name="table-cell" value="#ffffff"/> + <color name="highlight" value="#ffff00"/> + <color name="fixme" value="#cc6600"/> + <color name="note" value="#006699"/> + <color name="warning" value="#990000"/> + <color name="code" value="#a5b6c6"/> + + <color name="footer" value="#a5b6c6"/> + +--> + + <!-- Color group: Collabnet --> +<!-- + <color name="header" value="#003366"/> + + <color name="tab-selected" value="#dddddd" link="#555555" vlink="#555555" hlink="#555555"/> + <color name="tab-unselected" value="#999999" link="#ffffff" vlink="#ffffff" hlink="#ffffff"/> + <color name="subtab-selected" value="#cccccc" link="#000000" vlink="#000000" hlink="#000000"/> + <color name="subtab-unselected" value="#cccccc" link="#555555" vlink="#555555" hlink="#555555"/> + + <color name="heading" value="#003366"/> + <color name="subheading" value="#888888"/> + + <color name="navstrip" value="#dddddd" font="#555555"/> + <color name="toolbox" value="#dddddd" font="#555555"/> + <color name="border" value="#999999"/> + + <color name="menu" value="#ffffff"/> + <color name="dialog" value="#eeeeee"/> + + <color name="body" value="#ffffff"/> + + <color name="table" value="#ccc"/> + <color name="table-cell" value="#ffffff"/> + <color name="highlight" value="#ffff00"/> + <color name="fixme" value="#cc6600"/> + <color name="note" value="#006699"/> + <color name="warning" value="#990000"/> + <color name="code" value="#003366"/> + + <color name="footer" value="#ffffff"/> +--> + <!-- Color group: Lenya using pelt--> +<!-- + + <color name="header" value="#ffffff"/> + + <color name="tab-selected" value="#E5E4D9" link="#000000" vlink="#000000" hlink="#000000"/> + <color name="tab-unselected" value="#F5F4E9" link="#000000" vlink="#000000" hlink="#000000"/> + <color name="subtab-selected" value="#000000" link="#000000" vlink="#000000" hlink="#000000"/> + <color name="subtab-unselected" value="#E5E4D9" link="#000000" vlink="#000000" hlink="#000000"/> + + <color name="heading" value="#E5E4D9"/> + <color name="subheading" value="#000000"/> + <color name="published" value="#000000"/> + <color name="navstrip" value="#E5E4D9" font="#000000"/> + <color name="toolbox" value="#CFDCED" font="#000000"/> + <color name="border" value="#999999"/> + + <color name="menu" value="#E5E4D9" font="#000000" link="#000000" vlink="#000000" hlink="#000000"/> + <color name="dialog" value="#CFDCED"/> + <color name="body" value="#ffffff" /> + + <color name="table" value="#ccc"/> + <color name="table-cell" value="#ffffff"/> + <color name="highlight" value="#ffff00"/> + <color name="fixme" value="#cc6600"/> + <color name="note" value="#006699"/> + <color name="warning" value="#990000"/> + <color name="code" value="#003366"/> + + <color name="footer" value="#E5E4D9"/> +--> + </colors> + + <!-- Settings specific to PDF output. --> + <pdf> + <!-- + Supported page sizes are a0, a1, a2, a3, a4, a5, executive, + folio, legal, ledger, letter, quarto, tabloid (default letter). + Supported page orientations are portrait, landscape (default + portrait). + Supported text alignments are left, right, justify (default left). + --> + <page size="letter" orientation="portrait" text-align="left"/> + + <!-- + Pattern of the page numbering in the footer - Default is "Page x". + first occurrence of '1' digit represents the current page number, + second occurrence of '1' digit represents the total page number, + anything else is considered as the static part of the numbering pattern. + Examples : x is the current page number, y the total page number. + <page-numbering-format>none</page-numbering-format> Do not displays the page numbering + <page-numbering-format>1</page-numbering-format> Displays "x" + <page-numbering-format>p1.</page-numbering-format> Displays "px." + <page-numbering-format>Page 1/1</page-numbering-format> Displays "Page x/y" + <page-numbering-format>(1-1)</page-numbering-format> Displays "(x-y)" + --> + <page-numbering-format>Page 1</page-numbering-format> + + <!-- + Margins can be specified for top, bottom, inner, and outer + edges. If double-sided="false", the inner edge is always left + and the outer is always right. If double-sided="true", the + inner edge will be left on odd pages, right on even pages, + the outer edge vice versa. + Specified below are the default settings. + --> + <margins double-sided="false"> + <top>1in</top> + <bottom>1in</bottom> + <inner>1.25in</inner> + <outer>1in</outer> + </margins> + + <!-- + Print the URL text next to all links going outside the file + --> + <show-external-urls>false</show-external-urls> + + <!-- + Disable the copyright footer on each page of the PDF. + A footer is composed for each page. By default, a "credit" with role=pdf + will be used, as explained below. Otherwise a copyright statement + will be generated. This latter can be disabled. + --> + <disable-copyright-footer>false</disable-copyright-footer> + </pdf> + + <!-- + Credits are typically rendered as a set of small clickable + images in the page footer. + + Use box-location="alt" to move the credits to an alternate location + (if the skin supports it). + + For example, pelt skin: + - box-location="alt" will place the logo at the end of the + left-hand coloured menu panel. + - box-location="alt2" will place them underneath that panel + in the left-hand whitespace. + - Otherwise they are placed next to the compatibility icons + at the bottom of the screen. + + Comment out the whole <credit>-element if you want no credits in the + web pages + --> + <credits> +<!-- <credit box-location="alt"> + <name>Built with Apache Forrest</name> + <url>http://forrest.apache.org/</url> + <image>images/built-with-forrest-button.png</image> + <width>88</width> + <height>31</height> + </credit>--> + <!-- A credit with @role="pdf" will be used to compose a footer + for each page in the PDF, using either "name" or "url" or both. + --> + <!-- + <credit role="pdf"> + <name>Built with Apache Forrest</name> + <url>http://forrest.apache.org/</url> + </credit> + --> + </credits> + +</skinconfig> Property changes on: trunk/core/components/documentation/master/documentation/skinconf.xml ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/core/components/documentation/master/skin/SFComponents.xml =================================================================== --- trunk/core/components/documentation/master/skin/SFComponents.xml (rev 0) +++ trunk/core/components/documentation/master/skin/SFComponents.xml 2007-06-07 11:31:35 UTC (rev 4261) @@ -0,0 +1,47 @@ +<?xml version="1.0"?> +<!-- + Copyright 2002-2004 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. +--> + +<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd"> + +<document> + <header> + <title>Smartfrog Components</title> + <notice>Select a Smartfrog Component from the list</notice> + <abstract>Here are the Smartfrog Components included in this distribution</abstract> + </header> + + <body> + <section> + <title>SmartFrog Components</title> + <p><a href="anubis/AnubisUserGuide.pdf">Anubis Components</a></p> + <p><a href="ant/ant_readme.html">Ant Components</a></p> + <p><a href="database/database_readme.html">Database Components </a></p> + <p><a href="emailer/emailer_readme.html">Email Components </a></p> + <p><a href="jetty/jetty_readme.html">Jetty Components </a></p> + <p><a href="jmx/jmx_readme.html">JMX Components </a></p> + <p><a href="net/net_readme.html">Network Components </a></p> + <p><a href="scripting/scripting_readme.html">Scripting Components </a></p> + <p><a href="slp/slp_readme.html">SLP Components</a></p> + <p><a href="ssh/ssh_readme.html"> SSH Components</a></p> + <p><a href="sfinstaller/sfinstaller_readme.html">SmartFrog Installer Components </a></p> + <p><a href="loggingservices/loggingservices_readme.html">SmartFrog Logging Services </a></p> + <p><a href="xml/xml_readme.html">XML Components</a></p> + <p><a href="www/www_readme.html">WWW Components</a></p> + </section> + </body> +</document> + Property changes on: trunk/core/components/documentation/master/skin/SFComponents.xml ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/core/components/documentation/master/skin/SFCore.xml =================================================================== --- trunk/core/components/documentation/master/skin/SFCore.xml (rev 0) +++ trunk/core/components/documentation/master/skin/SFCore.xml 2007-06-07 11:31:35 UTC (rev 4261) @@ -0,0 +1,25 @@ +<?xml version="1.0"?> +<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd"> +<document> + <header> + <title>Document Folder for SF Core</title> + <notice>Select a Document</notice> + <abstract>Document List</abstract> + </header> + <body> + <p><a href="SmartFrogTutorial.html">Tutorial</a></p> + <p><a href="sfQuickRef.html">Quick Reference</a></p> + <p><a href="sfUserManual.html">UserManual</a></p> + <p><a href="sfReference.html">Reference</a></p> + <p><a href="sfShellScript.html">Process Management</a></p> + <p><a href="sfWorkflow.html">Workflow Components</a></p> + <p><a href="sfLogging.html">Logging</a></p> + <p><a href="sfAutoloader.html">On-demand component loading</a></p> + <p><a href="ant_tasks_for_smartfrog.html">Ant tasks for SmartFrog</a></p> + <p><a href="writing_a_component.html">How to Write a Component</a></p> + <p><a href="IDE_development.html">IDE Development</a></p> + <p><a href="building_smartfrog.html">Building SmartFrog</a></p> + </body> + +</document> + Property changes on: trunk/core/components/documentation/master/skin/SFCore.xml ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/core/components/documentation/master/skin/SFExamples.xml =================================================================== --- trunk/core/components/documentation/master/skin/SFExamples.xml (rev 0) +++ trunk/core/components/documentation/master/skin/SFExamples.xml 2007-06-07 11:31:35 UTC (rev 4261) @@ -0,0 +1,32 @@ +<?xml version="1.0"?> +<!-- + Copyright 2002-2004 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. +--> +<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd"> +<document> + <header> + <title>Document Folder for SmartFrog Examples</title> + <notice>Select a Document</notice> + <abstract>Document List</abstract> + </header> + <body> + + <p><a href="sfDynamicWebServerExample.html">Dynamic WebServer Example</a></p> + + + </body> + +</document> + Property changes on: trunk/core/components/documentation/master/skin/SFExamples.xml ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/core/components/documentation/master/skin/anubis.xml =================================================================== --- trunk/core/components/documentation/master/skin/anubis.xml (rev 0) +++ trunk/core/components/documentation/master/skin/anubis.xml 2007-06-07 11:31:35 UTC (rev 4261) @@ -0,0 +1,25 @@ +<?xml version="1.0"?> +<!--DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "http://forrest.apache.org/dtd/document-v13.dtd" --> + +<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd"> +<document> + <header> + <title>Document Folder for ANUBIS Components</title> + <notice>Select a Document</notice> + <abstract>Document List</abstract> + </header> + + <body> + + <section> + <title>Welcome to the ANUBIS Components</title> + + <p> + <a href="AnubisUserGuide.pdf">ANUBIS User Guide</a> + </p> + </section> + + + </body> + +</document> Property changes on: trunk/core/components/documentation/master/skin/anubis.xml ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/core/components/documentation/master/skin/anubisdeployer.xml =================================================================== --- trunk/core/components/documentation/master/skin/anubisdeployer.xml (rev 0) +++ trunk/core/components/documentation/master/skin/anubisdeployer.xml 2007-06-07 11:31:35 UTC (rev 4261) @@ -0,0 +1,40 @@ +<?xml version="1.0"?> +<!-- + Copyright 2002-2004 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. +--> +<!--DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "http://forrest.apache.org/dtd/document-v13.dtd" --> + +<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd"> +<document> + <header> + <title>Document Folder for Anubis Deployer Components</title> + <notice>Select a Document</notice> + <abstract>Document List</abstract> + </header> + + <body> + + <section> + <title>Welcome to the Anubis Deployer Components</title> + + <p> + <a href="sfinstaller.html">Anubis Deployer Readme Document</a> + </p> + </section> + + + </body> + +</document> Property changes on: trunk/core/components/documentation/master/skin/anubisdeployer.xml ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/core/components/documentation/master/skin/cddlm.xml =================================================================== --- trunk/core/components/documentation/master/skin/cddlm.xml (rev 0) +++ trunk/core/components/documentation/master/skin/cddlm.xml 2007-06-07 11:31:35 UTC (rev 4261) @@ -0,0 +1,37 @@ +<?xml version="1.0"?> +<!-- + Copyright 2002-2004 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. +--> +<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd"> +<document> + <header> + <title>Document Folder for CDDLM Components</title> + <notice>Select a Document</notice> + <abstract>Document List</abstract> + </header> + <body> + + + + <p><a href="ReadMe.html">ReadMe</a></p> + <p><a href="UserManual.html">User Manual</a></p> + <p><a href="CDL-implementation-notes.html">CDL-Implementation-notes</a></p> + <p><a href="Deployment_API.doc">Deployment API</a></p> + <p><a href="ComponentDiscription.html">ComponentDiscription</a></p> + + + </body> + +</document> Property changes on: trunk/core/components/documentation/master/skin/cddlm.xml ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/core/components/documentation/master/skin/database.xml =================================================================== --- trunk/core/components/documentation/master/skin/database.xml (rev 0) +++ trunk/core/components/documentation/master/skin/database.xml 2007-06-07 11:31:35 UTC (rev 4261) @@ -0,0 +1,31 @@ +<?xml version="1.0"?> +<!-- + Copyright 2002-2004 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. +--> +<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd"> +<document> + <header> + <title>Document Folder for Database Components</title> + <notice>Select a Document</notice> + <abstract>Document List</abstract> + </header> + <body> + + + <p><a href="database_readme.html">Database Components User Manual</a></p> + + </body> + +</document> Property changes on: trunk/core/components/documentation/master/skin/database.xml ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/core/components/documentation/master/skin/emailer.xml =================================================================== --- trunk/core/components/documentation/master/skin/emailer.xml (rev 0) +++ trunk/core/components/documentation/master/skin/emailer.xml 2007-06-07 11:31:35 UTC (rev 4261) @@ -0,0 +1,37 @@ +<?xml version="1.0"?> +<!-- + Copyright 2002-2004 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. +--> + +<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd"> +<document> + <header> + <title>Document Folder for Emailer Components</title> + </header> + + <body> + + <section> + <title>Welcome to the Emailer Components</title> + + <p> + <a href="emailer_readme.html">Emailer User Manual</a> + </p> + </section> + + + </body> + +</document> Property changes on: trunk/core/components/documentation/master/skin/emailer.xml ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/core/components/documentation/master/skin/forrest.properties =================================================================== --- trunk/core/components/documentation/master/skin/forrest.properties (rev 0) +++ trunk/core/components/documentation/master/skin/forrest.properties 2007-06-07 11:31:35 UTC (rev 4261) @@ -0,0 +1,129 @@ +# Copyright 2002-2005 The Apache Software Foundation or its licensors, +# as applicable. +# +# 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. + +############## +# Properties used by forrest.build.xml for building the website +# These are the defaults, un-comment them only if you need to change them. +############## + +# Prints out a summary of Forrest settings for this project +#forrest.echo=true + +# Project name (used to name .war file) +#project.name=my-project + +# Specifies name of Forrest skin to use +# See list at http://forrest.apache.org/docs/skins.html +#project.skin=pelt + +# Descriptors for plugins and skins +# comma separated list, file:// is supported +#forrest.skins.descriptors=http://forrest.apache.org/skins/skins.xml,file:///c:/myskins/skins.xml +#forrest.plugins.descriptors=http://forrest.apache.org/plugins/plugins.xml,http://forrest.apache.org/plugins/whiteboard-plugins.xml + +############## +# behavioural properties +#project.menu-scheme=tab_attributes +#project.menu-scheme=directories + +############## +# layout properties + +# Properties that can be set to override the default locations +# +# Parent properties must be set. This usually means uncommenting +# project.content-dir if any other property using it is uncommented + +#project.status=status.xml +#project.content-dir=src/documentation +#project.raw-content-dir=${project.content-dir}/content +#project.conf-dir=${project.content-dir}/conf +#project.sitemap-dir=${project.content-dir} +#project.xdocs-dir=${project.content-dir}/content/xdocs +#project.resources-dir=${project.content-dir}/resources +#project.stylesheets-dir=${project.resources-dir}/stylesheets +#project.images-dir=${project.resources-dir}/images +#project.schema-dir=${project.resources-dir}/schema +#project.skins-dir=${project.content-dir}/skins +#project.skinconf=${project.content-dir}/skinconf.xml +#project.lib-dir=${project.content-dir}/lib +#project.classes-dir=${project.content-dir}/classes +#project.translations-dir=${project.content-dir}/translations + +############## +# validation properties + +# This set of properties determine if validation is performed +# Values are inherited unless overridden. +# e.g. if forrest.validate=false then all others are false unless set to true. +forrest.validate=false +#forrest.validate.xdocs=${forrest.validate} +#forrest.validate.skinconf=${forrest.validate} +#forrest.validate.sitemap=${forrest.validate} +#forrest.validate.stylesheets=${forrest.validate} +#forrest.validate.skins=${forrest.validate} +#forrest.validate.skins.stylesheets=${forrest.validate.skins} + +# *.failonerror=(true|false) - stop when an XML file is invalid +#forrest.validate.failonerror=true + +# *.excludes=(pattern) - comma-separated list of path patterns to not validate +# e.g. +#forrest.validate.xdocs.excludes=samples/subdir/**, samples/faq.xml +#forrest.validate.xdocs.excludes= + + +############## +# General Forrest properties + +# The URL to start crawling from +#project.start-uri=linkmap.html + +# Set logging level for messages printed to the console +# (DEBUG, INFO, WARN, ERROR, FATAL_ERROR) +#project.debuglevel=ERROR + +# Max memory to allocate to Java +#forrest.maxmemory=64m + +# Any other arguments to pass to the JVM. For example, to run on an X-less +# server, set to -Djava.awt.headless=true +#forrest.jvmargs= + +# The bugtracking URL - the issue number will be appended +#project.bugtracking-url=http://issues.apache.org/bugzilla/show_bug.cgi?id= +#project.bugtracking-url=http://issues.apache.org/jira/browse/ + +# The issues list as rss +#project.issues-rss-url= + +#I18n Property. Based on the locale request for the browser. +#If you want to use it for static site then modify the JVM system.language +# and run once per language +#project.i18n=true + +# The names of plugins that are required to build the project +# comma separated list (no spaces) +# You can request a specific version by appending "-VERSION" to the end of +# the plugin name. If you exclude a version number the latest released version +# will be used, however, be aware that this may be a development version. In +# a production environment it is recomended that you specify a known working +# version. +# Run "forrest available-plugins" for a list of plug-ins currently available +project.required.plugins=org.apache.forrest.plugin.output.pdf,org.apache.forrest.plugin.input.OpenOffice.org + +# Proxy configuration +proxy.host=15.104.253.10 +proxy.port=8080 Property changes on: trunk/core/components/documentation/master/skin/forrest.properties ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/core/components/documentation/master/skin/frog.gif =================================================================== (Binary files differ) Property changes on: trunk/core/components/documentation/master/skin/frog.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core/components/documentation/master/skin/index.xml =================================================================== --- trunk/core/components/documentation/master/skin/index.xml (rev 0) +++ trunk/core/components/documentation/master/skin/index.xml 2007-06-07 11:31:35 UTC (rev 4261) @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2002-2004 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. +--> +<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd"> +<document> + <header> + <title>Welcome to SmartFrog</title> + </header> + <body> + <section id="titlepage"> + <title>Smart Framework for Object Groups</title> + +<p> + SmartFrog is a technology +for describing distributed software systems as collections of +cooperating components, and then activating and managing them. It was +developed at HP Labs in Bristol, in the UK. The core SmartFrog +framework is released under the + <a href="http://www.gnu.org/copyleft/lesser.html" >LGPL</a>. +</p> +<p >SmartFrog project +development is hosted on Sourceforge:</p> +<ul> + <li> + Project development web site: + <a href="http://sourceforge.net/projects/smartfrog">http://sourceforge.net/projects/smartfrog</a>. + </li> + <li> + Package downloads: + <a href="http://sourceforge.net/project/showfiles.php?group_id=87384&package_id=108447">downloads</a> + page. + </li> +</ul> +<p>SmartFrog consists of a +language for describing component collections and component +configuration parameters, and a runtime environmentwhich +activates and manages the components to deliver and maintain running +systems. +</p> + <img src="smartfrogdoc/overview_html_39c627ce.gif" alt="frog" /> +<p> +SmartFrog has wide applicability across domains ranging from utility computing +to large-scale system configuration. +</p> +<p >SmartFrog is a framework +to build from, not a packaged solution. Typically, we write new +components for each new service, and then use SmartFrog to describe +and activate them. However, the framework is populated with a number +of general purpose components that can be reused across services, and +we are adding to their number.</p> +<p >SmartFrog and its +components are implemented in Java, though SmartFrog +components can easily be written to encapsulate software components +based on other technologies.</p> + </section> + </body> +</document> Property changes on: trunk/core/components/documentation/master/skin/index.xml ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/core/components/documentation/master/skin/jetty.xml =================================================================== --- trunk/core/components/documentation/master/skin/jetty.xml (rev 0) +++ trunk/core/components/documentation/master/skin/jetty.xml 2007-06-07 11:31:35 UTC (rev 4261) @@ -0,0 +1,31 @@ +<?xml version="1.0"?> +<!-- + Copyright 2002-2004 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. +--> +<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd"> +<document> + <header> + <title>Document Folder for Jetty Components</title> + <notice>Select a Document</notice> + <abstract>Document List</abstract> + </header> + <body> + + + <p><a href="jetty_readme.html">Jetty Components User Manual</a></p> + + </body> + +</document> Property changes on: trunk/core/components/documentation/master/skin/jetty.xml ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/core/components/documentation/master/skin/logger.xml =================================================================== --- trunk/core/components/documentation/master/skin/logger.xml (rev 0) +++ trunk/core/components/documentation/master/skin/logger.xml 2007-06-07 11:31:35 UTC (rev 4261) @@ -0,0 +1,31 @@ +<?xml version="1.0"?> +<!-- + Copyright 2002-2004 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. +--> +<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd"> +<document> + <header> + <title>Document Folder for Logger Components</title> + <notice>Select a Document</notice> + <abstract>Document List</abstract> + </header> + <body> + + + <p><a href="logger_readme.html">Readme</a></p> + + </body> + +</document> Property changes on: trunk/core/components/documentation/master/skin/logger.xml ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/core/components/documentation/master/skin/loggingservices.xml =================================================================== --- trunk/core/components/documentation/master/skin/loggingservices.xml (rev 0) +++ trunk/core/components/documentation/master/skin/loggingservices.xml 2007-06-07 11:31:35 UTC (rev 4261) @@ -0,0 +1,37 @@ +<?xml version="1.0"?> +<!-- + Copyright 2002-2004 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, + WITHOU... [truncated message content] |
From: <st...@us...> - 2007-06-19 16:02:28
|
Revision: 4355 http://svn.sourceforge.net/smartfrog/?rev=4355&view=rev Author: steve_l Date: 2007-06-19 09:02:26 -0700 (Tue, 19 Jun 2007) Log Message: ----------- Making sure there are no references to ${junit.jar} anywhere in ivy-driven projects. Modified Paths: -------------- trunk/core/components/xml/build.xml trunk/core/components/xmpp/build.xml Modified: trunk/core/components/xml/build.xml =================================================================== --- trunk/core/components/xml/build.xml 2007-06-19 15:56:34 UTC (rev 4354) +++ trunk/core/components/xml/build.xml 2007-06-19 16:02:26 UTC (rev 4355) @@ -129,40 +129,14 @@ </sf-javadoc> </target> - <!-- ========================================================== --> - <!-- this is an override point --> - <!-- compile everything, copy useful files over--> - <!-- ========================================================== --> -<!-- - <target name="compile-tests" - depends="ready-to-compile-tests" - if="java1.5+" - > - <depend - srcdir="${test.src.dir}" - destdir="${test.classes.dir}" - cache="${build.test.dir}/depends" - closure="yes"/> - <sf-javac - srcdir="${test.src.dir}" - destdir="${test.classes.dir}" - classpathref="tests.compile.classpath" - source="${javac.version}" - target="${javac.version}" - /> - <copy-useful-files src="${test.src.dir}" dest="${test.classes.dir}"/> - </target> ---> - - <!-- ========================================================== --> <!-- parse test files --> <!-- ========================================================== --> <target name="parse" depends="init-codebase,package-tests" description="parse the deployment descriptor"> <property name="parse.quiet" value="true"/> <sf-parse quiet="${parse.quiet}"> - <classpath path="${target.jar}:${test.jar}"/> + <classpath refid="tests.run.classpath"/> <sysproperty key="org.smartfrog.codebase" value="${codebase}"/> <!-- source files --> @@ -192,18 +166,6 @@ <property name="application.name" value="${project.name}"/> </target> - <!-- ========================================================== --> - <!-- set--> - <!-- ========================================================== --> -<!-- <target name="init-codebase" depends="init-deploy-properties,declare-classpaths,package-tests" - description="set up the codebase property"> - <makeurl property="codebase"> - <path refid="tests.run.classpath"/> - </makeurl> - <echo> - deploying to ${deploy.host} - codebase=${codebase}</echo> - </target>--> <!-- ========================================================== --> <!-- deploy; requires a host --> Modified: trunk/core/components/xmpp/build.xml =================================================================== --- trunk/core/components/xmpp/build.xml 2007-06-19 15:56:34 UTC (rev 4354) +++ trunk/core/components/xmpp/build.xml 2007-06-19 16:02:26 UTC (rev 4355) @@ -41,29 +41,14 @@ <!-- Import common stuff --> <import file="${root.dir}/common.xml"/> + <import file="../../common.xml"/> - <target name="init" depends="common.init"> <echo message="==================================================================="/> <echo message="= ${ant.project.name}"/> </target> - <!-- ========================================================== --> - <!-- create a distro. - we want both sf-junit and the test har --> - <!-- ========================================================== --> - <!--target name="dist" depends="package,package-tests"--> - <target name="dist" depends="package" - description="create a distribution"> - </target> - - <target name="dist-tests" depends="package,package-tests" - description="create a distribution including SF tests"> - - </target> - - <!-- ========================================================== --> <!-- parse the file --> <!-- ========================================================== --> @@ -71,7 +56,7 @@ description="parse the deployment descriptor"> <property name="parse.quiet" value="true"/> <sf-parse quiet="${parse.quiet}"> - <classpath path="${target.jar}:${test.jar}"/> + <classpath refid="tests.run.classpath"/> <sysproperty key="org.smartfrog.codebase" value="${codebase}"/> <sysproperty key="xmpp.password" value=""/> @@ -92,22 +77,9 @@ <property name="application.name" value="${project.name}"/> </target> + + <!-- ========================================================== --> - <!-- set--> - <!-- ========================================================== --> - <target name="init-codebase" depends="init-deploy-properties" - description="deploy"> - <makeurl property="codebase"> - <fileset file="${target.jar}"/> - <fileset file="${test.jar}"/> - <fileset file="${junit.jar}"/> - </makeurl> - <echo> - deploying to ${deploy.host} - codebase=${codebase} - </echo> - </target> - <!-- ========================================================== --> <!-- deploy; requires a host --> <!-- ========================================================== --> <target name="deploy" depends="parse,init-codebase,init-deploy-properties" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-06-20 13:20:47
|
Revision: 4365 http://svn.sourceforge.net/smartfrog/?rev=4365&view=rev Author: steve_l Date: 2007-06-20 06:20:43 -0700 (Wed, 20 Jun 2007) Log Message: ----------- SFOS-172 Added Paths: ----------- trunk/core/components/ant/test/org/smartfrog/test/ trunk/core/components/ant/test/org/smartfrog/test/system/ trunk/core/components/ant/test/org/smartfrog/test/system/components/ trunk/core/components/ant/test/org/smartfrog/test/system/components/ant/ trunk/core/components/ant/test/org/smartfrog/test/system/components/ant/AntTest.java trunk/core/components/ant/test/org/smartfrog/test/system/components/ant/ant.sf trunk/core/components/atom/atom.iml trunk/core/components/emailer/test/ trunk/core/components/emailer/test/org/ trunk/core/components/emailer/test/org/smartfrog/ trunk/core/components/emailer/test/org/smartfrog/test/ trunk/core/components/emailer/test/org/smartfrog/test/system/ trunk/core/components/emailer/test/org/smartfrog/test/system/components/ trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/ trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/EmailerTest.java trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/tcn64.sf trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/tcn65.sf trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/tcn66.sf trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/tcn67.sf trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/tcp23.sf trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/tcp24.sf trunk/core/components/net/test/ trunk/core/components/net/test/org/ trunk/core/components/net/test/org/smartfrog/ trunk/core/components/net/test/org/smartfrog/test/ trunk/core/components/net/test/org/smartfrog/test/system/ trunk/core/components/net/test/org/smartfrog/test/system/components/ trunk/core/components/net/test/org/smartfrog/test/system/components/net/ trunk/core/components/net/test/org/smartfrog/test/system/components/net/NetTest.java trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn68.sf trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn69.sf trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn70.sf trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn71.sf trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn72.sf trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn73.sf trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn74.sf trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn75.sf trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn76.sf trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcp25.sf trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcp26.sf trunk/core/components/scripting/test/ trunk/core/components/scripting/test/org/ trunk/core/components/scripting/test/org/smartfrog/ trunk/core/components/scripting/test/org/smartfrog/test/ trunk/core/components/scripting/test/org/smartfrog/test/system/ trunk/core/components/scripting/test/org/smartfrog/test/system/components/ trunk/core/components/scripting/test/org/smartfrog/test/system/components/scripting/ trunk/core/components/scripting/test/org/smartfrog/test/system/components/scripting/ScriptingTest.java trunk/core/components/scripting/test/org/smartfrog/test/system/components/scripting/TCN80.sf trunk/core/components/scripting/test/org/smartfrog/test/system/components/scripting/TCN81.sf trunk/core/components/scripting/test/org/smartfrog/test/system/components/scripting/TCP50.sf trunk/core/components/scripting/test/org/smartfrog/test/system/components/scripting/TCP51.sf trunk/core/components/scripting/test/org/smartfrog/test/system/components/scripting/TCP52.sf trunk/core/components/scripting/test/org/smartfrog/test/system/components/scripting/TCP53.sf trunk/core/components/scripting/test/org/smartfrog/test/system/components/scripting/sampleSfStart.bat trunk/core/components/scripting/test/org/smartfrog/test/system/components/scripting/testscript.bsh trunk/core/components/slp/test/ trunk/core/components/slp/test/org/ trunk/core/components/slp/test/org/smartfrog/ trunk/core/components/slp/test/org/smartfrog/test/ trunk/core/components/slp/test/org/smartfrog/test/system/ trunk/core/components/slp/test/org/smartfrog/test/system/components/ trunk/core/components/slp/test/org/smartfrog/test/system/components/slp/ trunk/core/components/slp/test/org/smartfrog/test/system/components/slp/SLPTest.java trunk/core/components/slp/test/org/smartfrog/test/system/components/slp/ServcieProvider.sf trunk/core/components/slp/test/org/smartfrog/test/system/components/slp/ServiceRequestor.sf trunk/core/components/slp/test/org/smartfrog/test/system/components/slp/tcn80.sf trunk/core/components/slp/test/org/smartfrog/test/system/components/slp/tcn81.sf trunk/core/components/slp/test/org/smartfrog/test/system/components/slp/tcn82.sf trunk/core/components/slp/test/org/smartfrog/test/system/components/slp/tcn84_SA.sf trunk/core/components/slp/test/org/smartfrog/test/system/components/slp/tcn84_UA.sf trunk/core/components/slp/test/org/smartfrog/test/system/components/slp/tcp41_SA.sf trunk/core/components/slp/test/org/smartfrog/test/system/components/slp/tcp41_UA.sf trunk/core/components/ssh/test/ trunk/core/components/ssh/test/org/ trunk/core/components/ssh/test/org/smartfrog/ trunk/core/components/ssh/test/org/smartfrog/test/ trunk/core/components/ssh/test/org/smartfrog/test/system/ trunk/core/components/ssh/test/org/smartfrog/test/system/components/ trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/ trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/SSHTest.java trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/tcn83.sf trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/tcn84.sf trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/tcn85.sf trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/tcn86.sf trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/tcn87.sf trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/tcn88.sf trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/tcn89.sf trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/tcn90.sf trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/tcn91.sf trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/tcn92.sf trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/tcn93.sf trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/tcn94.sf trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/tcp29.sf trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/tcp30.sf trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/tcp_scp.sf trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/tcp_sshexec.sf trunk/core/components/xmpp/doc/ Removed Paths: ------------- trunk/core/components/ant/test/org/smartfrog/test/system/components/ant/AntTest.java trunk/core/components/ant/test/org/smartfrog/test/system/components/ant/ant.sf trunk/core/components/net/test/org/smartfrog/test/system/components/net/NetTest.java trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn68.sf trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn69.sf trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn70.sf trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn71.sf trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn72.sf trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn73.sf trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn74.sf trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn75.sf trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn76.sf trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcp25.sf trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcp26.sf trunk/core/components/slp/test/org/smartfrog/test/system/components/slp/SLPTest.java trunk/core/components/slp/test/org/smartfrog/test/system/components/slp/ServcieProvider.sf trunk/core/components/slp/test/org/smartfrog/test/system/components/slp/ServiceRequestor.sf trunk/core/components/slp/test/org/smartfrog/test/system/components/slp/tcn80.sf trunk/core/components/slp/test/org/smartfrog/test/system/components/slp/tcn81.sf trunk/core/components/slp/test/org/smartfrog/test/system/components/slp/tcn82.sf trunk/core/components/slp/test/org/smartfrog/test/system/components/slp/tcn84_SA.sf trunk/core/components/slp/test/org/smartfrog/test/system/components/slp/tcn84_UA.sf trunk/core/components/slp/test/org/smartfrog/test/system/components/slp/tcp41_SA.sf trunk/core/components/slp/test/org/smartfrog/test/system/components/slp/tcp41_UA.sf Copied: trunk/core/components/ant/test/org/smartfrog/test/system/components/ant (from rev 4362, trunk/core/testharness/testcases/org/smartfrog/test/system/components/ant) Deleted: trunk/core/components/ant/test/org/smartfrog/test/system/components/ant/AntTest.java =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/components/ant/AntTest.java 2007-06-19 16:51:35 UTC (rev 4362) +++ trunk/core/components/ant/test/org/smartfrog/test/system/components/ant/AntTest.java 2007-06-20 13:20:43 UTC (rev 4365) @@ -1,46 +0,0 @@ -/** (C) Copyright 2004 Hewlett-Packard Development Company, LP - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - For more information: www.smartfrog.org - - */ - - -package org.smartfrog.test.system.components.ant; - -import org.smartfrog.test.SmartFrogTestBase; -import org.smartfrog.sfcore.prim.Prim; - -/** - * JUnit test class for test cases related to "emailer" component - */ -public class AntTest - extends SmartFrogTestBase { - - private static final String FILES = "org/smartfrog/test/system/components/ant/"; - - public AntTest(String s) { - super(s); - } - - public void testCaseANT() throws Throwable { - - Prim applicationANT = deployExpectingSuccess(FILES+"ant.sf", "tcANT"); - assertNotNull(applicationANT); - - } -} - Copied: trunk/core/components/ant/test/org/smartfrog/test/system/components/ant/AntTest.java (from rev 4363, trunk/core/testharness/testcases/org/smartfrog/test/system/components/ant/AntTest.java) =================================================================== --- trunk/core/components/ant/test/org/smartfrog/test/system/components/ant/AntTest.java (rev 0) +++ trunk/core/components/ant/test/org/smartfrog/test/system/components/ant/AntTest.java 2007-06-20 13:20:43 UTC (rev 4365) @@ -0,0 +1,46 @@ +/** (C) Copyright 2004 Hewlett-Packard Development Company, LP + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + For more information: www.smartfrog.org + + */ + + +package org.smartfrog.test.system.components.ant; + +import org.smartfrog.test.SmartFrogTestBase; +import org.smartfrog.sfcore.prim.Prim; + +/** + * JUnit test class for test cases related to "emailer" component + */ +public class AntTest + extends SmartFrogTestBase { + + private static final String FILES = "org/smartfrog/test/system/components/ant/"; + + public AntTest(String s) { + super(s); + } + + public void testCaseANT() throws Throwable { + + Prim applicationANT = deployExpectingSuccess(FILES+"ant.sf", "tcANT"); + assertNotNull(applicationANT); + + } +} + Deleted: trunk/core/components/ant/test/org/smartfrog/test/system/components/ant/ant.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/components/ant/ant.sf 2007-06-19 16:51:35 UTC (rev 4362) +++ trunk/core/components/ant/test/org/smartfrog/test/system/components/ant/ant.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -1,38 +0,0 @@ -/** (C) Copyright Hewlett-Packard Development Company, LP - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -For more information: www.smartfrog.org -**/ - -#include "org/smartfrog/components.sf" -#include "org/smartfrog/services/ant/components.sf" - - -sfConfig extends Ant { - echoTask extends echo { - message "hello world!"; - } - - echoMedTask extends echo { - message "--------------------------------"; - } - - echoSFHOMETask extends echo { - message "SFHOME is ${env.SFHOME}"; - } -} - - Copied: trunk/core/components/ant/test/org/smartfrog/test/system/components/ant/ant.sf (from rev 4363, trunk/core/testharness/testcases/org/smartfrog/test/system/components/ant/ant.sf) =================================================================== --- trunk/core/components/ant/test/org/smartfrog/test/system/components/ant/ant.sf (rev 0) +++ trunk/core/components/ant/test/org/smartfrog/test/system/components/ant/ant.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -0,0 +1,38 @@ +/** (C) Copyright Hewlett-Packard Development Company, LP + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +For more information: www.smartfrog.org +**/ + +#include "org/smartfrog/components.sf" +#include "org/smartfrog/services/ant/components.sf" + + +sfConfig extends Ant { + echoTask extends echo { + message "hello world!"; + } + + echoMedTask extends echo { + message "--------------------------------"; + } + + echoSFHOMETask extends echo { + message "SFHOME is ${env.SFHOME}"; + } +} + + Added: trunk/core/components/atom/atom.iml =================================================================== --- trunk/core/components/atom/atom.iml (rev 0) +++ trunk/core/components/atom/atom.iml 2007-06-20 13:20:43 UTC (rev 4365) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="testharness" /> + <orderEntry type="module" module-name="SmartFrog" /> + <orderEntry type="module" module-name="xunit" /> + <orderEntry type="module" module-name="www" /> + <orderEntry type="module" module-name="jetty" /> + <orderEntry type="library" exported="" name="JDom" level="application" /> + <orderEntry type="library" exported="" name="rome-0.8" level="application" /> + <orderEntryProperties /> + </component> +</module> + Added: trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/EmailerTest.java =================================================================== --- trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/EmailerTest.java (rev 0) +++ trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/EmailerTest.java 2007-06-20 13:20:43 UTC (rev 4365) @@ -0,0 +1,75 @@ +/** (C) Copyright 2004 Hewlett-Packard Development Company, LP + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + For more information: www.smartfrog.org + + */ + + +package org.smartfrog.test.system.components.emailer; + +import org.smartfrog.test.SmartFrogTestBase; +import org.smartfrog.sfcore.prim.Prim; + +/** + * JUnit test class for test cases related to "emailer" component + */ +public class EmailerTest + extends SmartFrogTestBase { + + private static final String FILES = "org/smartfrog/test/system/components/emailer/"; + + public EmailerTest(String s) { + super(s); + } + + public void testCaseTCN64() throws Exception { + deployExpectingException(FILES+"tcn64.sf", + "tcn64", + EXCEPTION_LIFECYCLE, + "sfStart", + EXCEPTION_SMARTFROG, + "Unknown SMTP host: no-such-hostname"); + } + + public void testCaseTCN65() throws Exception { + deployExpectingException(FILES+"tcn65.sf", + "tcn65", + EXCEPTION_DEPLOYMENT, + null, + EXCEPTION_RESOLUTION, + "error in schema: non-optional attribute 'to' is missing"); + } + + public void testCaseTCN66() throws Exception { + deployExpectingException(FILES+"tcn66.sf", + "tcn66", + EXCEPTION_DEPLOYMENT, + null, + EXCEPTION_RESOLUTION, + "error in schema: non-optional attribute 'from' is missing"); + } + + public void testCaseTCN67() throws Exception { + deployExpectingException(FILES+"tcn67.sf", + "tcn67", + EXCEPTION_DEPLOYMENT, + null, + EXCEPTION_RESOLUTION, + "error in schema: non-optional attribute 'smtpHost' is missing"); + } +} + Added: trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/tcn64.sf =================================================================== --- trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/tcn64.sf (rev 0) +++ trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/tcn64.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -0,0 +1,11 @@ +#include "org/smartfrog/components.sf" +#include "org/smartfrog/services/email/emailer.sf" + +sfConfig extends Emailer { + runAsWorkFlowComponent true; + to "ri...@in..."; + from "sma...@in..."; + message "This is a test message \n thanks"; + subject "SF Emailer Test"; + smtpHost "no-such-hostname"; // SMTP host name +} Added: trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/tcn65.sf =================================================================== --- trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/tcn65.sf (rev 0) +++ trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/tcn65.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -0,0 +1,10 @@ +#include "org/smartfrog/components.sf" +#include "org/smartfrog/services/email/emailer.sf" + +sfConfig extends Emailer { + runAsWorkFlowComponent true; + from "sma...@in..."; + message "This is a test message \n thanks"; + subject "SF Emailer Test"; + smtpHost "stash.india.hp.com"; // SMTP host name +} Added: trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/tcn66.sf =================================================================== --- trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/tcn66.sf (rev 0) +++ trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/tcn66.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -0,0 +1,10 @@ +#include "org/smartfrog/components.sf" +#include "org/smartfrog/services/email/emailer.sf" + +sfConfig extends Emailer { + runAsWorkFlowComponent true; + to "ri...@in..."; + message "This is a test message \n thanks"; + subject "SF Emailer Test"; + smtpHost "stash.india.hp.com"; // SMTP host name +} Added: trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/tcn67.sf =================================================================== --- trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/tcn67.sf (rev 0) +++ trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/tcn67.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -0,0 +1,10 @@ +#include "org/smartfrog/components.sf" +#include "org/smartfrog/services/email/emailer.sf" + +sfConfig extends Emailer { + runAsWorkFlowComponent true; + to "ri...@in..."; + from "sma...@in..."; + message "This is a test message \n thanks"; + subject "SF Emailer Test"; +} Added: trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/tcp23.sf =================================================================== --- trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/tcp23.sf (rev 0) +++ trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/tcp23.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -0,0 +1,44 @@ +/** (C) Copyright 1998-2004 Hewlett-Packard Development Company, LP + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +For more information: www.smartfrog.org + +*/ + +#include "org/smartfrog/components.sf" +#include "org/smartfrog/services/email/emailer.sf" + +Example extends Compound { + mailer extends Emailer { + to "ri...@in..."; + from "sma...@in..."; + smtpHost "stash.india.hp.com"; + runAsWorkFlowComponent false; + } + Foo extends Prim { + sfClass "org.smartfrog.services.email.EmailerTest"; + sfProcessHost "ebnt171.india.hp.com"; + sfProcessComponentName "Foo"; + myMailer LAZY PARENT:mailer; + } + Bar extends Prim { + sfClass "org.smartfrog.services.email.EmailerTest"; + sfProcessHost "eb97201.india.hp.com"; + sfProcessComponentName "Bar"; + myMailer LAZY PARENT:mailer; + } +} +sfConfig extends Example; Added: trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/tcp24.sf =================================================================== --- trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/tcp24.sf (rev 0) +++ trunk/core/components/emailer/test/org/smartfrog/test/system/components/emailer/tcp24.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -0,0 +1,48 @@ +/** (C) Copyright 1998-2004 Hewlett-Packard Development Company, LP + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +For more information: www.smartfrog.org + +*/ + +#include "org/smartfrog/components.sf" +#include "org/smartfrog/services/email/emailer.sf" +#include "org/smartfrog/sfcore/workflow/components.sf" + +Example extends Sequence { +// actions extends LAZY { + Foo extends Prim { + sfClass "org.smartfrog.services.email.EmailerTest"; + sfProcessHost "eb97201.india.hp.com"; + sfProcessComponentName "Foo"; + } + Bar extends Prim { + sfClass "org.smartfrog.services.email.EmailerTest"; + sfProcessHost "eb97201.india.hp.com"; + sfProcessComponentName "Bar"; + } + mailer extends Emailer { + // mail will be send when mailer executes as part of work-flow + runAsWorkFlowComponent true; + to "ri...@in..."; + from "sma...@in..."; + message "This is a test message \n thanks"; + subject "SF Emailer Test"; + smtpHost "stash.india.hp.com"; // SMTP host name + } +// } +} +sfConfig extends Example; Copied: trunk/core/components/net/test/org/smartfrog/test/system/components/net (from rev 4362, trunk/core/testharness/testcases/org/smartfrog/test/system/components/net) Deleted: trunk/core/components/net/test/org/smartfrog/test/system/components/net/NetTest.java =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/components/net/NetTest.java 2007-06-19 16:51:35 UTC (rev 4362) +++ trunk/core/components/net/test/org/smartfrog/test/system/components/net/NetTest.java 2007-06-20 13:20:43 UTC (rev 4365) @@ -1,120 +0,0 @@ -/** (C) Copyright 2004 Hewlett-Packard Development Company, LP - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - For more information: www.smartfrog.org - - */ - - -package org.smartfrog.test.system.components.net; - -import org.smartfrog.test.SmartFrogTestBase; -import org.smartfrog.sfcore.prim.Prim; - -/** - * JUnit test class for test cases related to "net" component - */ -public class NetTest - extends SmartFrogTestBase { - - private static final String FILES = "org/smartfrog/test/system/components/net/"; - - public NetTest(String s) { - super(s); - } - - public void testCaseTCN68() throws Exception { - deployExpectingException(FILES+"tcn68.sf", - "tcn68", - "SmartFrogLifecycleException", - "sfDeploy", - "SmartFrogException", - "java.io.FileNotFoundException: e:\\test\\password.txt"); - } - - public void testCaseTCN69() throws Exception { - deployExpectingException(FILES+"tcn69.sf", - "tcn69", - "SmartFrogDeploymentException", - null, - EXCEPTION_RESOLUTION, - "error in schema: non-optional attribute 'host' is missing"); - } - - public void testCaseTCN70() throws Exception { - deployExpectingException(FILES+"tcn70.sf", - "tcn70", - "SmartFrogDeploymentException", - null, - EXCEPTION_RESOLUTION, - "error in schema: non-optional attribute 'username' is missing"); - } - - public void testCaseTCN71() throws Exception { - deployExpectingException(FILES+"tcn71.sf", - "tcn71", - "SmartFrogDeploymentException", - null, - EXCEPTION_RESOLUTION, - "error in schema: non-optional attribute 'commands' is missing"); - } - - public void testCaseTCN72() throws Exception { - deployExpectingException(FILES+"tcn72.sf", - "tcn72", - "SmartFrogLifecycleException", - "sfStart", - "SmartFrogException", - "java.io.FileNotFoundException: e:\\test\\password.txt"); - } - - public void testCaseTCN73() throws Exception { - deployExpectingException(FILES+"tcn73.sf", - "tcn73", - "SmartFrogDeploymentException", - null, - EXCEPTION_RESOLUTION, - "error in schema: non-optional attribute 'ftpHost' is missing"); - } - - public void testCaseTCN74() throws Exception { - deployExpectingException(FILES+"tcn74.sf", - "tcn74", - "SmartFrogDeploymentException", - null, - EXCEPTION_RESOLUTION, - "error in schema: non-optional attribute 'username' is missing"); - } - - public void testCaseTCN75() throws Exception { - deployExpectingException(FILES+"tcn75.sf", - "tcn75", - "SmartFrogDeploymentException", - null, - EXCEPTION_RESOLUTION, - "error in schema: non-optional attribute 'localFiles' is missing"); - } - - public void testCaseTCN76() throws Exception { - deployExpectingException(FILES+"tcn76.sf", - "tcn76", - "SmartFrogDeploymentException", - null, - EXCEPTION_RESOLUTION, - "error in schema: non-optional attribute 'remoteFiles' is missing"); - } -} - Copied: trunk/core/components/net/test/org/smartfrog/test/system/components/net/NetTest.java (from rev 4363, trunk/core/testharness/testcases/org/smartfrog/test/system/components/net/NetTest.java) =================================================================== --- trunk/core/components/net/test/org/smartfrog/test/system/components/net/NetTest.java (rev 0) +++ trunk/core/components/net/test/org/smartfrog/test/system/components/net/NetTest.java 2007-06-20 13:20:43 UTC (rev 4365) @@ -0,0 +1,120 @@ +/** (C) Copyright 2004 Hewlett-Packard Development Company, LP + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + For more information: www.smartfrog.org + + */ + + +package org.smartfrog.test.system.components.net; + +import org.smartfrog.test.SmartFrogTestBase; +import org.smartfrog.sfcore.prim.Prim; + +/** + * JUnit test class for test cases related to "net" component + */ +public class NetTest + extends SmartFrogTestBase { + + private static final String FILES = "org/smartfrog/test/system/components/net/"; + + public NetTest(String s) { + super(s); + } + + public void testCaseTCN68() throws Exception { + deployExpectingException(FILES+"tcn68.sf", + "tcn68", + "SmartFrogLifecycleException", + "sfDeploy", + "SmartFrogException", + "java.io.FileNotFoundException: e:\\test\\password.txt"); + } + + public void testCaseTCN69() throws Exception { + deployExpectingException(FILES+"tcn69.sf", + "tcn69", + "SmartFrogDeploymentException", + null, + EXCEPTION_RESOLUTION, + "error in schema: non-optional attribute 'host' is missing"); + } + + public void testCaseTCN70() throws Exception { + deployExpectingException(FILES+"tcn70.sf", + "tcn70", + "SmartFrogDeploymentException", + null, + EXCEPTION_RESOLUTION, + "error in schema: non-optional attribute 'username' is missing"); + } + + public void testCaseTCN71() throws Exception { + deployExpectingException(FILES+"tcn71.sf", + "tcn71", + "SmartFrogDeploymentException", + null, + EXCEPTION_RESOLUTION, + "error in schema: non-optional attribute 'commands' is missing"); + } + + public void testCaseTCN72() throws Exception { + deployExpectingException(FILES+"tcn72.sf", + "tcn72", + "SmartFrogLifecycleException", + "sfStart", + "SmartFrogException", + "java.io.FileNotFoundException: e:\\test\\password.txt"); + } + + public void testCaseTCN73() throws Exception { + deployExpectingException(FILES+"tcn73.sf", + "tcn73", + "SmartFrogDeploymentException", + null, + EXCEPTION_RESOLUTION, + "error in schema: non-optional attribute 'ftpHost' is missing"); + } + + public void testCaseTCN74() throws Exception { + deployExpectingException(FILES+"tcn74.sf", + "tcn74", + "SmartFrogDeploymentException", + null, + EXCEPTION_RESOLUTION, + "error in schema: non-optional attribute 'username' is missing"); + } + + public void testCaseTCN75() throws Exception { + deployExpectingException(FILES+"tcn75.sf", + "tcn75", + "SmartFrogDeploymentException", + null, + EXCEPTION_RESOLUTION, + "error in schema: non-optional attribute 'localFiles' is missing"); + } + + public void testCaseTCN76() throws Exception { + deployExpectingException(FILES+"tcn76.sf", + "tcn76", + "SmartFrogDeploymentException", + null, + EXCEPTION_RESOLUTION, + "error in schema: non-optional attribute 'remoteFiles' is missing"); + } +} + Deleted: trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn68.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/components/net/tcn68.sf 2007-06-19 16:51:35 UTC (rev 4362) +++ trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn68.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -1,14 +0,0 @@ -#include "org/smartfrog/components.sf" -#include "org/smartfrog/services/net/telnet.sf" - -sfConfig extends TelnetSession { - PasswordProvider:passwordFile "e:\\test\\password.txt"; - Telnet:host "ebnt171.india.hp.com"; - Telnet:username "ritu"; - Telnet:commands ["cd /home/smartfrog", - "mkdir test" - ]; - // optional log file for the telnet session - Telnet:logFile "spy.log"; - Telnet:ostype "linux"; -} Copied: trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn68.sf (from rev 4363, trunk/core/testharness/testcases/org/smartfrog/test/system/components/net/tcn68.sf) =================================================================== --- trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn68.sf (rev 0) +++ trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn68.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -0,0 +1,14 @@ +#include "org/smartfrog/components.sf" +#include "org/smartfrog/services/net/telnet.sf" + +sfConfig extends TelnetSession { + PasswordProvider:passwordFile "e:\\test\\password.txt"; + Telnet:host "ebnt171.india.hp.com"; + Telnet:username "ritu"; + Telnet:commands ["cd /home/smartfrog", + "mkdir test" + ]; + // optional log file for the telnet session + Telnet:logFile "spy.log"; + Telnet:ostype "linux"; +} Deleted: trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn69.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/components/net/tcn69.sf 2007-06-19 16:51:35 UTC (rev 4362) +++ trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn69.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -1,12 +0,0 @@ -#include "org/smartfrog/components.sf" -#include "org/smartfrog/services/net/telnet.sf" - -sfConfig extends TelnetSession { - Telnet:username "ritu"; - Telnet:commands ["cd /home/smartfrog", - "mkdir test" - ]; - PasswordProvider:passwordFile "passwd.txt"; - Telnet:logFile "spy.log"; - Telnet:ostype "linux"; -} Copied: trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn69.sf (from rev 4363, trunk/core/testharness/testcases/org/smartfrog/test/system/components/net/tcn69.sf) =================================================================== --- trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn69.sf (rev 0) +++ trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn69.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -0,0 +1,12 @@ +#include "org/smartfrog/components.sf" +#include "org/smartfrog/services/net/telnet.sf" + +sfConfig extends TelnetSession { + Telnet:username "ritu"; + Telnet:commands ["cd /home/smartfrog", + "mkdir test" + ]; + PasswordProvider:passwordFile "passwd.txt"; + Telnet:logFile "spy.log"; + Telnet:ostype "linux"; +} Deleted: trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn70.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/components/net/tcn70.sf 2007-06-19 16:51:35 UTC (rev 4362) +++ trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn70.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -1,12 +0,0 @@ -#include "org/smartfrog/components.sf" -#include "org/smartfrog/services/net/telnet.sf" - -sfConfig extends TelnetSession { - Telnet:host "ebnt171.india.hp.com"; - Telnet:commands ["cd /home/smartfrog", - "mkdir test" - ]; - PasswordProvider:passwordFile "passwd.txt"; - Telnet:logFile "spy.log"; - Telnet:ostype "linux"; -} Copied: trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn70.sf (from rev 4363, trunk/core/testharness/testcases/org/smartfrog/test/system/components/net/tcn70.sf) =================================================================== --- trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn70.sf (rev 0) +++ trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn70.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -0,0 +1,12 @@ +#include "org/smartfrog/components.sf" +#include "org/smartfrog/services/net/telnet.sf" + +sfConfig extends TelnetSession { + Telnet:host "ebnt171.india.hp.com"; + Telnet:commands ["cd /home/smartfrog", + "mkdir test" + ]; + PasswordProvider:passwordFile "passwd.txt"; + Telnet:logFile "spy.log"; + Telnet:ostype "linux"; +} Deleted: trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn71.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/components/net/tcn71.sf 2007-06-19 16:51:35 UTC (rev 4362) +++ trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn71.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -1,10 +0,0 @@ -#include "org/smartfrog/components.sf" -#include "org/smartfrog/services/net/telnet.sf" - -sfConfig extends TelnetSession { - Telnet:host "ebnt171.india.hp.com"; - Telnet:username "ritu"; - PasswordProvider:passwordFile "passwd.txt"; - Telnet:logFile "spy.log"; - Telnet:ostype "linux"; -} Copied: trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn71.sf (from rev 4363, trunk/core/testharness/testcases/org/smartfrog/test/system/components/net/tcn71.sf) =================================================================== --- trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn71.sf (rev 0) +++ trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn71.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -0,0 +1,10 @@ +#include "org/smartfrog/components.sf" +#include "org/smartfrog/services/net/telnet.sf" + +sfConfig extends TelnetSession { + Telnet:host "ebnt171.india.hp.com"; + Telnet:username "ritu"; + PasswordProvider:passwordFile "passwd.txt"; + Telnet:logFile "spy.log"; + Telnet:ostype "linux"; +} Deleted: trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn72.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/components/net/tcn72.sf 2007-06-19 16:51:35 UTC (rev 4362) +++ trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn72.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -1,11 +0,0 @@ -#include "org/smartfrog/components.sf" -#include "org/smartfrog/services/net/ftp.sf" - -sfConfig extends FTPClient { - PasswordProvider:passwordFile "e:\\test\\password.txt"; - FTP:ftpHost "ebnt171.india.hp.com"; - FTP:username "ritu"; - FTP:localFiles ["D:\\temp\\one.txt","D:\\temp\\two.txt"]; - FTP:remoteFiles ["/home/ritu/tmp/test1", - "/home/ritu/tmp/test2"]; -} Copied: trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn72.sf (from rev 4363, trunk/core/testharness/testcases/org/smartfrog/test/system/components/net/tcn72.sf) =================================================================== --- trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn72.sf (rev 0) +++ trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn72.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -0,0 +1,11 @@ +#include "org/smartfrog/components.sf" +#include "org/smartfrog/services/net/ftp.sf" + +sfConfig extends FTPClient { + PasswordProvider:passwordFile "e:\\test\\password.txt"; + FTP:ftpHost "ebnt171.india.hp.com"; + FTP:username "ritu"; + FTP:localFiles ["D:\\temp\\one.txt","D:\\temp\\two.txt"]; + FTP:remoteFiles ["/home/ritu/tmp/test1", + "/home/ritu/tmp/test2"]; +} Deleted: trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn73.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/components/net/tcn73.sf 2007-06-19 16:51:35 UTC (rev 4362) +++ trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn73.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -1,10 +0,0 @@ -#include "org/smartfrog/components.sf" -#include "org/smartfrog/services/net/ftp.sf" - -sfConfig extends FTPClient { - FTP:username "ritu"; - FTP:localFiles ["D:\\temp\\one.txt","D:\\temp\\two.txt"]; - FTP:remoteFiles ["/home/ritu/tmp/test1", - "/home/ritu/tmp/test2"]; - PasswordProvider:passwordFile "password.txt"; -} Copied: trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn73.sf (from rev 4363, trunk/core/testharness/testcases/org/smartfrog/test/system/components/net/tcn73.sf) =================================================================== --- trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn73.sf (rev 0) +++ trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn73.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -0,0 +1,10 @@ +#include "org/smartfrog/components.sf" +#include "org/smartfrog/services/net/ftp.sf" + +sfConfig extends FTPClient { + FTP:username "ritu"; + FTP:localFiles ["D:\\temp\\one.txt","D:\\temp\\two.txt"]; + FTP:remoteFiles ["/home/ritu/tmp/test1", + "/home/ritu/tmp/test2"]; + PasswordProvider:passwordFile "password.txt"; +} Deleted: trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn74.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/components/net/tcn74.sf 2007-06-19 16:51:35 UTC (rev 4362) +++ trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn74.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -1,10 +0,0 @@ -#include "org/smartfrog/components.sf" -#include "org/smartfrog/services/net/ftp.sf" - -sfConfig extends FTPClient { - FTP:ftpHost "ebnt171.india.hp.com"; - FTP:localFiles ["D:\\temp\\one.txt","D:\\temp\\two.txt"]; - FTP:remoteFiles ["/home/ritu/tmp/test1", - "/home/ritu/tmp/test2"]; - PasswordProvider:passwordFile "password.txt"; -} Copied: trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn74.sf (from rev 4363, trunk/core/testharness/testcases/org/smartfrog/test/system/components/net/tcn74.sf) =================================================================== --- trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn74.sf (rev 0) +++ trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn74.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -0,0 +1,10 @@ +#include "org/smartfrog/components.sf" +#include "org/smartfrog/services/net/ftp.sf" + +sfConfig extends FTPClient { + FTP:ftpHost "ebnt171.india.hp.com"; + FTP:localFiles ["D:\\temp\\one.txt","D:\\temp\\two.txt"]; + FTP:remoteFiles ["/home/ritu/tmp/test1", + "/home/ritu/tmp/test2"]; + PasswordProvider:passwordFile "password.txt"; +} Deleted: trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn75.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/components/net/tcn75.sf 2007-06-19 16:51:35 UTC (rev 4362) +++ trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn75.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -1,10 +0,0 @@ -#include "org/smartfrog/components.sf" -#include "org/smartfrog/services/net/ftp.sf" - -sfConfig extends FTPClient { - FTP:ftpHost "ebnt171.india.hp.com"; - FTP:username "ritu"; - FTP:remoteFiles ["/home/ritu/tmp/test1", - "/home/ritu/tmp/test2"]; - PasswordProvider:passwordFile "password.txt"; -} Copied: trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn75.sf (from rev 4363, trunk/core/testharness/testcases/org/smartfrog/test/system/components/net/tcn75.sf) =================================================================== --- trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn75.sf (rev 0) +++ trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn75.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -0,0 +1,10 @@ +#include "org/smartfrog/components.sf" +#include "org/smartfrog/services/net/ftp.sf" + +sfConfig extends FTPClient { + FTP:ftpHost "ebnt171.india.hp.com"; + FTP:username "ritu"; + FTP:remoteFiles ["/home/ritu/tmp/test1", + "/home/ritu/tmp/test2"]; + PasswordProvider:passwordFile "password.txt"; +} Deleted: trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn76.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/components/net/tcn76.sf 2007-06-19 16:51:35 UTC (rev 4362) +++ trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn76.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -1,9 +0,0 @@ -#include "org/smartfrog/components.sf" -#include "org/smartfrog/services/net/ftp.sf" - -sfConfig extends FTPClient { - FTP:ftpHost "ebnt171.india.hp.com"; - FTP:username "ritu"; - FTP:localFiles ["D:\\temp\\one.txt","D:\\temp\\two.txt"]; - PasswordProvider:passwordFile "password.txt"; -} Copied: trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn76.sf (from rev 4363, trunk/core/testharness/testcases/org/smartfrog/test/system/components/net/tcn76.sf) =================================================================== --- trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn76.sf (rev 0) +++ trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcn76.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -0,0 +1,9 @@ +#include "org/smartfrog/components.sf" +#include "org/smartfrog/services/net/ftp.sf" + +sfConfig extends FTPClient { + FTP:ftpHost "ebnt171.india.hp.com"; + FTP:username "ritu"; + FTP:localFiles ["D:\\temp\\one.txt","D:\\temp\\two.txt"]; + PasswordProvider:passwordFile "password.txt"; +} Deleted: trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcp25.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/components/net/tcp25.sf 2007-06-19 16:51:35 UTC (rev 4362) +++ trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcp25.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -1,36 +0,0 @@ -/** (C) Copyright 1998-2004 Hewlett-Packard Development Company, LP - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -For more information: www.smartfrog.org - -*/ - -#include "org/smartfrog/components.sf" -#include "org/smartfrog/services/net/telnet.sf" - -sfConfig extends Compound { - sampleTelnet extends TelnetSession { - PasswordProvider:passwordFile "D:\\cvs\\forge\\passwd.txt"; - Telnet:commands ["cd /home/ritu/cvs", - "mkdir test", - "ll" - ]; - Telnet:host "ebnt171.india.hp.com"; - Telnet:username "ritu"; - Telnet:logFile "spy.log"; - Telnet:ostype "linux"; - } -} Copied: trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcp25.sf (from rev 4363, trunk/core/testharness/testcases/org/smartfrog/test/system/components/net/tcp25.sf) =================================================================== --- trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcp25.sf (rev 0) +++ trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcp25.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -0,0 +1,36 @@ +/** (C) Copyright 1998-2004 Hewlett-Packard Development Company, LP + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +For more information: www.smartfrog.org + +*/ + +#include "org/smartfrog/components.sf" +#include "org/smartfrog/services/net/telnet.sf" + +sfConfig extends Compound { + sampleTelnet extends TelnetSession { + PasswordProvider:passwordFile "D:\\cvs\\forge\\passwd.txt"; + Telnet:commands ["cd /home/ritu/cvs", + "mkdir test", + "ll" + ]; + Telnet:host "ebnt171.india.hp.com"; + Telnet:username "ritu"; + Telnet:logFile "spy.log"; + Telnet:ostype "linux"; + } +} Deleted: trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcp26.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/components/net/tcp26.sf 2007-06-19 16:51:35 UTC (rev 4362) +++ trunk/core/components/net/test/org/smartfrog/test/system/components/net/tcp26.sf 2007-06-20 13:20:43 UTC (rev 4365) @@ -1,47 +0,0 @@ -/** (C) Copyright 1998-2004 Hewlett-Packard Development Company, LP - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -For more information: www.smartfrog.org - -*/ - -#include "org/smartfrog/components.sf" -#include "org/smartfrog/services/net/telnet.sf" -#include "org/smartfrog/services/net/ftp.sf" -#include "org/smartfrog/sfcore/workflow/components.sf" - -sfConfig extends Sequence { -// actions extends LAZY { - sampleTelnet extends TelnetSession { - PasswordProvider:passwordFile "D:\\cvs\\forge\\passwd.txt"; - Telnet:commands ["cd /home/ritu", - "mkdir tmp"]; - Telnet:host "ebnt171.india.hp.com"; - Telne... [truncated message content] |
From: <st...@us...> - 2007-07-19 15:07:23
|
Revision: 4739 http://svn.sourceforge.net/smartfrog/?rev=4739&view=rev Author: steve_l Date: 2007-07-19 08:05:44 -0700 (Thu, 19 Jul 2007) Log Message: ----------- SFOS-100 Purge unneeded JAR files from the repository Modified Paths: -------------- trunk/core/components/sfinstaller/build.xml Removed Paths: ------------- trunk/core/components/arithmetic-testharness/lib/BeanShell - Free Software License.htm trunk/core/components/arithmetic-testharness/lib/bsh-1.3.0.jar trunk/core/components/arithmetic-testharness/lib/commons-net-1.2.0.jar trunk/core/components/arithmetic-testharness/lib/sf-net.jar trunk/core/components/arithmetic-testharness/lib/sf-scripting-3.06.026.jar trunk/core/components/arithmetic-testharness/lib/velocity-1.1.jar trunk/core/components/emailer/lib/activation.jar trunk/core/components/emailer/lib/mail.jar trunk/core/components/loggingservices/lib/commons-logging-api-1.0.4.jar trunk/core/components/loggingservices/lib/log4j-1.2.13.jar trunk/core/components/net/lib/commons-net-1.2.0.jar trunk/core/components/quartz/lib/commons-logging-api.jar trunk/core/components/quartz/lib/commons-logging.jar trunk/core/components/quartz/lib/quartz-1.5.2.jar trunk/core/components/sfinstaller/lib/velocity-1.1.jar trunk/core/components/ssh/lib/jsch-20040505.jar trunk/core/components/www/lib/.cvskeep trunk/core/components/www/testwar/lib/mysql-connector-java-3.1.11-bin.jar Deleted: trunk/core/components/arithmetic-testharness/lib/BeanShell - Free Software License.htm =================================================================== --- trunk/core/components/arithmetic-testharness/lib/BeanShell - Free Software License.htm 2007-07-19 14:55:15 UTC (rev 4738) +++ trunk/core/components/arithmetic-testharness/lib/BeanShell - Free Software License.htm 2007-07-19 15:05:44 UTC (rev 4739) @@ -1,75 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<!-- saved from url=(0037)http://www.beanshell.org/license.html --> -<HTML><HEAD><TITLE>BeanShell - Free Software License</TITLE> -<META http-equiv=Content-Type content="text/html; charset=windows-1252"><LINK -href="http://www.beanshell.org/favicon.ico" rel="SHORTCUT ICON"> -<META content="MSHTML 6.00.2800.1458" name=GENERATOR></HEAD> -<BODY bgColor=#ffffff -background="BeanShell - Free Software License_files/bgstrip.gif"> -<TABLE cellPadding=0 width="100%" border=0 valign="top" halign="left"> - <TBODY> - <TR vAlign=top> - <TD width=175><A href="http://www.beanshell.org/home.html"><IMG alt=Home - src="BeanShell - Free Software License_files/home.gif" border=0></A><BR><A - href="http://www.beanshell.org/intro.html"><IMG alt=Intro - src="BeanShell - Free Software License_files/intro.gif" - border=0></A><BR><A href="http://www.beanshell.org/docs.html"><IMG - alt=Docs src="BeanShell - Free Software License_files/docs.gif" - border=0></A><BR><A href="http://www.beanshell.org/download.html"><IMG - alt=Download src="BeanShell - Free Software License_files/download.gif" - border=0></A><BR><A href="http://www.beanshell.org/contact.html"><IMG - alt=Contact src="BeanShell - Free Software License_files/contact.gif" - border=0></A><BR><A href="http://www.beanshell.org/developer.html"><IMG - alt=Developer src="BeanShell - Free Software License_files/developer.gif" - border=0></A><BR><A href="http://www.beanshell.org/license.html"><IMG - alt=License src="BeanShell - Free Software License_files/license.gif" - border=0></A><BR><A href="http://www.beanshell.org/beany.html"><IMG - alt=Beany src="BeanShell - Free Software License_files/beanybutton.gif" - border=0></A> - <P><A href="http://www.amazon.com/exec/obidos/ASIN/0596002858"><IMG - alt="Learning Java" src="BeanShell - Free Software License_files/lj.gif" - border=0> <BR><FONT color=#ffffff size=-1 vlink="#ffffff" - link="#ffffff">Check out my book:<BR>Learning Java,<BR>O'Reilly & - Associates </FONT></A><BR></P></TD> - <TD width=600><A href="http://www.beanshell.org/images/beanylicense.jpg" - border="0"><IMG - src="BeanShell - Free Software License_files/beanylicense1.jpg" - align=left></A> - <H1>BeanShell Software License</H1><BR clear=left>BeanShell is a free - software project. Its continued development depends on the interest and - support of users and developers like you. - <P>The source code is available for you to use and extend or integrate - into your software freely under either the terms of the Sun Public License - or the GNU Lesser Public License (see below). - <P>The "cost" of this software is simply to let us know how you are using - BeanShell. You can do this by filling out the <A - href="http://www.beanshell.org/licenseform.html">BeanShell User Info - Form</A>. Please feel free to wait until you have started using BeanShell - to do this. - <P> - <H3>Dual Licensing: Sun Public License / Gnu Lesser Public - License</H3>BeanShell is now dual licensed under both the SPL and LGPL. - You may use and develop BeanShell under either license. - <P><EM>More info coming soon...</EM> - <P>Please <A href="http://www.sun.com/developers/spl.html">see the Sun - Public License</A> for details. - <H3>About the LGPL</H3><EM>Note: the LGPL has become the "Lesser Gnu - Public License" and BeanShell has adopted the new version...</EM> - <P>A quick note about the LGPL: - <P>< The LGPL is less restrictive than the ordinary GNU Public License - in that it does not force you to distribute your own applications under - the terms of the GPL. It primarily requires that you include a notice that - you are using the software in your documentation and provide access to the - original source code. It also essentially requires that if you modify or - extend BeanShell itself that you make those changes available separately, - under the terms of either the LGPL or the GPL. I would ask that you - accomodate this by simply sending me your bug fixes and improvement to - allow me to incorporate them into the general bsh release. Please <A - href="http://www.gnu.org/copyleft/lesser.html">see the LGPL</A> for the - details. - <P><EM>If you have a more precise, brief explanation please let me know! - Thanks! - Pat</EM> - <P>Please also feel free to <A href="mailto:pa...@pa...">contact me</A>: - (<A href="mailto:pa...@pa..."><A href="mailto:pa...@pa...">Pat - Niemeyer</A> pa...@pa...</A>) about other licensing arrangements. - <P></P></TD></TR></TBODY></TABLE></BODY></HTML> Deleted: trunk/core/components/arithmetic-testharness/lib/bsh-1.3.0.jar =================================================================== (Binary files differ) Deleted: trunk/core/components/arithmetic-testharness/lib/commons-net-1.2.0.jar =================================================================== (Binary files differ) Deleted: trunk/core/components/arithmetic-testharness/lib/sf-net.jar =================================================================== (Binary files differ) Deleted: trunk/core/components/arithmetic-testharness/lib/sf-scripting-3.06.026.jar =================================================================== (Binary files differ) Deleted: trunk/core/components/arithmetic-testharness/lib/velocity-1.1.jar =================================================================== (Binary files differ) Deleted: trunk/core/components/emailer/lib/activation.jar =================================================================== (Binary files differ) Deleted: trunk/core/components/emailer/lib/mail.jar =================================================================== (Binary files differ) Deleted: trunk/core/components/loggingservices/lib/commons-logging-api-1.0.4.jar =================================================================== (Binary files differ) Deleted: trunk/core/components/loggingservices/lib/log4j-1.2.13.jar =================================================================== (Binary files differ) Deleted: trunk/core/components/net/lib/commons-net-1.2.0.jar =================================================================== (Binary files differ) Deleted: trunk/core/components/quartz/lib/commons-logging-api.jar =================================================================== (Binary files differ) Deleted: trunk/core/components/quartz/lib/commons-logging.jar =================================================================== (Binary files differ) Deleted: trunk/core/components/quartz/lib/quartz-1.5.2.jar =================================================================== (Binary files differ) Modified: trunk/core/components/sfinstaller/build.xml =================================================================== --- trunk/core/components/sfinstaller/build.xml 2007-07-19 14:55:15 UTC (rev 4738) +++ trunk/core/components/sfinstaller/build.xml 2007-07-19 15:05:44 UTC (rev 4739) @@ -31,6 +31,7 @@ <property file="build.properties" /> <property name="root.dir" location="../../" /> <property name="is.component" value="true" /> + <property name="ivy.enabled" value="true" /> <!-- Import common stuff --> <import file="${root.dir}/common.xml"/> Deleted: trunk/core/components/sfinstaller/lib/velocity-1.1.jar =================================================================== (Binary files differ) Deleted: trunk/core/components/ssh/lib/jsch-20040505.jar =================================================================== (Binary files differ) Deleted: trunk/core/components/www/lib/.cvskeep =================================================================== --- trunk/core/components/www/lib/.cvskeep 2007-07-19 14:55:15 UTC (rev 4738) +++ trunk/core/components/www/lib/.cvskeep 2007-07-19 15:05:44 UTC (rev 4739) @@ -1 +0,0 @@ - Deleted: trunk/core/components/www/testwar/lib/mysql-connector-java-3.1.11-bin.jar =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-07-20 14:55:45
|
Revision: 4761 http://svn.sourceforge.net/smartfrog/?rev=4761&view=rev Author: steve_l Date: 2007-07-20 07:55:44 -0700 (Fri, 20 Jul 2007) Log Message: ----------- SFOS-207: autogenerated PDF files Added Paths: ----------- trunk/core/components/ant/doc/ant_readme.pdf trunk/core/components/arithmetic-testharness/doc/arithmetic-testharness_readme.pdf trunk/core/components/asyndeployer/doc/quartz_readme.pdf trunk/core/components/database/doc/database_readme.pdf trunk/core/components/dns/doc/dns_readme.pdf trunk/core/components/emailer/doc/emailer_readme.pdf trunk/core/components/jetty/doc/Requirements_Jetty.pdf trunk/core/components/jetty/doc/jetty_readme.pdf trunk/core/components/jmx/doc/jmx_readme.pdf trunk/core/components/junit/doc/Junit.pdf trunk/core/components/loggingservices/doc/loggingservices_readme.pdf trunk/core/components/net/doc/net_readme.pdf trunk/core/components/quartz/doc/quartz_readme.pdf trunk/core/components/scripting/doc/scripting_readme.pdf trunk/core/components/sfinstaller/doc/sfinstaller_readme.pdf trunk/core/components/slp/doc/slp_readme.pdf trunk/core/components/ssh/doc/ssh_readme.pdf trunk/core/components/www/doc/www_readme.pdf trunk/core/components/xml/doc/xml_readme.pdf Added: trunk/core/components/ant/doc/ant_readme.pdf =================================================================== (Binary files differ) Property changes on: trunk/core/components/ant/doc/ant_readme.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core/components/arithmetic-testharness/doc/arithmetic-testharness_readme.pdf =================================================================== (Binary files differ) Property changes on: trunk/core/components/arithmetic-testharness/doc/arithmetic-testharness_readme.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core/components/asyndeployer/doc/quartz_readme.pdf =================================================================== (Binary files differ) Property changes on: trunk/core/components/asyndeployer/doc/quartz_readme.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core/components/database/doc/database_readme.pdf =================================================================== (Binary files differ) Property changes on: trunk/core/components/database/doc/database_readme.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core/components/dns/doc/dns_readme.pdf =================================================================== (Binary files differ) Property changes on: trunk/core/components/dns/doc/dns_readme.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core/components/emailer/doc/emailer_readme.pdf =================================================================== (Binary files differ) Property changes on: trunk/core/components/emailer/doc/emailer_readme.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core/components/jetty/doc/Requirements_Jetty.pdf =================================================================== (Binary files differ) Property changes on: trunk/core/components/jetty/doc/Requirements_Jetty.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core/components/jetty/doc/jetty_readme.pdf =================================================================== (Binary files differ) Property changes on: trunk/core/components/jetty/doc/jetty_readme.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core/components/jmx/doc/jmx_readme.pdf =================================================================== (Binary files differ) Property changes on: trunk/core/components/jmx/doc/jmx_readme.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core/components/junit/doc/Junit.pdf =================================================================== (Binary files differ) Property changes on: trunk/core/components/junit/doc/Junit.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core/components/loggingservices/doc/loggingservices_readme.pdf =================================================================== (Binary files differ) Property changes on: trunk/core/components/loggingservices/doc/loggingservices_readme.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core/components/net/doc/net_readme.pdf =================================================================== (Binary files differ) Property changes on: trunk/core/components/net/doc/net_readme.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core/components/quartz/doc/quartz_readme.pdf =================================================================== (Binary files differ) Property changes on: trunk/core/components/quartz/doc/quartz_readme.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core/components/scripting/doc/scripting_readme.pdf =================================================================== (Binary files differ) Property changes on: trunk/core/components/scripting/doc/scripting_readme.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core/components/sfinstaller/doc/sfinstaller_readme.pdf =================================================================== (Binary files differ) Property changes on: trunk/core/components/sfinstaller/doc/sfinstaller_readme.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core/components/slp/doc/slp_readme.pdf =================================================================== (Binary files differ) Property changes on: trunk/core/components/slp/doc/slp_readme.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core/components/ssh/doc/ssh_readme.pdf =================================================================== (Binary files differ) Property changes on: trunk/core/components/ssh/doc/ssh_readme.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core/components/www/doc/www_readme.pdf =================================================================== (Binary files differ) Property changes on: trunk/core/components/www/doc/www_readme.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core/components/xml/doc/xml_readme.pdf =================================================================== (Binary files differ) Property changes on: trunk/core/components/xml/doc/xml_readme.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-08-02 16:53:19
|
Revision: 4874 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=4874&view=rev Author: steve_l Date: 2007-08-02 09:53:16 -0700 (Thu, 02 Aug 2007) Log Message: ----------- SFOS-329 add templates for JBoss and Tomcat Modified Paths: -------------- trunk/core/components/jetty/build.xml trunk/core/components/tomcat/ivy.xml trunk/core/components/www/build.xml trunk/core/components/www/ivy.xml trunk/core/components/www/src/org/smartfrog/services/www/servers/jboss4.sf trunk/core/components/www/src/org/smartfrog/services/www/servers/serverbase.sf trunk/core/components/www/src/org/smartfrog/services/www/servers/tomcat5.sf trunk/core/components/www/src/org/smartfrog/services/www/testwar-m2.sf Added Paths: ----------- trunk/core/components/www/test/ trunk/core/components/www/test/org/ trunk/core/components/www/test/org/smartfrog/ trunk/core/components/www/test/org/smartfrog/services/ trunk/core/components/www/test/org/smartfrog/services/www/ trunk/core/components/www/test/org/smartfrog/services/www/servers/ trunk/core/components/www/test/org/smartfrog/services/www/servers/test/ trunk/core/components/www/test/org/smartfrog/services/www/servers/test/tomcat/ trunk/core/components/www/test/org/smartfrog/services/www/servers/test/tomcat/TomcatTest.java trunk/core/components/www/test/org/smartfrog/services/www/servers/test/tomcat/components.sf trunk/core/components/www/test/org/smartfrog/services/www/servers/test/tomcat/testTomcatRuns.sf Modified: trunk/core/components/jetty/build.xml =================================================================== --- trunk/core/components/jetty/build.xml 2007-08-02 16:52:05 UTC (rev 4873) +++ trunk/core/components/jetty/build.xml 2007-08-02 16:53:16 UTC (rev 4874) @@ -40,7 +40,6 @@ <property file="build.properties" /> <property name="root.dir" location="../../" /> <property name="ivy.enabled" value="true"/> - <!-- System tests turned off to make CC build over them--> <property name="system.tests" value="true" /> <!-- Import common stuff --> <!--available file="../../common.xml" property="root.dir" value="../.."/--> Modified: trunk/core/components/tomcat/ivy.xml =================================================================== --- trunk/core/components/tomcat/ivy.xml 2007-08-02 16:52:05 UTC (rev 4873) +++ trunk/core/components/tomcat/ivy.xml 2007-08-02 16:53:16 UTC (rev 4874) @@ -63,5 +63,6 @@ <exclude org="commons-logging"/> <exclude org="junit"/> </dependency> + </dependencies> </ivy-module> \ No newline at end of file Modified: trunk/core/components/www/build.xml =================================================================== --- trunk/core/components/www/build.xml 2007-08-02 16:52:05 UTC (rev 4873) +++ trunk/core/components/www/build.xml 2007-08-02 16:53:16 UTC (rev 4874) @@ -34,24 +34,21 @@ <property file="build.properties"/> <property name="is.component" value="true"/> <property name="ivy.enabled" value="true"/> + <property name="system.tests" value="true" /> <property name="root.dir" location="../.."/> <!-- Import common stuff --> <import file="${root.dir}/common.xml"/> - <!-- ========================================================== --> - <!-- ========================================================== --> - <target name="init" - depends="init-standard-output-dirs,use-smartfrog-tasks,use-smartfrog-testharness"> - </target> - <!-- make the WAR file --> <target name="war.init" depends="init-standard-output-dirs"> <property name="target.war.name" value="sf-www-testwar-${smartfrog.version}.war"/> <property name="testwar.war" location="${dist.dir}/lib/${target.war.name}"/> + <property name="test.testwar.war" + value="${testwar.war}" /> <property name="testwar.dir" location="testwar"/> <property name="testwar.lib.dir" @@ -92,4 +89,8 @@ <target name="ready-to-publish-all" depends="common.ready-to-publish-all,war" /> + <target name="ready-to-test" + depends="common.ready-to-test,war" > + <property name="test.jdk.home" location="${env.JAVA_HOME}" /> + </target> </project> Modified: trunk/core/components/www/ivy.xml =================================================================== --- trunk/core/components/www/ivy.xml 2007-08-02 16:52:05 UTC (rev 4873) +++ trunk/core/components/www/ivy.xml 2007-08-02 16:53:16 UTC (rev 4874) @@ -55,5 +55,10 @@ name="servlet-api" rev="${servletapi.version}" conf="compile,war->master"/> + <dependency org="org.smartfrog" + name="sf-testharness" + changing="true" + rev="latest.integration" + conf="test->default"/> </dependencies> </ivy-module> \ No newline at end of file Modified: trunk/core/components/www/src/org/smartfrog/services/www/servers/jboss4.sf =================================================================== --- trunk/core/components/www/src/org/smartfrog/services/www/servers/jboss4.sf 2007-08-02 16:52:05 UTC (rev 4873) +++ trunk/core/components/www/src/org/smartfrog/services/www/servers/jboss4.sf 2007-08-02 16:53:16 UTC (rev 4874) @@ -97,7 +97,7 @@ sysProperties [ ["sun.rmi.dgc.client.gcInterval",gcInterval ], ["sun.rmi.dgc.server.gcInterval",gcInterval ], - PARENT:PARENT:sysProperties + PARENT:sysProperties ]; maxMemory 512; Modified: trunk/core/components/www/src/org/smartfrog/services/www/servers/serverbase.sf =================================================================== --- trunk/core/components/www/src/org/smartfrog/services/www/servers/serverbase.sf 2007-08-02 16:52:05 UTC (rev 4873) +++ trunk/core/components/www/src/org/smartfrog/services/www/servers/serverbase.sf 2007-08-02 16:53:16 UTC (rev 4874) @@ -116,9 +116,7 @@ LAZY endorsed ]; - sysProperties [ - PARENT:PARENT:sysProperties - ]; + sysProperties PARENT:ATTRIB sysProperties; jvmArgs [ "-server" Modified: trunk/core/components/www/src/org/smartfrog/services/www/servers/tomcat5.sf =================================================================== --- trunk/core/components/www/src/org/smartfrog/services/www/servers/tomcat5.sf 2007-08-02 16:52:05 UTC (rev 4873) +++ trunk/core/components/www/src/org/smartfrog/services/www/servers/tomcat5.sf 2007-08-02 16:53:16 UTC (rev 4874) @@ -98,7 +98,7 @@ server extends ServerBase:server { arguments [ - "run", + "run" ]; processName "catalina"; @@ -112,9 +112,10 @@ sysProperties [ - ["catalina.home",PARENT:server.home.dir:absolutePath], - ["catalina.base",PARENT:catalina.base.dir:absolutePath], - PARENT:PARENT:sysProperties + ["catalina.home",LAZY PARENT:server.home.dir:absolutePath], + ["catalina.base",LAZY PARENT:catalina.base.dir:absolutePath] + //, + //PARENT:ATTRIB sysProperties ]; maxMemory 64; @@ -129,7 +130,7 @@ * simply by removing the server entry. * For deployments where the server is started already, somehow. */ -Tomcat5Server extends Tomcat5Server { +RunningTomcat5Server extends Tomcat5Server { server extends Compound { } Modified: trunk/core/components/www/src/org/smartfrog/services/www/testwar-m2.sf =================================================================== --- trunk/core/components/www/src/org/smartfrog/services/www/testwar-m2.sf 2007-08-02 16:52:05 UTC (rev 4873) +++ trunk/core/components/www/src/org/smartfrog/services/www/testwar-m2.sf 2007-08-02 16:53:16 UTC (rev 4874) @@ -39,6 +39,9 @@ * It is file to pull in the testwar from a local m2 repository. It allows * test deployments to be written which do not contain any hard-coded path dependencies with * the www application. + * + * with the move to an Ivy based build, this component is of limited use, but we cannot switch to an Ivy + * policy as we are currently building with both Ivy1 and Ivy2, each of which caches files to a different directrion */ testwarLoader extends Compound { @@ -56,7 +59,7 @@ testwar extends JarArtifact { library LAZY PARENT:library; project "org.smartfrog"; - artifact "testwar"; + artifact "sf-www-testwar"; extension "war"; version "0.1-SNAPSHOT"; //expected to be installed locally; no retrieval Added: trunk/core/components/www/test/org/smartfrog/services/www/servers/test/tomcat/TomcatTest.java =================================================================== --- trunk/core/components/www/test/org/smartfrog/services/www/servers/test/tomcat/TomcatTest.java (rev 0) +++ trunk/core/components/www/test/org/smartfrog/services/www/servers/test/tomcat/TomcatTest.java 2007-08-02 16:53:16 UTC (rev 4874) @@ -0,0 +1,41 @@ +/** (C) Copyright 2007 Hewlett-Packard Development Company, LP + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +For more information: www.smartfrog.org + +*/ +package org.smartfrog.services.www.servers.test.tomcat; + +import org.smartfrog.test.DeployingTestBase; + +/** + * + * Created 01-Aug-2007 17:25:18 + * + */ + +public class TomcatTest extends DeployingTestBase { + private static final String FILES = "/org/smartfrog/services/www/servers/test/tomcat/"; + + + public TomcatTest(String name) { + super(name); + } + + public void testTomcatRuns() throws Throwable { + expectSuccessfulTestRun(FILES,"testTomcatRuns.sf"); + } +} Added: trunk/core/components/www/test/org/smartfrog/services/www/servers/test/tomcat/components.sf =================================================================== --- trunk/core/components/www/test/org/smartfrog/services/www/servers/test/tomcat/components.sf (rev 0) +++ trunk/core/components/www/test/org/smartfrog/services/www/servers/test/tomcat/components.sf 2007-08-02 16:53:16 UTC (rev 4874) @@ -0,0 +1,68 @@ +/** (C) Copyright 2007 Hewlett-Packard Development Company, LP + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +For more information: www.smartfrog.org + +*/ +#include "/org/smartfrog/services/filesystem/components.sf" +#include "/org/smartfrog/services/assertions/components.sf" +#include "/org/smartfrog/services/www/servers/tomcat5.sf" +//#include "/org/smartfrog/sfcore/workflow/conditional/conditions/components.sf" + + +// this is a non-lazy binding to whatever is passed in to the deployment process; it sets +// tomcat.home to the property or to "" +tomcat.home OPTIONAL("") PROPERTY test.tomcat.home; + +// a boolean property that is true if tomcat.home is non-empty +tomcat.present IF (tomcat.home != "") THEN true ELSE false FI; + + +jdk.home PROPERTY test.jdk.home ; + +// now switch this to a condition +IsTomcatPresent extends BooleanValue { + value tomcat.present; +} + +/** + * Tomcat bound to the local properties + */ +BoundTomcatServer extends Tomcat5Server { + server.home tomcat.home; + jdk.home PARENT:ATTRIB jdk.home; +} + +/** + * a template that only deploys if test.tomcat.home is set + * we use this to make things conditional + */ +DeployTomcat extends ExpectDeploy { + condition extends IsTomcatPresent; + + action extends Compound { + tomcat extends BoundTomcatServer; + } + + undeployAfter 15000; + +} + +/* + * one test with a 10s shutdown + */ +testTomcatRuns extends DeployTomcat { +} Added: trunk/core/components/www/test/org/smartfrog/services/www/servers/test/tomcat/testTomcatRuns.sf =================================================================== --- trunk/core/components/www/test/org/smartfrog/services/www/servers/test/tomcat/testTomcatRuns.sf (rev 0) +++ trunk/core/components/www/test/org/smartfrog/services/www/servers/test/tomcat/testTomcatRuns.sf 2007-08-02 16:53:16 UTC (rev 4874) @@ -0,0 +1,26 @@ +/** (C) Copyright 2007 Hewlett-Packard Development Company, LP + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +For more information: www.smartfrog.org + +*/ +#include "/org/smartfrog/services/www/servers/test/tomcat/components.sf" + + + +sfConfig extends testTomcatRuns { + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-08-03 16:07:53
|
Revision: 4887 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=4887&view=rev Author: steve_l Date: 2007-08-03 08:50:11 -0700 (Fri, 03 Aug 2007) Log Message: ----------- ignoring more files Modified Paths: -------------- trunk/core/components/jetty/.svnignore trunk/core/components/www/.svnignore Modified: trunk/core/components/jetty/.svnignore =================================================================== --- trunk/core/components/jetty/.svnignore 2007-08-03 13:30:09 UTC (rev 4886) +++ trunk/core/components/jetty/.svnignore 2007-08-03 15:50:11 UTC (rev 4887) @@ -1,4 +1,4 @@ -jetty.iml +*.iml build dist version.properties Modified: trunk/core/components/www/.svnignore =================================================================== --- trunk/core/components/www/.svnignore 2007-08-03 13:30:09 UTC (rev 4886) +++ trunk/core/components/www/.svnignore 2007-08-03 15:50:11 UTC (rev 4887) @@ -1,4 +1,9 @@ build dist +build.properties +*.jpx +*.ipr *.iml -version.properties +*.iws +.classpath +.project \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hel...@us...> - 2007-08-24 14:06:51
|
Revision: 5060 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=5060&view=rev Author: helgemahrt Date: 2007-08-24 07:06:50 -0700 (Fri, 24 Aug 2007) Log Message: ----------- SFOS-404: Forgot another two files. Modified Paths: -------------- trunk/core/components/buildRelease.xml trunk/core/components/documentation.xml Modified: trunk/core/components/buildRelease.xml =================================================================== --- trunk/core/components/buildRelease.xml 2007-08-24 12:52:50 UTC (rev 5059) +++ trunk/core/components/buildRelease.xml 2007-08-24 14:06:50 UTC (rev 5060) @@ -78,6 +78,7 @@ <property name="sfLoggingServices.project" location="loggingservices" /> <property name="releasetest.project" location="releasetest" /> <!--property name="xml.project" location="xml" /--> + <property name="vmware.project" location="vmware" /> <property name="www.project" location="www" /> <property name="dns.project" location="dns" /> </target> @@ -146,6 +147,7 @@ <include name="sfinstaller/**"/> <include name="dns/**"/> <include name="www/**"/> + <include name="vmware/**"/> <include name="lib/**"/> <!--include name="xml/**"/--> <include name="build.xml"/> @@ -180,6 +182,7 @@ <exclude name="ssh/test/**"/> <exclude name="sfinstaller/test/**"/> <exclude name="dns/test/**"/> + <exclude name="vmware/test/**"/> <exclude name="www/test/**"/> </zipfileset> @@ -211,6 +214,7 @@ <include name="sfinstaller/**"/> <include name="dns/**"/> <include name="www/**"/> + <include name="vmware/**"/> <include name="lib/**"/> <!--include name="xml/**"/--> <include name="build.xml"/> @@ -245,6 +249,7 @@ <exclude name="ssh/test/**"/> <exclude name="sfinstaller/test/**"/> <exclude name="dns/test/**"/> + <exclude name="vmware/test/**"/> <exclude name="www/test/**"/> </tarfileset> <tarfileset dir=".." prefix="${Name.System}.${version}"> @@ -329,6 +334,7 @@ <copyreleaseszips project="${ssh.project}" /> <copyreleaseszips project="${sfinstaller.project}" /> <copyreleaseszips project="${dns.project}" /> + <copyreleaseszips project="${vmware.project}"/> <copyreleaseszips project="${www.project}" /> <!--copyreleaseszips project="${xml.project}" /--> @@ -364,6 +370,7 @@ <copyreleasestars project="${ssh.project}" /> <copyreleasestars project="${sfinstaller.project}" /> <copyreleasestars project="${dns.project}" /> + <copyreleasestars project="${vmware.project}"/> <copyreleasestars project="${www.project}" /> <!--copyreleasestars project="${xml.project}" /--> Modified: trunk/core/components/documentation.xml =================================================================== --- trunk/core/components/documentation.xml 2007-08-24 12:52:50 UTC (rev 5059) +++ trunk/core/components/documentation.xml 2007-08-24 14:06:50 UTC (rev 5060) @@ -139,6 +139,7 @@ <forrest-component component="scripting"/> <forrest-component component="slp"/> <forrest-component component="www"/> + <forrest-component component="vmware"/> <forrest-component component="xml" /> <!--<forrest-component component="xmpp" />--> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-09-13 13:48:49
|
Revision: 5108 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=5108&view=rev Author: steve_l Date: 2007-09-13 06:48:48 -0700 (Thu, 13 Sep 2007) Log Message: ----------- SFOS-429 Provide a Java-5 typed vector of compound children Here we have a new (typed) reverse list iterator, which is used in CompoundImpl to provide access to the children in reverse order; this is used in the various components that terminate their children backwards. Modified Paths: -------------- trunk/core/components/anubisdeployer/src/org/smartfrog/services/anubisdeployer/dynamicwebserver/thresholder/ThresholderImpl.java trunk/core/components/xml/src/org/smartfrog/services/xml/impl/XmlDocumentImpl.java trunk/core/components/xml/src/org/smartfrog/services/xml/impl/XmlElementImpl.java Modified: trunk/core/components/anubisdeployer/src/org/smartfrog/services/anubisdeployer/dynamicwebserver/thresholder/ThresholderImpl.java =================================================================== --- trunk/core/components/anubisdeployer/src/org/smartfrog/services/anubisdeployer/dynamicwebserver/thresholder/ThresholderImpl.java 2007-09-13 13:38:40 UTC (rev 5107) +++ trunk/core/components/anubisdeployer/src/org/smartfrog/services/anubisdeployer/dynamicwebserver/thresholder/ThresholderImpl.java 2007-09-13 13:48:48 UTC (rev 5108) @@ -178,7 +178,7 @@ } private int currentInstances() { - return sfChildren.size(); + return sfChildList().size(); } public synchronized Object sfReplaceAttribute(Object name, Object value) @@ -267,9 +267,9 @@ protected void stopInstance() throws Exception { synchronized (instanceLock) { - logger.logOptional(name, "stoping instance"); + logger.logOptional(name, "stopping instance"); - Prim child = (Prim) sfChildren.elementAt(0); + Prim child = sfChildList().get(0); String server = (String) childServerMapping.get(child); if (balancer != null) { balancer.removeServer(server); Modified: trunk/core/components/xml/src/org/smartfrog/services/xml/impl/XmlDocumentImpl.java =================================================================== --- trunk/core/components/xml/src/org/smartfrog/services/xml/impl/XmlDocumentImpl.java 2007-09-13 13:38:40 UTC (rev 5107) +++ trunk/core/components/xml/src/org/smartfrog/services/xml/impl/XmlDocumentImpl.java 2007-09-13 13:48:48 UTC (rev 5108) @@ -151,16 +151,9 @@ Prim root = resolveRoot(); //we still iterate through comments and things, but skip the root - for (Enumeration e = sfChildren(); e.hasMoreElements();) { - Object elem = e.nextElement(); - if (!(elem instanceof Prim)) { - //ignore this, whatever it is - continue; - } - Prim p = (Prim) elem; - + for (Prim p : sfChildList()) { if (p instanceof LocalNode && p != root) { - LocalNode node = (LocalNode) elem; + LocalNode node = (LocalNode) p; appendChild(node); } } @@ -200,7 +193,7 @@ * optional code to bind to a source file. * @todo Implement file loading, building up a graph of prims as we go * @throws RemoteException In case of network/rmi error - * @throws SmartFrogException For smartfrog problems, and for caught + * @throws SmartFrogRuntimeException For smartfrog problems, and for caught * XMLExceptions */ private void bindToSourceFile() throws RemoteException, @@ -216,15 +209,15 @@ /** * Get the source file attribute - * @return - * @throws SmartFrogResolutionException - * @throws RemoteException + * @return the source file + * @throws SmartFrogResolutionException failure to resolve + * @throws RemoteException network problems */ private String getSourcefile() throws SmartFrogResolutionException, RemoteException { return FileSystem.lookupAbsolutePath(this, new Reference(ATTR_SOURCEFILE), - (String) null, null, + null, false, null); } Modified: trunk/core/components/xml/src/org/smartfrog/services/xml/impl/XmlElementImpl.java =================================================================== --- trunk/core/components/xml/src/org/smartfrog/services/xml/impl/XmlElementImpl.java 2007-09-13 13:38:40 UTC (rev 5107) +++ trunk/core/components/xml/src/org/smartfrog/services/xml/impl/XmlElementImpl.java 2007-09-13 13:48:48 UTC (rev 5108) @@ -25,6 +25,7 @@ import org.smartfrog.services.xml.interfaces.LocalNode; import org.smartfrog.services.xml.interfaces.XmlElement; import org.smartfrog.sfcore.common.SmartFrogException; +import org.smartfrog.sfcore.prim.Prim; import java.rmi.RemoteException; import java.util.Enumeration; @@ -75,8 +76,7 @@ * XMLExceptions */ protected void addChildren() throws SmartFrogException, RemoteException { - for (Enumeration e = sfChildren(); e.hasMoreElements();) { - Object elem = e.nextElement(); + for (Prim elem:sfChildList()) { if (elem instanceof LocalNode) { LocalNode node = (LocalNode) elem; appendChild(node); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-09-25 23:25:28
|
Revision: 5171 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=5171&view=rev Author: steve_l Date: 2007-09-25 16:25:27 -0700 (Tue, 25 Sep 2007) Log Message: ----------- javadocs and a few IDE-recommended tweaks Modified Paths: -------------- trunk/core/components/loggingservices/src/org/smartfrog/services/logging/jcl/front/CommonsLogFactory.java trunk/core/components/loggingservices/src/org/smartfrog/services/logging/log4j/LogToLog4JImpl.java trunk/core/components/www/doc/www_readme.sxw trunk/core/components/www/src/org/smartfrog/services/www/ApplicationServerContext.java trunk/core/components/www/src/org/smartfrog/services/www/ServletContextComponent.java trunk/core/components/www/src/org/smartfrog/services/www/ServletContextIntf.java trunk/core/components/www/src/org/smartfrog/services/www/WaitForPageImpl.java trunk/core/components/www/src/org/smartfrog/services/www/WebApplicationHelper.java trunk/core/components/www/src/org/smartfrog/services/www/dbc/AbstractDbcDelegate.java trunk/core/components/www/src/org/smartfrog/services/www/dbc/QueuedFile.java trunk/core/components/www/src/org/smartfrog/services/www/diagnostics/components.sf Modified: trunk/core/components/loggingservices/src/org/smartfrog/services/logging/jcl/front/CommonsLogFactory.java =================================================================== --- trunk/core/components/loggingservices/src/org/smartfrog/services/logging/jcl/front/CommonsLogFactory.java 2007-09-25 23:22:41 UTC (rev 5170) +++ trunk/core/components/loggingservices/src/org/smartfrog/services/logging/jcl/front/CommonsLogFactory.java 2007-09-25 23:25:27 UTC (rev 5171) @@ -44,13 +44,15 @@ /** * To get the sfCore logger - * + * @param name The name of the log to look for * @return Logger implementing LogSF and Log */ private LogSF sfLog(String name) { try { + //try to create a log and register it return LogFactory.getLog(name,true); } catch (SmartFrogLogException e) { + //if we can't register, get a simpler log return LogFactory.getLog(name); } } Modified: trunk/core/components/loggingservices/src/org/smartfrog/services/logging/log4j/LogToLog4JImpl.java =================================================================== --- trunk/core/components/loggingservices/src/org/smartfrog/services/logging/log4j/LogToLog4JImpl.java 2007-09-25 23:22:41 UTC (rev 5170) +++ trunk/core/components/loggingservices/src/org/smartfrog/services/logging/log4j/LogToLog4JImpl.java 2007-09-25 23:25:27 UTC (rev 5171) @@ -61,7 +61,7 @@ /** * Log to this logger */ - private transient Logger logger = null; + private Logger logger = null; /** * Logger name @@ -69,7 +69,8 @@ private String logName = null; /** - * Output stream to print to. Bonded at construct time, and usually system.err unless + * Output stream to print to. + * Bonded at construct time, and usually system.err unless * otherwise chosen */ private PrintStream outstream; Modified: trunk/core/components/www/doc/www_readme.sxw =================================================================== (Binary files differ) Modified: trunk/core/components/www/src/org/smartfrog/services/www/ApplicationServerContext.java =================================================================== --- trunk/core/components/www/src/org/smartfrog/services/www/ApplicationServerContext.java 2007-09-25 23:22:41 UTC (rev 5170) +++ trunk/core/components/www/src/org/smartfrog/services/www/ApplicationServerContext.java 2007-09-25 23:25:27 UTC (rev 5171) @@ -79,7 +79,7 @@ /** * liveness check * - * @throws SmartFrogException for deployment problems + * @throws SmartFrogLivenessException for deployment problems * @throws RemoteException for RMI/Networking problems */ void ping() throws SmartFrogLivenessException, RemoteException; Modified: trunk/core/components/www/src/org/smartfrog/services/www/ServletContextComponent.java =================================================================== --- trunk/core/components/www/src/org/smartfrog/services/www/ServletContextComponent.java 2007-09-25 23:22:41 UTC (rev 5170) +++ trunk/core/components/www/src/org/smartfrog/services/www/ServletContextComponent.java 2007-09-25 23:25:27 UTC (rev 5171) @@ -28,5 +28,5 @@ /** * context to declare for {@value} */ - final static String ATTR_SERVLET_CONTEXT = "context"; + String ATTR_SERVLET_CONTEXT = "context"; } Modified: trunk/core/components/www/src/org/smartfrog/services/www/ServletContextIntf.java =================================================================== --- trunk/core/components/www/src/org/smartfrog/services/www/ServletContextIntf.java 2007-09-25 23:22:41 UTC (rev 5170) +++ trunk/core/components/www/src/org/smartfrog/services/www/ServletContextIntf.java 2007-09-25 23:25:27 UTC (rev 5171) @@ -33,12 +33,12 @@ /** * {@value} */ - public static final String ATTR_RESOURCE_BASE = "resourceBase"; + String ATTR_RESOURCE_BASE = "resourceBase"; /** * {@value} */ - public static final String ATTR_CLASSPATH = "classpath"; + String ATTR_CLASSPATH = "classpath"; /** * host ip address. The IPAddr is returned for ease of use on networks where Modified: trunk/core/components/www/src/org/smartfrog/services/www/WaitForPageImpl.java =================================================================== --- trunk/core/components/www/src/org/smartfrog/services/www/WaitForPageImpl.java 2007-09-25 23:22:41 UTC (rev 5170) +++ trunk/core/components/www/src/org/smartfrog/services/www/WaitForPageImpl.java 2007-09-25 23:25:27 UTC (rev 5171) @@ -167,7 +167,8 @@ //failure. Abnormal termination String errorText = ERROR_WAIT_FOR_TIMEOUT + getLivenessPage().getTargetURL(); if (getLivenessPage().getErrorMessage() != null) { - errorText = errorText + "\n" + getLivenessPage().getErrorMessage(); + errorText = errorText + + '\n' + getLivenessPage().getErrorMessage(); } record = TerminationRecord.abnormal( errorText, Modified: trunk/core/components/www/src/org/smartfrog/services/www/WebApplicationHelper.java =================================================================== --- trunk/core/components/www/src/org/smartfrog/services/www/WebApplicationHelper.java 2007-09-25 23:22:41 UTC (rev 5170) +++ trunk/core/components/www/src/org/smartfrog/services/www/WebApplicationHelper.java 2007-09-25 23:25:27 UTC (rev 5171) @@ -67,6 +67,7 @@ * Get the ipaddrs of the local machine * * @return the IP address that we are deployed on + * @throws RemoteException if the owner is not talking */ public String getIpAddress() throws RemoteException { InetAddress deployedHost = getOwner().sfDeployedHost(); @@ -78,7 +79,7 @@ * strip any trailing * from a path and give the base bit up to where that * began. * - * @param path + * @param path path to tidy up * @return the stripped path */ public static String deregexpPath(String path) { Modified: trunk/core/components/www/src/org/smartfrog/services/www/dbc/AbstractDbcDelegate.java =================================================================== --- trunk/core/components/www/src/org/smartfrog/services/www/dbc/AbstractDbcDelegate.java 2007-09-25 23:22:41 UTC (rev 5170) +++ trunk/core/components/www/src/org/smartfrog/services/www/dbc/AbstractDbcDelegate.java 2007-09-25 23:25:27 UTC (rev 5171) @@ -47,9 +47,9 @@ * @param server owner server * @param owner owner as a Prim interface. */ - public AbstractDbcDelegate(DeployByCopyServerImpl server, Prim owner) { + protected AbstractDbcDelegate(DeployByCopyServerImpl server, Prim owner) { this.server = server; - this.declaration = owner; + declaration = owner; } public Prim getDeclaration() { Modified: trunk/core/components/www/src/org/smartfrog/services/www/dbc/QueuedFile.java =================================================================== --- trunk/core/components/www/src/org/smartfrog/services/www/dbc/QueuedFile.java 2007-09-25 23:22:41 UTC (rev 5170) +++ trunk/core/components/www/src/org/smartfrog/services/www/dbc/QueuedFile.java 2007-09-25 23:25:27 UTC (rev 5171) @@ -39,7 +39,7 @@ /** * set the processed bit. - * @param processed + * @param processed flag set if the file is processed. */ public synchronized void setProcessed(boolean processed) { this.processed = processed; Modified: trunk/core/components/www/src/org/smartfrog/services/www/diagnostics/components.sf =================================================================== --- trunk/core/components/www/src/org/smartfrog/services/www/diagnostics/components.sf 2007-09-25 23:22:41 UTC (rev 5170) +++ trunk/core/components/www/src/org/smartfrog/services/www/diagnostics/components.sf 2007-09-25 23:25:27 UTC (rev 5171) @@ -1,4 +1,4 @@ -/** (C) Copyright 2006 Hewlett-Packard Development Company, LP +/** (C) Copyright 2006-2007 Hewlett-Packard Development Company, LP This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-09-27 15:45:26
|
Revision: 5197 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=5197&view=rev Author: steve_l Date: 2007-09-27 08:45:25 -0700 (Thu, 27 Sep 2007) Log Message: ----------- SFOS-357 Move Jetty support up to Jetty6. Everything compiles; tests are failing. Modified Paths: -------------- trunk/core/components/jetty/.svnignore trunk/core/components/jetty/ivy.xml trunk/core/components/jetty/src/org/smartfrog/services/jetty/JettyHelper.java trunk/core/components/jetty/src/org/smartfrog/services/jetty/JettyIntf.java trunk/core/components/jetty/src/org/smartfrog/services/jetty/SFJetty.java trunk/core/components/jetty/src/org/smartfrog/services/jetty/SFJettyAdmin.java trunk/core/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates/DelegateApplicationContext.java trunk/core/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates/DelegateServletContext.java trunk/core/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates/DelegateWebApplicationContext.java trunk/core/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates/JettyServletDelegate.java trunk/core/components/jetty/src/org/smartfrog/services/jetty/contexts/handlers/HTAccess.java trunk/core/components/jetty/src/org/smartfrog/services/jetty/contexts/handlers/HandlerImpl.java trunk/core/components/jetty/src/org/smartfrog/services/jetty/examples/example2.sf trunk/core/components/jetty/src/org/smartfrog/services/jetty/jetty-core.sf trunk/core/components/jetty/src/org/smartfrog/services/jetty/listeners/Listener.java trunk/core/components/jetty/src/org/smartfrog/services/jetty/listeners/Socketlistener.java trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/JettyTCPTest.java trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/components.sf trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/tcn57.sf trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/tcp19.sf trunk/core/components/libraries.properties Added Paths: ----------- trunk/core/components/jetty/src/org/smartfrog/services/jetty/JettyToSFLifecycle.java trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/JettyFunctionalTest.java trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/JettyTestBase.java trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/tcp19test.sf Removed Paths: ------------- trunk/core/components/jetty/build.example.properties trunk/core/components/jetty/buildRelease.xml trunk/core/components/jetty/releaseBuild.xml Modified: trunk/core/components/jetty/.svnignore =================================================================== --- trunk/core/components/jetty/.svnignore 2007-09-27 15:44:21 UTC (rev 5196) +++ trunk/core/components/jetty/.svnignore 2007-09-27 15:45:25 UTC (rev 5197) @@ -2,3 +2,6 @@ build dist version.properties +.classpath +.project +build.properties \ No newline at end of file Deleted: trunk/core/components/jetty/build.example.properties =================================================================== --- trunk/core/components/jetty/build.example.properties 2007-09-27 15:44:21 UTC (rev 5196) +++ trunk/core/components/jetty/build.example.properties 2007-09-27 15:45:25 UTC (rev 5197) @@ -1,9 +0,0 @@ -# -# These properties override properties defined in the build file. -# As these properties are set before the environment is read, they -# cannot make use of these. but htey may override the environmental -# settings. - -# example: - -# smartfrog.home=/cvs_smartfrog/core/smartfrog/dist Deleted: trunk/core/components/jetty/buildRelease.xml =================================================================== --- trunk/core/components/jetty/buildRelease.xml 2007-09-27 15:44:21 UTC (rev 5196) +++ trunk/core/components/jetty/buildRelease.xml 2007-09-27 15:45:25 UTC (rev 5197) @@ -1,193 +0,0 @@ -<?xml version="1.0"?> -<project name="jetty" default="process" basedir="."> - <!-- - /** (C) Copyright 1998-2006 Hewlett-Packard Development Company, LP - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - For more information: www.smartfrog.org - - */ - --> - - <description> - Build file to generate a release of a component. - </description> - - <property file="build.properties"/> - <property name="root.dir" location="../../"/> - - - <import file="${root.dir}/components/buildRelease-template.xml"/> - - - <!-- =================================================================== --> - <!-- release --> - <!-- =================================================================== --> - <target name="make-release-package" depends="ready-to-package"> - - <!-- ================================ --> - <zip destfile="releases/${Name.System}.${version}.${DSTAMP}_DIST.zip"> - <zipfileset dir="." prefix="${Name.System}.${version}"> - <include name="${dist}/**"/> - <exclude name="${dist}/docs/**"/> - <exclude name="${dist}/classes/**"/> - </zipfileset> - <zipfileset dir="." prefix="${Name.System}.${version}"> - <include name="${dist}/docs/jetty_readme*"/> - <include name="${dist}/docs/jdocs/**"/> - </zipfileset> - - </zip> - <!-- ================================ --> - <zip destfile="releases/${Name.System}.${version}.${DSTAMP}_ALL.zip"> - <zipfileset dir="." prefix="${Name.System}.${version}"> - <include name="bin/**"/> - <include name="doc/jetty_readme*"/> - <include name="lib/**"/> - <include name="src/**"/> - <include name="build.xml"/> - <include name="buildRelease.xml"/> - <include name="releaseBuild.xml"/> - <include name="rmitargets"/> - <include name="rmitargetsExamples"/> - <include name="parsertargets"/> - <include name="COPYRIGHT.txt"/> - <include name="LICENSE.txt"/> - <include name="changes.txt"/> - <include name="readme.txt"/> - <exclude name="**/SVN"/> - <exclude name="**/*.dfPackage"/> - <exclude name="**/Cvs"/> - <exclude name="**/.#*"/> - <exclude name="**/*.*~"/> - </zipfileset> - <zipfileset dir="." prefix="${Name.System}.${version}"> - <include name="${dist}/**"/> - <exclude name="${dist}/docs/**"/> - <exclude name="${dist}/classes/**"/> - </zipfileset> - <zipfileset dir="." prefix="${Name.System}.${version}"> - <include name="${dist}/docs/jetty_readme*"/> - <include name="${dist}/docs/jdocs/**"/> - </zipfileset> - </zip> - - - <tar tarfile="releases/${Name.System}.${version}.${DSTAMP}_DIST.tar" longfile="gnu"> - <tarfileset dir="." prefix="${Name.System}.${version}"> - <include name="${dist}/bin/**/*.sf"/> - <include name="${dist}/bin/**/*.bat"/> - <include name="${dist}/bin/**/*.ini"/> - </tarfileset> - <tarfileset dir="." prefix="${Name.System}.${version}"> - <exclude name="${dist}/bin/**"/> - <include name="${dist}/**"/> - <exclude name="${dist}/classes/**"/> - <exclude name="${dist}/docs/**"/> - </tarfileset> - <tarfileset dir="." prefix="${Name.System}.${version}"> - <include name="${dist}/docs/jetty_readme*"/> - <include name="${dist}/docs/jdocs/**"/> - </tarfileset> - <tarfileset dir="." mode="755" prefix="${Name.System}.${version}"> - <include name="${dist}/bin/**"/> - <exclude name="${dist}/bin/**/*.sf"/> - <exclude name="${dist}/bin/**/*.bat"/> - <exclude name="${dist}/bin/**/*.ini"/> - </tarfileset> - </tar> - - - <gzip src="releases/${Name.System}.${version}.${DSTAMP}_DIST.tar" - zipfile="releases/${Name.System}.${version}.${DSTAMP}_DIST.tar.gz"/> - <delete file="releases/${Name.System}.${version}.${DSTAMP}_DIST.tar"/> - - <tar tarfile="releases/${Name.System}.${version}.${DSTAMP}_ALL.tar" longfile="gnu"> - <tarfileset dir="." prefix="${Name.System}.${version}"> - - <include name="bin/**/*.sf"/> - <include name="bin/**/*.bat"/> - <include name="bin/**/*.ini"/> - <include name="doc/jetty_readme*"/> - <include name="lib/**"/> - <include name="src/**"/> - <include name="build.xml"/> - <include name="buildRelease.xml"/> - <include name="releaseBuild.xml"/> - <include name="rmitargets"/> - <include name="rmitargetsExamples"/> - <include name="parsertargets"/> - <include name="COPYRIGHT.txt"/> - <include name="LICENSE.txt"/> - <include name="changes.txt"/> - <include name="readme.txt"/> - <exclude name="**/SVN"/> - <exclude name="**/*.dfPackage"/> - <exclude name="**/Cvs"/> - <exclude name="bin/tools/**"/> - <exclude name="**/.#*"/> - <exclude name="**/*.*~"/> - </tarfileset> - <tarfileset dir="." prefix="${Name.System}.${version}" mode="755"> - <include name="bin/**"/> - <exclude name="bin/**/*.sf"/> - <exclude name="bin/**/*.bat"/> - <exclude name="bin/**/*.ini"/> - </tarfileset> - - <tarfileset dir="." prefix="${Name.System}.${version}"> - <include name="${dist}/bin/**/*.sf"/> - <include name="${dist}/bin/**/*.bat"/> - <include name="${dist}/bin/**/*.ini"/> - </tarfileset> - <tarfileset dir="." prefix="${Name.System}.${version}"> - <exclude name="${dist}/bin/**"/> - <include name="${dist}/**"/> - <exclude name="${dist}/classes/**"/> - <exclude name="${dist}/docs/**"/> - </tarfileset> - <tarfileset dir="." prefix="${Name.System}.${version}"> - <include name="${dist}/docs/jetty_readme*"/> - <include name="${dist}/docs/jdocs/**"/> - </tarfileset> - <tarfileset dir="." mode="755" prefix="${Name.System}.${version}"> - <include name="${dist}/bin/**"/> - <exclude name="${dist}/bin/**/*.sf"/> - <exclude name="${dist}/bin/**/*.bat"/> - <exclude name="${dist}/bin/**/*.ini"/> - </tarfileset> - </tar> - <gzip src="releases/${Name.System}.${version}.${DSTAMP}_ALL.tar" - zipfile="releases/${Name.System}.${version}.${DSTAMP}_ALL.tar.gz"/> - <delete file="releases/${Name.System}.${version}.${DSTAMP}_ALL.tar"/> - <!-- - <zip destfile="../${Name.System}.${version}.${DSTAMP}_JDOCS.zip"> - <zipfileset dir="." prefix="${Name.System}.${version}"> - <include name="${dist}/docs/jdocs/**"/> - </zipfileset> - </zip> - <tar tarfile="../${Name.System}.${version}.${DSTAMP}_JDOCS.tar" > - <tarfileset dir="." prefix="${Name.System}.${version}"> - <include name="${dist}/docs/jdocs/**"/> - </tarfileset> - </tar> - <gzip src="../${Name.System}.${version}.${DSTAMP}_JDOCS.tar" zipfile="../${Name.System}.${version}.${DSTAMP}_JDOCS.tar.gz"/> - <delete file="../${Name.System}.${version}.${DSTAMP}_JDOCS.tar"/> - --> - </target> -</project> - - <!-- End of file --> Modified: trunk/core/components/jetty/ivy.xml =================================================================== --- trunk/core/components/jetty/ivy.xml 2007-09-27 15:44:21 UTC (rev 5196) +++ trunk/core/components/jetty/ivy.xml 2007-09-27 15:45:25 UTC (rev 5197) @@ -61,30 +61,43 @@ changing="true" rev="latest.integration" conf="test->default"/> + <dependency org="javax.servlet" name="servlet-api" rev="${servletapi.version}" conf="compile->master;redist->default"/> + + <!-- + Core Jetty libraries + -we apply our own dependency logic to the components here + which is why the master is picked up. Everything else we need is asked for by hand + --> <dependency org="org.mortbay.jetty" name="jetty" rev="${jetty.version}" - conf="compile->default;redist->default"/> + conf="compile->master;redist->master"/> <dependency org="org.mortbay.jetty" - name="jetty" + name="jetty-util" rev="${jetty.version}" - conf="compile->default;redist->default"/> - <dependency org="tomcat" - name="jasper-runtime" - rev="${jetty.jasper.version}" - conf="jsp->default"/> - <dependency org="tomcat" - name="jasper-compiler" - rev="${jetty.jasper.version}" + conf="compile->master;redist->master"/> + + <!--JSP support --> + <dependency org="org.mortbay.jetty" + name="jsp-2.1" + rev="${jetty.version}" conf="jsp->master"/> - <dependency org="javax.servlet" - name="jsp-api" - rev="${jsp-api.version}" + <dependency org="org.mortbay.jetty" + name="jsp-api-2.1" + rev="${jetty.version}" conf="jsp->master"/> + <dependency org="org.apache.ant" + name="ant" + rev="${apache.ant.version}" + conf="jsp->master"/> + <dependency org="org.eclipse.jdt" + name="core" + rev="${org.eclipse.jdt.core.version}" + conf="jsp->master"/> <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}" Deleted: trunk/core/components/jetty/releaseBuild.xml =================================================================== --- trunk/core/components/jetty/releaseBuild.xml 2007-09-27 15:44:21 UTC (rev 5196) +++ trunk/core/components/jetty/releaseBuild.xml 2007-09-27 15:45:25 UTC (rev 5197) @@ -1,199 +0,0 @@ -<?xml version="1.0"?> - -<!-- -/** (C) Copyright 1998-2004 Hewlett-Packard Development Company, LP - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -For more information: www.smartfrog.org - -*/ ---> -<!DOCTYPE project [ - <!ENTITY security SYSTEM "private/buildSecurity.xml"> -]> -<!-- =========================================================================== - - - -Introduction -============ -To Be Written - - - - - -Installing the build tools -========================== -To Be Written - - - -Build targets -============= -These are the meaningful targets for this build file: - - build - - jdocs ---> - -<project name="JettyDist" default="help" basedir="."> - <!-- =================================================================== --> - <!-- Initialization target --> - <!-- =================================================================== --> - <target name="init"> - <property name="Name" value="Jetty Component"/> - <property name="name" value="(C) Copyright 1998-2006 Hewlett-Packard Development Company, LP"/> - <property name="version" value="DIST"/> - <loadproperties srcFile="version.properties"/> - <fail unless="sf.build.version">No property sf.build.version found in file version.properties</fail> - <property name="Version" value="${sf.build.version}" /> - <!--property name="Version" value="1.00.000_beta"/--> - <property name="year" value=""/> - <echo message=""/> - <echo message="==================================================================="/> - <echo message="= ${Name} ${version}"/> - <echo message="= ${name} "/> - <echo message="==================================================================="/> - </target> - - <!-- =================================================================== --> - <!-- Help on usage --> - <!-- =================================================================== --> - <target name="help" depends="init"> - <echo message=""/> - <echo message=""/> - <echo message="Jetty Component ${version} Build file"/> - <echo message="-------------------------------------------------------------"/> - <echo message=""/> - <echo message=" available targets are:"/> - <echo message=""/> - <echo message=" build --> compiles source files into sf-emailer-examples.jar"/> - <echo message=" jdocs --> creates jdocs for sources"/> - <echo message=""/> - <echo message=" See the comments inside the build.xml file for more details."/> - <echo message=""/> - <echo message=" -- ${Name}--"/> - <echo message=""/> - <echo message="-------------------------------------------------------------"/> - <echo message=""/> - <echo message=""/> - </target> - - <!-- =================================================================== --> - <!-- Global properties --> - <!-- =================================================================== --> - <property name="dist" value="."/> - <property name="bin" value="bin"/> - <property name="lib" value="lib"/> - <property name="docs" value="docs"/> - <property name="build" value="classes"/> <!-- all protected files --> - <property name="src" value="src"/> <!-- all protected files --> - <property name="debugmode" value="on"/> <!-- turn on compile -g --> - <property name="jdocs" value="${dist}/${docs}/jdocs"/> - - <!-- =================================================================== --> - <!-- Initialization path (Libs needed for compiling) --> - <!-- =================================================================== --> - <path id="jetty.class.path"> - <pathelement path="${classpath}"/> - <pathelement location="lib/**.jar"/> - <!--pathelement location="lib/jasper-compiler.jar"/> - <pathelement location="lib/jasper-runtime.jar"/> - <pathelement location="lib/javax.servlet.jar"/> - <pathelement location="lib/org.mortbay.jetty.jar"/> - <pathelement location="lib/org.mortbay.jmx.jar"/--> - </path> - - <!-- =================================================================== --> - <!-- Creates directories --> - <!-- =================================================================== --> - <target name="initbuild" depends="init"> - <mkdir dir="${build}"/> - </target> - - - <!-- =================================================================== --> - <!-- clean --> - <!-- =================================================================== --> - <target name="cleanBuild" depends="" description="Restores the distribution to its clean state"> - <!-- Delete the ${build} ${dist} ${jdocs} directory trees --> - <!-- remove parser source files --> - <delete dir="${build}"/> - <delete dir="${jdocs}"/> - </target> - - <!-- =================================================================== --> - <!-- Copy .sf files to "build" directories --> - <!-- =================================================================== --> - <target name="copyFiles" depends="initbuild"> - <copy todir="${build}"> - <fileset dir="${src}"> - <include name="**/*.sf*" /> - </fileset> - </copy> - </target> - - <!-- =================================================================== --> - <!-- Compiles source directory --> - <!-- =================================================================== --> - <target name="build" depends="copyFiles,initbuild" description="Compiles source code"> - <!-- Compile the java code from ${src} into ${build} --> - <javac srcdir="${src}" destdir="${build}" debug="${debugmode}" compiler="javac1.4" source="1.4"> - <classpath refid="jetty.class.path"/> - </javac> - <rmic base="${build}" includes="**/*.class"> - <classpath refid="jetty.class.path"/> - </rmic> - <!-- sfExamples.jar --> - <!-- Create sfExamples.jar file --> - <jar jarfile="${lib}/sf-jetty-examples.jar" - basedir="${build}" - includes="**/examples/**"/> - </target> - - <!-- =================================================================== --> - <!-- JDocs --> - <!-- =================================================================== --> - <target name="jdocs" depends="init" description="Generates the API documentation"> - <!-- Java Docs for all --> - <echo message=""/> - <echo message="------------------------------------------------------------------------"/> - <echo message=" Creating Java Docs for ${Name} examples [${jdocs}]"/> - <echo message="------------------------------------------------------------------------"/> - <mkdir dir="${jdocs}"/> - <javadoc packagenames="org.smartfrog.*" - sourcepath="${src}" - destdir="${jdocs}" - author="true" - version="true" - Header="${Name.System} ${Version}" - Footer="${Name.System} ${version} ${Version}" - use="true" - windowtitle="${Name}" - doctitle="${Name}" - bottom="${name}" - source="1.4"> - <group title="Jetty Examples Package" packages="org.smartfrog.*"/> - <classpath refid="jetty.class.path"/> - </javadoc> - </target> - -</project> - - - -<!-- End of file --> - Modified: trunk/core/components/jetty/src/org/smartfrog/services/jetty/JettyHelper.java =================================================================== --- trunk/core/components/jetty/src/org/smartfrog/services/jetty/JettyHelper.java 2007-09-27 15:44:21 UTC (rev 5196) +++ trunk/core/components/jetty/src/org/smartfrog/services/jetty/JettyHelper.java 2007-09-27 15:45:25 UTC (rev 5197) @@ -21,10 +21,9 @@ package org.smartfrog.services.jetty; -import org.mortbay.http.HttpContext; -import org.mortbay.http.HttpListener; -import org.mortbay.http.HttpServer; -import org.mortbay.jetty.servlet.ServletHttpContext; +import org.mortbay.jetty.Connector; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.servlet.Context; import org.smartfrog.services.jetty.contexts.JettyServletContextIntf; import org.smartfrog.services.www.ApplicationServerContext; import org.smartfrog.services.www.WebApplicationHelper; @@ -32,9 +31,7 @@ import org.smartfrog.sfcore.common.SmartFrogResolutionException; import org.smartfrog.sfcore.common.SmartFrogRuntimeException; import org.smartfrog.sfcore.prim.Prim; -import org.smartfrog.sfcore.utils.ComponentHelper; -import java.net.InetAddress; import java.rmi.RemoteException; /** @@ -47,7 +44,7 @@ /** * the server */ - private HttpServer httpServer; + private Server httpServer; /** @@ -55,27 +52,8 @@ */ private Prim serverComponent = null; - /** - * Name of the interface of jetty component we look for. - * <p/> - * {@value} - */ - public static final String JETTY_INTERFACE_NAME = "org.smartfrog.services.jetty.JettyIntf"; - // - /** - * Name of the servlet interface of jetty component we look for. - * <p/> - * {@value} - */ - public static final String JETTY_SERVLET_INTERFACE = "org.smartfrog.services.jetty.contexts.JettyServletContextIntf"; /** - * max depth to recurse down - */ - - private static final int MAX_PARENT_DEPTH = 99999; - - /** * Error if we cannot locate an app server. * {@value} */ @@ -92,7 +70,7 @@ * @throws RemoteException network problems * */ - public HttpServer bindToServer() throws SmartFrogException, + public Server bindToServer() throws SmartFrogException, RemoteException { findJettyComponent(); httpServer = findJettyServer(); @@ -114,12 +92,12 @@ * @throws SmartFrogException smartfrog problems, including no server found * @throws RemoteException network problems */ - private HttpServer findJettyServer() throws SmartFrogException, + private Server findJettyServer() throws SmartFrogException, RemoteException { assert serverComponent != null; - HttpServer server = null; + Server server = null; server = - (HttpServer) serverComponent.sfResolve(JettyIntf.ATTR_JETTY_SERVER, + (Server) serverComponent.sfResolve(JettyIntf.ATTR_JETTY_SERVER, server, true); return server; @@ -151,7 +129,7 @@ * @throws SmartFrogException a failure of the operation to set the server * @throws RemoteException network problems */ - public void cacheJettyServer(HttpServer server) + public void cacheJettyServer(Server server) throws SmartFrogException, RemoteException { getOwner().sfReplaceAttribute(JettyIntf.ATTR_JETTY_SERVER, server); @@ -196,15 +174,15 @@ * @throws SmartFrogException * @throws RemoteException */ - public ServletHttpContext getServletContext(boolean mandatory) + public Context getServletContext(boolean mandatory) throws SmartFrogException, RemoteException { - ServletHttpContext jettyContext = null; + Context jettyContext = null; Prim contextImpl = findServletContext(); if (contextImpl != null) { - jettyContext = (ServletHttpContext) contextImpl. + jettyContext = (Context) contextImpl. sfResolve(JettyServletContextIntf.ATTR_CONTEXT); } if (mandatory && jettyContext == null) { @@ -219,6 +197,13 @@ /** * find whatever ancestor is a servlet context */ + /** + * Find the servlet context. + * This is done by resolving the owner and looking for its server attribute + * @return the owner server, null if there is no server, + * @throws RemoteException network trouble + * @throws SmartFrogResolutionException failure to resolve + */ public Prim findServletContext() throws RemoteException, SmartFrogResolutionException { return getOwner().sfResolve(ApplicationServerContext.ATTR_SERVER,(Prim)null,false); } @@ -227,19 +212,19 @@ /** * add a listener to the server * - * @param listener + * @param listener a listener */ - public void addListener(HttpListener listener) { - httpServer.addListener(listener); + public void addListener(Connector listener) { + httpServer.addConnector(listener); } /** * add a listener, then start it * - * @param listener - * @throws SmartFrogException + * @param listener a listener + * @throws SmartFrogException failue to start the listener */ - public void addAndStartListener(HttpListener listener) + public void addAndStartListener(Connector listener) throws SmartFrogException { addListener(listener); try { @@ -251,11 +236,11 @@ /** * remove a listener - * @param listener + * @param listener a listener */ - public void removeListener(HttpListener listener) { + public void removeListener(Connector listener) { if (httpServer != null) { - httpServer.removeListener(listener); + httpServer.removeConnector(listener); } } @@ -264,16 +249,16 @@ * * @return server or null if unbound. */ - public HttpServer getServer() { + public Server getServer() { return httpServer; } /** * terminate a context log failures but do not throw anything * - * @param context + * @param context context to terminate */ - public void terminateContext(HttpContext context) { + public void terminateContext(Context context) { if (context != null) { try { context.stop(); @@ -284,7 +269,7 @@ } } if (httpServer != null) { - httpServer.removeContext(context); + httpServer.removeLifeCycle(context); } } } @@ -292,9 +277,9 @@ /** * terminate a listener; log trouble but continue * - * @param listener + * @param listener a listener */ - public synchronized void terminateListener(HttpListener listener) { + public synchronized void terminateListener(Connector listener) { if (listener != null) { try { listener.stop(); @@ -303,12 +288,10 @@ getLogger().error(" Interrupted on listener termination ", ex); } - } catch (NullPointerException npe) { - if (getLogger().isErrorEnabled()) { - getLogger().warn( - " Dropping NPE caught during Jetty teardown", + } catch (Exception npe) { + getLogger().error( + " Ignoring caught during Jetty teardown", npe); - } } removeListener(listener); } Modified: trunk/core/components/jetty/src/org/smartfrog/services/jetty/JettyIntf.java =================================================================== --- trunk/core/components/jetty/src/org/smartfrog/services/jetty/JettyIntf.java 2007-09-27 15:44:21 UTC (rev 5196) +++ trunk/core/components/jetty/src/org/smartfrog/services/jetty/JettyIntf.java 2007-09-27 15:45:25 UTC (rev 5197) @@ -62,6 +62,32 @@ */ public static final String ATTR_LOGPATTERN="logPattern"; - + /** + * timezone for log data + * {@value} + */ + + public static final String ATTR_LOG_TZ = "logTimezone"; + + /** + * max# of threads in the pool. + * {@value} + */ + public static final String ATTR_MAXTHREADS="maxThreads"; + + /** + * min# of threads in the pool. + * {@value} + */ + public static final String ATTR_MINTHREADS = "minThreads"; + + /** + * max idle time for a thread before it is closed + * {@value} + */ + + public static final String ATTR_MAXIDLETIME = "maxIdleTime"; + + } Added: trunk/core/components/jetty/src/org/smartfrog/services/jetty/JettyToSFLifecycle.java =================================================================== --- trunk/core/components/jetty/src/org/smartfrog/services/jetty/JettyToSFLifecycle.java (rev 0) +++ trunk/core/components/jetty/src/org/smartfrog/services/jetty/JettyToSFLifecycle.java 2007-09-27 15:45:25 UTC (rev 5197) @@ -0,0 +1,86 @@ +/** (C) Copyright 2007 Hewlett-Packard Development Company, LP + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +For more information: www.smartfrog.org + +*/ +package org.smartfrog.services.jetty; + +import org.mortbay.component.LifeCycle; +import org.smartfrog.sfcore.prim.Liveness; +import org.smartfrog.sfcore.common.SmartFrogLivenessException; +import org.smartfrog.sfcore.common.SmartFrogException; + +import java.rmi.RemoteException; + +/** + * + * Something to bridge ping and stop operations to jetty + * Created 27-Sep-2007 16:25:34 + * + */ + +public class JettyToSFLifecycle implements Liveness { + + private String name; + private LifeCycle jettyComponent; + /** Error string raised in liveness checks. {@value} */ + public static final String LIVENESS_ERROR_NOT_STARTED = " is not active"; + public static final String LIVENESS_ERROR_NOT_RUNNING = "is not running"; + public static final String LIVENESS_ERROR_FAILED = " has failed"; + + public JettyToSFLifecycle(String name, LifeCycle jettyComponent) { + this.name = name; + this.jettyComponent = jettyComponent; + } + + /** + * liveness test verifies the server is started + * + * @param source caller + * @throws SmartFrogLivenessException the server is not started + * @throws RemoteException network trouble + */ + public synchronized void sfPing(Object source) throws SmartFrogLivenessException, RemoteException { + if (jettyComponent == null) { + throw new SmartFrogLivenessException(name+LIVENESS_ERROR_NOT_STARTED); + } + if (jettyComponent.isFailed()) { + throw new SmartFrogLivenessException(name +LIVENESS_ERROR_FAILED); + } + if (!jettyComponent.isRunning()) { + throw new SmartFrogLivenessException(name +LIVENESS_ERROR_NOT_RUNNING); + } + } + + public synchronized void stop() throws Exception { + if(jettyComponent!=null) { + jettyComponent.stop(); + jettyComponent=null; + } + } + + public synchronized void start() throws SmartFrogException { + try { + if(jettyComponent!=null) { + jettyComponent.start(); + } + } catch (Exception e) { + throw SmartFrogException.forward(e); + } + } + +} Modified: trunk/core/components/jetty/src/org/smartfrog/services/jetty/SFJetty.java =================================================================== --- trunk/core/components/jetty/src/org/smartfrog/services/jetty/SFJetty.java 2007-09-27 15:44:21 UTC (rev 5196) +++ trunk/core/components/jetty/src/org/smartfrog/services/jetty/SFJetty.java 2007-09-27 15:45:25 UTC (rev 5197) @@ -1,27 +1,28 @@ /** (C) Copyright 1998-2007 Hewlett-Packard Development Company, LP -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -For more information: www.smartfrog.org + For more information: www.smartfrog.org -*/ + */ package org.smartfrog.services.jetty; -import org.mortbay.http.HttpServer; -import org.mortbay.http.NCSARequestLog; +import org.mortbay.jetty.NCSARequestLog; +import org.mortbay.jetty.Server; +import org.mortbay.thread.BoundedThreadPool; import org.smartfrog.services.filesystem.FileSystem; import org.smartfrog.services.jetty.contexts.delegates.DelegateServletContext; import org.smartfrog.services.jetty.contexts.delegates.DelegateWebApplicationContext; @@ -50,52 +51,36 @@ private final Reference jettyhomeRef = new Reference(ATTR_JETTY_HOME); - /** - * Jetty home path - */ + /** Jetty home path */ private String jettyhome; - /** - * A jetty helper - */ + /** A jetty helper */ private JettyHelper jettyHelper = new JettyHelper(this); - /** - * The Http server - */ - private HttpServer server; + /** The Http server */ + private Server server; + private JettyToSFLifecycle serverBridge = new JettyToSFLifecycle("server", null); - /** - * flag to turn logging on. - */ + /** flag to turn logging on. */ private boolean enableLogging = false; private String logDir; private String logPattern; - /** - * log pattern. - * {@value} - */ + /** log pattern. {@value} */ public static final String LOG_PATTERN = "yyyy_mm_dd.request.log"; - /** - * log subdirectory. - * {@value} - */ + /** log subdirectory. {@value} */ public static final String LOG_SUBDIR = "/logs/"; - /** - * Error string raised in liveness checks. - * {@value} - */ - public static final String LIVENESS_ERROR_SERVER_NOT_STARTED = "Server is not started"; + /** Error string raised when EARs are deployed {@value} */ public static final String ERROR_EAR_UNSUPPORTED = "Jetty does not support EAR files"; /** * Standard RMI constructor - * @throws RemoteException In case of network/rmi error + * + * @throws RemoteException In case of network/rmi error */ public SFJetty() throws RemoteException { @@ -106,7 +91,7 @@ * * @return the server or null if not currently deployed. */ - public HttpServer getServer() { + public Server getServer() { return server; } @@ -119,7 +104,13 @@ public synchronized void sfDeploy() throws SmartFrogException, RemoteException { try { super.sfDeploy(); - server = new HttpServer(); + server = new Server(); + serverBridge = new JettyToSFLifecycle("server", server); + BoundedThreadPool pool = new BoundedThreadPool(); + pool.setMaxThreads(sfResolve(ATTR_MAXTHREADS, 0, true)); + pool.setMinThreads(sfResolve(ATTR_MINTHREADS, 0, true)); + pool.setMaxIdleTimeMs(sfResolve(ATTR_MAXIDLETIME, 0, true)); + server.setThreadPool(pool); jettyHelper.cacheJettyServer(server); jettyhome = sfResolve(jettyhomeRef, jettyhome, true); jettyHelper.cacheJettyHome(jettyhome); @@ -146,15 +137,12 @@ public synchronized void sfStart() throws SmartFrogException, RemoteException { super.sfStart(); - try { - server.start(); - } catch (Exception mexp) { - throw SmartFrogException.forward(mexp); - } + serverBridge.start(); } /** * Configure the http server + * * @throws SmartFrogException In case of error while starting */ public void configureLogging() throws SmartFrogException { @@ -168,30 +156,28 @@ requestlog.setAppend(true); requestlog.setExtended(true); //todo: make options - requestlog.setLogTimeZone("GMT"); + requestlog.setLogTimeZone(sfResolve(ATTR_LOG_TZ, "", true)); String[] paths = {"/jetty/images/*", "/demo/images/*", "*.css"}; requestlog.setIgnorePaths(paths); - server.setRequestLog(requestlog); + server.addLifeCycle(requestlog); } } catch (Exception ex) { throw SmartFrogException.forward(ex); } } - /** - * Termination phase - * Shut down the server, logging any errors that happen on the way - */ + /** Termination phase Shut down the server, logging any errors that happen on the way */ public synchronized void sfTerminateWith(TerminationRecord status) { + try { - if (server != null) { - server.stop(); - } + serverBridge.stop(); } catch (InterruptedException ie) { if (sfLog().isErrorEnabled()) { - sfLog().error(" Interrupted on server termination ", ie); + sfLog().error("Interrupted on server termination ", ie); } + } catch (Exception ie) { + sfLog().error("while terminating Jetty server", ie); } super.sfTerminateWith(status); } @@ -201,28 +187,25 @@ * * @param source caller * @throws SmartFrogLivenessException the server is not started - * @throws RemoteException network trouble + * @throws RemoteException network trouble */ public void sfPing(Object source) throws SmartFrogLivenessException, RemoteException { super.sfPing(source); - if (server == null || !server.isStarted()) { - throw new SmartFrogLivenessException(LIVENESS_ERROR_SERVER_NOT_STARTED); - } + serverBridge.sfPing(source); } /** - * deploy a web application. - * Deploys a web application identified by the component passed as a parameter; a component of arbitrary - * type but which must have the mandatory attributes identified in - * {@link org.smartfrog.services.www.JavaWebApplication}; - * possibly even extra types required by the particular application server. + * deploy a web application. Deploys a web application identified by the component passed as a parameter; a + * component of arbitrary type but which must have the mandatory attributes identified in {@link + * org.smartfrog.services.www.JavaWebApplication}; possibly even extra types required by the particular application + * server. * - * @param webApplication the web application. this must be a component whose attributes include the - * mandatory set of attributes defined for a JavaWebApplication component. Application-server specific attributes - * (both mandatory and optional) are also permitted + * @param webApplication the web application. this must be a component whose attributes include the mandatory set of + * attributes defined for a JavaWebApplication component. Application-server specific + * attributes (both mandatory and optional) are also permitted * @return an entry * @throws SmartFrogException errors thrown by the delegate - * @throws RemoteException network trouble + * @throws RemoteException network trouble */ public JavaWebApplication deployWebApplication(Prim webApplication) throws RemoteException, SmartFrogException { @@ -238,9 +221,10 @@ * @param enterpriseApplication the application * @return an entry referring to the application * @throws SmartFrogException always - * @throws RemoteException network trouble + * @throws RemoteException network trouble */ - public JavaEnterpriseApplication deployEnterpriseApplication(Prim enterpriseApplication) throws RemoteException, SmartFrogException { + public JavaEnterpriseApplication deployEnterpriseApplication(Prim enterpriseApplication) + throws RemoteException, SmartFrogException { throw new SmartFrogException(ERROR_EAR_UNSUPPORTED); } @@ -249,7 +233,7 @@ * * @param servletContext the servlet context * @return a token referring to the application - * @throws RemoteException network trouble + * @throws RemoteException network trouble * @throws SmartFrogException on any other problem */ public ServletContextIntf deployServletContext(Prim servletContext) throws RemoteException, SmartFrogException { Modified: trunk/core/components/jetty/src/org/smartfrog/services/jetty/SFJettyAdmin.java =================================================================== --- trunk/core/components/jetty/src/org/smartfrog/services/jetty/SFJettyAdmin.java 2007-09-27 15:44:21 UTC (rev 5196) +++ trunk/core/components/jetty/src/org/smartfrog/services/jetty/SFJettyAdmin.java 2007-09-27 15:45:25 UTC (rev 5197) @@ -21,13 +21,14 @@ package org.smartfrog.services.jetty; -import org.mortbay.http.BasicAuthenticator; -import org.mortbay.http.HashUserRealm; -import org.mortbay.http.HttpServer; -import org.mortbay.http.SecurityConstraint; -import org.mortbay.http.SocketListener; -import org.mortbay.http.handler.SecurityHandler; -import org.mortbay.jetty.servlet.ServletHttpContext; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.bio.SocketConnector; +import org.mortbay.jetty.security.BasicAuthenticator; +import org.mortbay.jetty.security.Constraint; +import org.mortbay.jetty.security.ConstraintMapping; +import org.mortbay.jetty.security.HashUserRealm; +import org.mortbay.jetty.security.SecurityHandler; +import org.mortbay.jetty.servlet.Context; import org.smartfrog.sfcore.common.SmartFrogDeploymentException; import org.smartfrog.sfcore.common.SmartFrogException; import org.smartfrog.sfcore.prim.PrimImpl; @@ -37,11 +38,9 @@ import java.rmi.RemoteException; /** - * A wrapper for a Jetty http server for admin configurations + * A wrapper for a Jetty HTTP server for admin configurations * - * Look at this, tehre's no reason why this shouldnt be donen from the normal - * Jetty component. If you cannot do it declaratively, then the components - * need improving. + * @TODO Revisit this and try and reimplement from SF itself. Its a good use case of the servlet mappings * * @author Ritu Sabharwal */ @@ -58,17 +57,17 @@ /** * The server */ - private HttpServer server; + private Server server; /** * The Socket listener */ - private SocketListener listener = new SocketListener(); + private SocketConnector listener = new SocketConnector(); /** * Realm context */ - private ServletHttpContext realmcontext = new ServletHttpContext(); + private Context realmcontext = new Context(); /** * User realm @@ -93,12 +92,12 @@ RemoteException { super.sfStart(); try { - server = new HttpServer(); + server = new Server(); listenerPort = sfResolve(listenerPortRef, listenerPort, true); httpserverHost = sfResolve(httpserverHostRef, httpserverHost, false); contextPath = sfResolve(contextPathRef, "/", false); - configureHttpServer(); + configureServer(); } catch (Exception ex) { throw SmartFrogDeploymentException.forward(ex); } @@ -113,29 +112,34 @@ * Configure the http server for admin configurations * @throws SmartFrogException In case of error while starting */ - public void configureHttpServer() throws SmartFrogException { + public void configureServer() throws SmartFrogException { try { listener.setPort(listenerPort); listener.setHost(httpserverHost); - server.addListener(listener); + server.addConnector(listener); admin_realm.put("admin", "admin"); admin_realm.addUserToRole("admin", "server-administrator"); - server.addRealm(admin_realm); + server.addUserRealm(admin_realm); realmcontext.setContextPath(contextPath); - realmcontext.setRealmName(ADMIN_REALM_NAME); - realmcontext.setAuthenticator(new BasicAuthenticator()); - realmcontext.addHandler(new SecurityHandler()); - realmcontext.addSecurityConstraint("/", - new SecurityConstraint("Admin", - "server-administrator")); - realmcontext.addServlet("Debug", "/Debug/*", - "org.mortbay.servlet.Debug"); - realmcontext.addServlet("Admin", "/", - "org.mortbay.servlet.AdminServlet"); - realmcontext.setAttribute("org.mortbay.http.HttpServer", - realmcontext.getHttpServer()); - server.addContext(realmcontext); - server.setAnonymous(true); + realmcontext.setDisplayName(ADMIN_REALM_NAME); + SecurityHandler security=new SecurityHandler(); + security.setAuthenticator(new BasicAuthenticator()); + realmcontext.addHandler(security); + Constraint constraint=new Constraint("Admin", + "server-administrator"); + ConstraintMapping[] constraints=new ConstraintMapping[1]; + constraints[0]=new ConstraintMapping(); + constraints[0].setConstraint(constraint); + constraints[0].setPathSpec("/"); + security.setConstraintMappings(constraints); + realmcontext.addServlet("/Debug/*", + "org.mortbay.servlet.Debug").setDisplayName("Debug"); + realmcontext.addServlet("/", + "org.mortbay.servlet.AdminServlet").setDisplayName("Admin"); + realmcontext.setAttribute("org.mortbay.http.Server", + realmcontext.getServer()); + server.addLifeCycle(realmcontext); + //server.setAnonymous(true); } catch (Exception ex) { throw SmartFrogException.forward(ex); } @@ -145,11 +149,11 @@ * Termination phase. shut the server and the listener */ public synchronized void sfTerminateWith(TerminationRecord status) { - server.removeListener(listener); - server.removeContext(realmcontext); + server.removeConnector(listener); + server.removeLifeCycle(realmcontext); try { server.stop(); - } catch (InterruptedException ie) { + } catch (Exception ie) { if (sfLog().isErrorEnabled()){ sfLog().error(" Interrupted on server termination " , ie); } Modified: trunk/core/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates/DelegateApplicationContext.java =================================================================== --- trunk/core/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates/DelegateApplicationContext.java 2007-09-27 15:44:21 UTC (rev 5196) +++ trunk/core/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates/DelegateApplicationContext.java 2007-09-27 15:45:25 UTC (rev 5197) @@ -19,8 +19,8 @@ */ package org.smartfrog.services.jetty.contexts.delegates; -import org.mortbay.http.HttpContext; -import org.mortbay.http.HttpServer; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.servlet.Context; import org.smartfrog.services.jetty.SFJetty; import org.smartfrog.services.www.ApplicationServerContext; import org.smartfrog.sfcore.common.SmartFrogException; @@ -41,7 +41,7 @@ * @param server jetty sever * @param context context */ - protected DelegateApplicationContext(SFJetty server, HttpContext context) { + protected DelegateApplicationContext(SFJetty server, Context context) { this.server = server; this.context = context; } @@ -57,7 +57,7 @@ /** * The actual context */ - private HttpContext context; + private Context context; /** @@ -74,7 +74,7 @@ * * @return the context; will be null if not running */ - public HttpContext getContext() { + public Context getContext() { return context; } @@ -83,7 +83,7 @@ * * @param context the jetty context */ - public void setContext(HttpContext context) { + public void setContext(Context context) { this.context = context; } @@ -105,7 +105,7 @@ */ public void start() throws SmartFrogException, RemoteException { if (context != null) { - getServer().getServer().addContext(getContext()); + getServer().getServer().addLifeCycle(getContext()); try { getContext().start(); } catch (RemoteException ex) { @@ -144,9 +144,9 @@ public void terminate() throws RemoteException, SmartFrogException { if (context != null) { try { - HttpServer httpServer = getServer().getServer(); + Server httpServer = getServer().getServer(); if (httpServer != null) { - httpServer.removeContext(context); + httpServer.removeLifeCycle(context); } else { //do nothing, the server is not alive any more } Modified: trunk/core/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates/DelegateServletContext.java =================================================================== --- trunk/core/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates/DelegateServletContext.java 2007-09-27 15:44:21 UTC (rev 5196) +++ trunk/core/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates/DelegateServletContext.java 2007-09-27 15:45:25 UTC (rev 5197) @@ -19,10 +19,10 @@ */ package org.smartfrog.services.jetty.contexts.delegates; -import org.mortbay.http.HttpContext; -import org.mortbay.http.HttpHandler; -import org.mortbay.http.handler.ResourceHandler; -import org.mortbay.jetty.servlet.ServletHttpContext; +import org.mortbay.jetty.Handler; +import org.mortbay.jetty.MimeTypes; +import org.mortbay.jetty.handler.ResourceHandler; +import org.mortbay.jetty.servlet.Context; import org.smartfrog.services.jetty.JettyHelper; import org.smartfrog.services.jetty.SFJetty; import org.smartfrog.services.www.ServletComponent; @@ -30,10 +30,10 @@ import org.smartfrog.services.www.ServletContextIntf; import org.smartfrog.services.www.WebApplicationHelper; import org.smartfrog.sfcore.common.SmartFrogException; +import org.smartfrog.sfcore.logging.Log; +import org.smartfrog.sfcore.logging.LogFactory; import org.smartfrog.sfcore.prim.Prim; import org.smartfrog.sfcore.reference.Reference; -import org.smartfrog.sfcore.logging.Log; -import org.smartfrog.sfcore.logging.LogFactory; import java.io.File; import java.rmi.RemoteException; @@ -61,11 +61,11 @@ * Get the context cast to a servlet context * @return the servlet context of jetty */ - public final ServletHttpContext getServletContext() { - return (ServletHttpContext)getContext(); + public final Context getServletContext() { + return (Context)getContext(); } - public DelegateServletContext(SFJetty server, HttpContext context) { + public DelegateServletContext(SFJetty server, Context context) { super(server, context); } @@ -81,7 +81,7 @@ public void deploy(Prim declaration) throws SmartFrogException, RemoteException { log = LogFactory.getOwnerLog(declaration); JettyHelper jettyHelper = new JettyHelper(declaration); - ServletHttpContext context = new ServletHttpContext(); + Context context = new Context(); setContext(context); jettyHelper.setServerComponent(getServer()); String jettyhome = jettyHelper.findJettyHome(); @@ -100,14 +100,14 @@ } //classpath stuff. //REVISIT: what does this bring to the table? - String classPath = declaration.sfResolve(classPathRef, (String) null, false); +/* String classPath = declaration.sfResolve(classPathRef, (String) null, false); if (classPath != null) { if (!new File(classPath).exists()) { classPath = jettyhome+classPath; } log.info("Jetty classpath="+classPath); context.setClassPath(classPath); - } + }*/ //configure the context log.debug("Jetty resource base ="+resourceBase); context.setResourceBase(resourceBase); @@ -137,8 +137,9 @@ * @throws RemoteException network problems */ public void addMimeMapping(String extension, String mimeType) throws RemoteException, SmartFrogException { - getServletContext().setMimeMapping(extension, mimeType); log.info("Adding mime mapping "+extension+" maps to "+mimeType); + MimeTypes mimes = getServletContext().getMimeTypes(); + mimes.addMimeMapping(extension,mimeType); } /** @@ -151,9 +152,13 @@ */ public boolean removeMimeMapping(String extension) throws RemoteException, SmartFrogException { - Map mimeMap = getServletContext().getMimeMap(); log.info("removing mime mapping " + extension); - return (mimeMap.remove(extension) != null); + Map mimeMap = getServletContext().getMimeTypes().getMimeMap(); + if(mimeMap!=null) { + return (mimeMap.remove(extension) != null); + } else { + return false; + } } /** @@ -177,9 +182,9 @@ * @throws SmartFrogException smartfrog problems * @throws RemoteException network problems */ - public void addHandler(HttpHandler handler) throws SmartFrogException, + public void addHandler(Handler handler) throws SmartFrogException, RemoteException { - ServletHttpContext context = getServletContext(); + Context context = getServletContext(); context.addHandler(handler); } @@ -190,16 +195,17 @@ * @throws SmartFrogException smartfrog problems * @throws RemoteException network problems */ - public void removeHandler(HttpHandler handler) throws SmartFrogException, RemoteException { - ServletHttpContext context = getServletContext(); + public void removeHandler(Handler handler) throws SmartFrogException, RemoteException { try { if(handler.isStarted()) { handler.stop(); } - } catch (InterruptedException ignore) { - //ignore + } catch (Exception ignore) { + log.info(ignore); } - context.removeHandler(handler); + //TODO: remove the handler? + Context context = getServletContext(); + //context.removeHandler(handler); } Modified: trunk/core/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates/DelegateWebApplicationContext.java =================================================================== --- trunk/core/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates/DelegateWebApplicationContext.java 2007-09-27 15:44:21 UTC (rev 5196) +++ trunk/core/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates/DelegateWebApplicationContext.java 2007-09-27 15:45:25 UTC (rev 5197) @@ -20,10 +20,8 @@ package org.smartfrog.services.jetty.contexts.delegates; -import org.mortbay.http.HttpServer; -import org.mortbay.jetty.servlet.AbstractSessionManager; import org.mortbay.jetty.servlet.ServletHandler; -import org.mortbay.jetty.se... [truncated message content] |
From: <st...@us...> - 2007-10-12 15:44:22
|
Revision: 5263 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=5263&view=rev Author: steve_l Date: 2007-10-12 08:44:21 -0700 (Fri, 12 Oct 2007) Log Message: ----------- SFOS-357 Move Jetty support up to Jetty6. This is still broken Modified Paths: -------------- trunk/core/components/jetty/ivy.xml trunk/core/components/jetty/src/org/smartfrog/services/jetty/JettyImpl.java trunk/core/components/jetty/src/org/smartfrog/services/jetty/JettyToSFLifecycle.java trunk/core/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates/DelegateApplicationContext.java trunk/core/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates/DelegateServletContext.java trunk/core/components/jetty/src/org/smartfrog/services/jetty/jetty-core.sf trunk/core/components/jetty/src/org/smartfrog/services/jetty/listeners/JettySocketConnectorImpl.java trunk/core/components/jetty/src/org/smartfrog/services/jetty/listeners/SSLJettySocketConnectorImpl.java trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/components.sf trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/tcp19test.sf trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/tcp20.sf trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/local_test_jetty_server.sf trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/ports.sf trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/testLivenessError.sf trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/testLivenessNoHost.sf trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/testLivenessURL.sf trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/testNestedWar.sf trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/testWarDeployed.sf trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/testwar.sf trunk/core/components/libraries.properties Added Paths: ----------- trunk/core/components/jetty/src/org/smartfrog/services/jetty/internal/ trunk/core/components/jetty/src/org/smartfrog/services/jetty/internal/ExtendedServletHandler.java trunk/core/components/jetty/src/org/smartfrog/services/jetty/internal/MimeResourceHandler.java trunk/core/components/jetty/src/org/smartfrog/services/jetty/listeners/AbstractConnectorImpl.java trunk/core/components/jetty/src/org/smartfrog/services/jetty/listeners/SelectChannelConnectorImpl.java Modified: trunk/core/components/jetty/ivy.xml =================================================================== --- trunk/core/components/jetty/ivy.xml 2007-10-12 15:43:18 UTC (rev 5262) +++ trunk/core/components/jetty/ivy.xml 2007-10-12 15:44:21 UTC (rev 5263) @@ -102,7 +102,7 @@ rev="${servletapi.version}" conf="compile->master;redist->default"/> <!-- - + //doesn't parse in Ivy 2.0.0-alpha-2; incompatible pom. <dependency org="org.slf4j" name="slf4j-jcl" rev="${slf4j.version}" Modified: trunk/core/components/jetty/src/org/smartfrog/services/jetty/JettyImpl.java =================================================================== --- trunk/core/components/jetty/src/org/smartfrog/services/jetty/JettyImpl.java 2007-10-12 15:43:18 UTC (rev 5262) +++ trunk/core/components/jetty/src/org/smartfrog/services/jetty/JettyImpl.java 2007-10-12 15:44:21 UTC (rev 5263) @@ -22,6 +22,7 @@ import org.mortbay.jetty.NCSARequestLog; import org.mortbay.jetty.Server; +import org.mortbay.jetty.Handler; import org.mortbay.jetty.handler.HandlerCollection; import org.mortbay.jetty.handler.RequestLogHandler; import org.mortbay.jetty.handler.ContextHandlerCollection; @@ -96,10 +97,10 @@ /** * Configure and deploy the Jetty component * - * There's a good example at {@link http://jetty.mortbay.org/xref/org/mortbay/jetty/example/LikeJettyXml.html} + * There's a good example on the mortbay site * on how to set Jetty up to match the base configuration; what we have here is not that dissimilar, only * configurable via .sf files. - * + * @see <a href="http://jetty.mortbay.org/xref/org/mortbay/jetty/example/LikeJettyXml.html">Example</a> * @throws SmartFrogException In case of error while deploying * @throws RemoteException In case of network/rmi error */ @@ -121,27 +122,32 @@ server.setSendServerVersion(sfResolve(ATTR_SEND_SERVER_VERSION, false, true)); server.setSendDateHeader(sfResolve(ATTR_SEND_DATE_HEADER, false, true)); - //turn on the handlers - //after this, a call to setHandler appends a new handler - HandlerCollection collection = new HandlerCollection(); - server.setHandler(collection); - //set the jetty helper up jettyHelper.cacheJettyServer(server); jettyHome = sfResolve(jettyhomeRef, jettyHome, true); jettyHelper.cacheJettyHome(jettyHome); + //this holds all the server contexts ContextHandlerCollection contexts = new ContextHandlerCollection(); - server.addHandler(contexts); - server.addHandler(new DefaultHandler()); - //now look at logging + //now look at logging; add one if needed + RequestLogHandler logHandler=null; if (sfResolve(ATTR_ENABLE_LOGGING, false, true)) { - configureLogging(); + logHandler = configureLogging(); } + //the 404 handler has to come after the contexts + DefaultHandler raise404 = new DefaultHandler(); + + Handler[] handlerArray; + if(logHandler!=null) { + handlerArray=new Handler[] {contexts, raise404,logHandler}; + } else { + handlerArray = new Handler[]{contexts, raise404}; + } + server.setHandlers(handlerArray); } @@ -167,12 +173,13 @@ /** - * Configure the http server + * Create a log handler...this is not bound to the server yet * * @throws SmartFrogException In case of error while starting * @throws RemoteException In case of network/rmi error + * @return the log handler */ - public void configureLogging() throws SmartFrogException, RemoteException { + public RequestLogHandler configureLogging() throws SmartFrogException, RemoteException { String logDir = FileSystem.lookupAbsolutePath(this, JettyIntf.ATTR_LOGDIR, jettyHome, null, true, null); String logPattern = sfResolve(JettyIntf.ATTR_LOGPATTERN, "", true); @@ -197,7 +204,7 @@ //bind the log to the server by way of a handler RequestLogHandler requestLogHandler = new RequestLogHandler(); requestLogHandler.setRequestLog(requestlog); - server.addHandler(requestLogHandler); + return requestLogHandler; } /** Modified: trunk/core/components/jetty/src/org/smartfrog/services/jetty/JettyToSFLifecycle.java =================================================================== --- trunk/core/components/jetty/src/org/smartfrog/services/jetty/JettyToSFLifecycle.java 2007-10-12 15:43:18 UTC (rev 5262) +++ trunk/core/components/jetty/src/org/smartfrog/services/jetty/JettyToSFLifecycle.java 2007-10-12 15:44:21 UTC (rev 5263) @@ -88,6 +88,20 @@ } /** + * Stop the component by calling {@link #stop()} + * any exceptions are caught and forwarded as SmartFrogExceptions + * + * @throws SmartFrogException anything that went wrong + */ + public synchronized void wrappedStop() throws SmartFrogException { + try { + stop(); + } catch (Exception e) { + throw SmartFrogException.forward("When stopping "+name,e); + } + } + + /** * Start the server * @throws SmartFrogException if the component failed to start */ Modified: trunk/core/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates/DelegateApplicationContext.java =================================================================== --- trunk/core/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates/DelegateApplicationContext.java 2007-10-12 15:43:18 UTC (rev 5262) +++ trunk/core/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates/DelegateApplicationContext.java 2007-10-12 15:44:21 UTC (rev 5263) @@ -20,12 +20,13 @@ package org.smartfrog.services.jetty.contexts.delegates; import org.mortbay.jetty.Server; -import org.mortbay.jetty.webapp.WebAppContext; +import org.mortbay.jetty.handler.ContextHandlerCollection; import org.mortbay.jetty.servlet.Context; import org.smartfrog.services.jetty.JettyImpl; import org.smartfrog.services.www.ApplicationServerContext; import org.smartfrog.sfcore.common.SmartFrogException; import org.smartfrog.sfcore.common.SmartFrogLivenessException; +import org.smartfrog.sfcore.common.SmartFrogLifecycleException; import java.rmi.RemoteException; @@ -58,7 +59,7 @@ /** * The actual context */ - private Context context; + protected Context context; /** @@ -106,7 +107,11 @@ */ public void start() throws SmartFrogException, RemoteException { if (context != null) { - getServer().getServer().addHandler(context); + ContextHandlerCollection contextHandler = getServerContextHandler(); + if(contextHandler==null) { + throw new SmartFrogLifecycleException("Cannot start "+this+" as the server is not yet deployed"); + } + contextHandler.addHandler(context); try { context.start(); } catch (RemoteException ex) { @@ -117,12 +122,25 @@ } } + protected Server getJettyServer() { + return getServer().getServer(); + } + + protected ContextHandlerCollection getServerContextHandler() { + + Server httpServer = getJettyServer(); + if(httpServer==null) { + return null; + } + return (ContextHandlerCollection) httpServer.getChildHandlerByClass(ContextHandlerCollection.class); + } + /** - * liveness check - * - * @throws SmartFrogLivenessException In case of liveness failure - * @throws RemoteException In case of network/rmi error - */ + * liveness check + * + * @throws SmartFrogLivenessException In case of liveness failure + * @throws RemoteException In case of network/rmi error + */ public void ping() throws SmartFrogLivenessException, RemoteException { if (context == null) { throw new SmartFrogLivenessException(ERROR_NULL_CONTEXT); @@ -145,9 +163,9 @@ public void terminate() throws RemoteException, SmartFrogException { if (context != null) { try { - Server httpServer = getServer().getServer(); - if (httpServer != null) { - httpServer.removeLifeCycle(context); + ContextHandlerCollection handlers= getServerContextHandler(); + if (handlers != null) { + handlers.removeHandler(context); } else { //do nothing, the server is not alive any more } Modified: trunk/core/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates/DelegateServletContext.java =================================================================== --- trunk/core/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates/DelegateServletContext.java 2007-10-12 15:43:18 UTC (rev 5262) +++ trunk/core/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates/DelegateServletContext.java 2007-10-12 15:44:21 UTC (rev 5263) @@ -21,14 +21,21 @@ import org.mortbay.jetty.Handler; import org.mortbay.jetty.MimeTypes; +import org.mortbay.jetty.handler.ResourceHandler; +import org.mortbay.jetty.handler.HandlerCollection; +import org.mortbay.jetty.handler.ContextHandlerCollection; import org.mortbay.jetty.servlet.Context; +import org.mortbay.jetty.servlet.ServletHandler; import org.smartfrog.services.jetty.JettyHelper; import org.smartfrog.services.jetty.JettyImpl; +import org.smartfrog.services.jetty.JettyToSFLifecycle; +import org.smartfrog.services.jetty.internal.ExtendedServletHandler; import org.smartfrog.services.www.ServletComponent; import org.smartfrog.services.www.ServletContextComponentDelegate; import org.smartfrog.services.www.ServletContextIntf; import org.smartfrog.services.www.WebApplicationHelper; import org.smartfrog.sfcore.common.SmartFrogException; +import org.smartfrog.sfcore.common.SmartFrogLifecycleException; import org.smartfrog.sfcore.logging.Log; import org.smartfrog.sfcore.logging.LogFactory; import org.smartfrog.sfcore.prim.Prim; @@ -47,7 +54,6 @@ private Reference contextPathRef = new Reference(ATTR_CONTEXT_PATH); private Reference resourceBaseRef = new Reference(ATTR_RESOURCE_BASE); - private Reference classPathRef = new Reference(ATTR_CLASSPATH); private String contextPath; private String resourceBase; private String absolutePath; @@ -55,13 +61,16 @@ * a log */ private Log log; + private ResourceHandler resources; + private HandlerCollection handlerSet; + private JettyToSFLifecycle<HandlerCollection> handlerLifecycle; /** * Get the context cast to a servlet context * @return the servlet context of jetty */ public final Context getServletContext() { - return (Context)getContext(); + return getContext(); } public DelegateServletContext(JettyImpl server, Context context) { @@ -80,8 +89,9 @@ public void deploy(Prim declaration) throws SmartFrogException, RemoteException { log = LogFactory.getOwnerLog(declaration); JettyHelper jettyHelper = new JettyHelper(declaration); - Context context = new Context(); - setContext(context); + + + jettyHelper.setServerComponent(getServer()); String jettyhome = jettyHelper.findJettyHome(); //context path attribute @@ -97,25 +107,80 @@ if (!new File(resourceBase).exists()) { resourceBase = jettyhome.concat(resourceBase); } - //classpath stuff. - //REVISIT: what does this bring to the table? -/* String classPath = declaration.sfResolve(classPathRef, (String) null, false); - if (classPath != null) { - if (!new File(classPath).exists()) { - classPath = jettyhome+classPath; - } - log.info("Jetty classpath="+classPath); - context.setClassPath(classPath); - }*/ + + //to get resources seen before the other bits of the tree, we patch the handlerSet. + Context context = new Context(null,null,null, new ExtendedServletHandler(), null); + setContext(context); + + handlerSet = new HandlerCollection(); + + resources = new ResourceHandler(); + resources.setResourceBase(resourceBase); + //configure the context - log.debug("Jetty resource base ="+resourceBase); + context.setContextPath(contextPath); context.setResourceBase(resourceBase); - log.debug("context path =" + contextPath); - context.setContextPath(contextPath); - //BUGBUG: this causes Jetty to throw an exception, as the context already has a handler. Somehow - //context.addHandler(new ResourceHandler()); + log.info("Deploying "+contextPath+" from "+resourceBase); + + //add the resources + handlerSet.addHandler(resources); + //then patch in the servlet context *afterwards* + handlerSet.addHandler(getContext()); + handlerLifecycle=new JettyToSFLifecycle<HandlerCollection>("handlers",handlerSet); } + + /** + * start: deploy this context + * + * @throws SmartFrogException In case of error while starting + * @throws RemoteException In case of network/rmi error + */ + @Override + public void start() throws SmartFrogException, RemoteException { + if (handlerSet != null) { + ContextHandlerCollection contextHandler = getServerContextHandler(); + if (contextHandler == null) { + throw new SmartFrogLifecycleException("Cannot start " + this + " as the server is not yet deployed"); + } + contextHandler.addHandler(handlerSet); + handlerLifecycle.start(); + } + } + + + /** + * undeploy a context. If the server is already stopped, this the undeployment is skipped without an error. The + * context field is set to null, to tell the system to skip this in future. + * + * @throws SmartFrogException SmartFrog problems + * @throws RemoteException In case of network/rmi error + */ + @Override + public void terminate() throws RemoteException, SmartFrogException { + if (handlerLifecycle != null) { + try { + handlerLifecycle.wrappedStop(); + ContextHandlerCollection handlers = getServerContextHandler(); + if (handlers != null) { + handlers.removeHandler(handlerSet); + } else { + //do nothing, the server is not alive any more + } +// } catch (IllegalStateException ex) { +// throw SmartFrogException.forward(ex); + } finally { + context = null; + handlerSet = null; + handlerLifecycle=null; + } + } + } + + public HandlerCollection getHandlers() { + return (HandlerCollection) getContext().getHandler(); + } + public String getAbsolutePath() { return absolutePath; } @@ -128,6 +193,16 @@ return contextPath; } + + protected HandlerCollection getHandlerSet() { + return handlerSet; + } + + + protected ResourceHandler getResources() { + return resources; + } + /** * Add a mime mapping * @@ -184,8 +259,7 @@ */ public void addHandler(Handler handler) throws SmartFrogException, RemoteException { - Context context = getServletContext(); - context.addHandler(handler); + getHandlers().addHandler(handler); } /** @@ -203,9 +277,8 @@ } catch (Exception ignore) { log.info(ignore); } - //TODO: remove the handler? - Context context = getServletContext(); - //context.removeHandler(handler); + //remove the handler + getHandlers().removeHandler(handler); } Added: trunk/core/components/jetty/src/org/smartfrog/services/jetty/internal/ExtendedServletHandler.java =================================================================== --- trunk/core/components/jetty/src/org/smartfrog/services/jetty/internal/ExtendedServletHandler.java (rev 0) +++ trunk/core/components/jetty/src/org/smartfrog/services/jetty/internal/ExtendedServletHandler.java 2007-10-12 15:44:21 UTC (rev 5263) @@ -0,0 +1,42 @@ +/** (C) Copyright 2007 Hewlett-Packard Development Company, LP + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +For more information: www.smartfrog.org + +*/ +package org.smartfrog.services.jetty.internal; + +import org.mortbay.jetty.servlet.ServletHandler; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * + * Created 12-Oct-2007 16:30:04 + * + */ + +public class ExtendedServletHandler extends ServletHandler { + + + /* ------------------------------------------------------------ */ + protected void notFound(HttpServletRequest request, HttpServletResponse response) throws IOException { + //this is a no-op! + //super.notFound(request, response); + } +} Added: trunk/core/components/jetty/src/org/smartfrog/services/jetty/internal/MimeResourceHandler.java =================================================================== --- trunk/core/components/jetty/src/org/smartfrog/services/jetty/internal/MimeResourceHandler.java (rev 0) +++ trunk/core/components/jetty/src/org/smartfrog/services/jetty/internal/MimeResourceHandler.java 2007-10-12 15:44:21 UTC (rev 5263) @@ -0,0 +1,42 @@ +/** (C) Copyright 2007 Hewlett-Packard Development Company, LP + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +For more information: www.smartfrog.org + +*/ +package org.smartfrog.services.jetty.internal; + +import org.mortbay.jetty.handler.ResourceHandler; +import org.mortbay.jetty.MimeTypes; + +/** + * + * Created 12-Oct-2007 16:14:35 + * + */ + +public class MimeResourceHandler extends ResourceHandler { + + + public MimeResourceHandler() { + } + + public MimeTypes getMimeTypes() { + // return super._mimeTypes; + return null; + } + +} Modified: trunk/core/components/jetty/src/org/smartfrog/services/jetty/jetty-core.sf =================================================================== --- trunk/core/components/jetty/src/org/smartfrog/services/jetty/jetty-core.sf 2007-10-12 15:43:18 UTC (rev 5262) +++ trunk/core/components/jetty/src/org/smartfrog/services/jetty/jetty-core.sf 2007-10-12 15:44:21 UTC (rev 5263) @@ -106,8 +106,8 @@ logPattern "yyyy_mm_dd.request.log"; //thread pool policy. - maxIdleTime 10000; - maxThreads 8; + maxIdleTime 100; + maxThreads 32; minThreads 4; //should the date header be sent in a response? @@ -135,9 +135,8 @@ * listeners listen on ports */ -JettySocketConnector extends ApplicationServerContext { - sfClass "org.smartfrog.services.jetty.listeners.JettySocketConnectorImpl"; - jettySocketConnectorSchema extends Schema { +AbstractConnector extends ApplicationServerContext { + connectorSchema extends Schema { port extends Integer; host extends OptionalString; name extends OptionalString; @@ -148,14 +147,31 @@ threads extends Integer; } + maxIdleTime CoreJettyServer:maxIdleTime; - //Jetty likes a match between the number of acceptors and the number of threads - threads CoreJettyServer:minThreads; port 8080; host "localhost"; } +/** + * a connector that opens a socket and listens to it. Each open socket consumes one thread. + */ +JettySocketConnector extends AbstractConnector { + sfClass "org.smartfrog.services.jetty.listeners.JettySocketConnectorImpl"; + jettySocketConnectorSchema extends Schema { + /** + * number of threads to accept requests + */ + threads extends Integer; + + } + //Jetty likes a match between the number of acceptors and the number of threads + //threads CoreJettyServer:minThreads; + threads 2; +} + + /** * here for backwards compatibility; connects up the port and host to the old definitions */ @@ -182,8 +198,14 @@ } keystoreType "JKS"; protocol "TLS"; - } +/** + * This connector uses Java's NIO APIs to handle incoming requests more efficently + */ + +JettySelectChannelConnector extends AbstractConnector { + sfClass "org.smartfrog.services.jetty.listeners.SelectChannelConnectorImpl"; +} Added: trunk/core/components/jetty/src/org/smartfrog/services/jetty/listeners/AbstractConnectorImpl.java =================================================================== --- trunk/core/components/jetty/src/org/smartfrog/services/jetty/listeners/AbstractConnectorImpl.java (rev 0) +++ trunk/core/components/jetty/src/org/smartfrog/services/jetty/listeners/AbstractConnectorImpl.java 2007-10-12 15:44:21 UTC (rev 5263) @@ -0,0 +1,120 @@ +/** (C) Copyright 2007 Hewlett-Packard Development Company, LP + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +For more information: www.smartfrog.org + +*/ +package org.smartfrog.services.jetty.listeners; + +import org.smartfrog.sfcore.prim.PrimImpl; +import org.smartfrog.sfcore.prim.TerminationRecord; +import org.smartfrog.sfcore.common.SmartFrogException; +import org.smartfrog.sfcore.common.SmartFrogDeploymentException; +import org.smartfrog.sfcore.common.SmartFrogResolutionException; +import org.smartfrog.sfcore.reference.Reference; +import org.smartfrog.services.jetty.JettyHelper; +import org.mortbay.jetty.Connector; + +import java.rmi.RemoteException; + +/** + * + * Created 11-Oct-2007 12:18:34 + * + */ + +public abstract class AbstractConnectorImpl extends PrimImpl { + protected Reference portRef = new Reference(JettyConnector.LISTENER_PORT); + protected Reference hostRef = new Reference(JettyConnector.SERVER_HOST); + protected Reference serverNameRef = new Reference(JettyConnector.SERVER_NAME); + protected Connector connector = null; + protected JettyHelper jettyHelper = new JettyHelper(this); + + + protected AbstractConnectorImpl() throws RemoteException { + } + + public Connector getConnector() { + return connector; + } + + /** + * sfStart: adds the SocketListener to the jetty server + * + * @throws SmartFrogException In case of error while starting + * @throws RemoteException In case of network/rmi error + */ + public synchronized void sfStart() throws SmartFrogException, RemoteException { + super.sfStart(); + try { + jettyHelper.bindToServer(); + bindConnector(); + } catch (Exception ex) { + throw SmartFrogDeploymentException.forward(ex); + } + } + + /** + * Termination phase + */ + public synchronized void sfTerminateWith(TerminationRecord status) { + jettyHelper.terminateConnector(connector); + super.sfTerminateWith(status); + } + + /** + * Create and configure the connector, then bind it to the http server + * + * @throws SmartFrogException In case of error while starting + * @throws RemoteException In case of network/rmi error + */ + protected void bindConnector() throws + SmartFrogException, RemoteException { + connector = createConnector(); + configureConnector(); + jettyHelper.addAndStartConnector(connector); + } + + protected abstract void configureConnector() throws SmartFrogException, RemoteException; + + protected abstract Connector createConnector() throws SmartFrogException, RemoteException; + + /** + * This method reads the port and host attributes, and sets the connector to it + * @param conn the connector + * @throws SmartFrogException In case of error while starting + * @throws RemoteException In case of network/rmi error + */ + protected void bindConnectorToPortAndHost(Connector conn) throws SmartFrogException, RemoteException { + //now bind to the host and port + int port = sfResolve(portRef, 0, true); + String host = sfResolve(hostRef, (String) null, false); + conn.setPort(port); + if (host != null) { + conn.setHost(host); + } + } + + /** + * Set the max idle time of this connector to that of {@link #ATTR_MAX_IDLE_TIME} + * @param connector + * @throws SmartFrogResolutionException + * @throws RemoteException + */ + protected void setMaxIdleTime(Connector connector) throws SmartFrogResolutionException, RemoteException { + connector.setMaxIdleTime(sfResolve(JettySocketConnector.ATTR_MAX_IDLE_TIME, 0, true)); + } +} Modified: trunk/core/components/jetty/src/org/smartfrog/services/jetty/listeners/JettySocketConnectorImpl.java =================================================================== --- trunk/core/components/jetty/src/org/smartfrog/services/jetty/listeners/JettySocketConnectorImpl.java 2007-10-12 15:43:18 UTC (rev 5262) +++ trunk/core/components/jetty/src/org/smartfrog/services/jetty/listeners/JettySocketConnectorImpl.java 2007-10-12 15:44:21 UTC (rev 5263) @@ -1,132 +1,90 @@ /** (C) Copyright 1998-2007 Hewlett-Packard Development Company, LP -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -For more information: www.smartfrog.org + For more information: www.smartfrog.org -*/ + */ package org.smartfrog.services.jetty.listeners; import org.mortbay.jetty.bio.SocketConnector; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.Connector; import org.mortbay.thread.BoundedThreadPool; -import org.smartfrog.services.jetty.JettyHelper; -import org.smartfrog.sfcore.common.SmartFrogDeploymentException; import org.smartfrog.sfcore.common.SmartFrogException; -import org.smartfrog.sfcore.prim.PrimImpl; -import org.smartfrog.sfcore.prim.TerminationRecord; -import org.smartfrog.sfcore.reference.Reference; +import org.smartfrog.sfcore.common.SmartFrogResolutionException; import java.rmi.RemoteException; /** * Socketlistner class for SocketListener for Jetty http server. + * * @author Ritu Sabharwal */ -public class JettySocketConnectorImpl extends PrimImpl implements JettySocketConnector { - private Reference listenerPortRef = new Reference(LISTENER_PORT); - private Reference serverHostRef = new Reference(SERVER_HOST); - private Reference serverNameRef = new Reference(SERVER_NAME); +public class JettySocketConnectorImpl extends AbstractConnectorImpl implements JettySocketConnector { - private SocketConnector connector = null; - - private JettyHelper jettyHelper = new JettyHelper(this); - /** * constructor + * * @throws RemoteException parent failure */ - public JettySocketConnectorImpl() throws RemoteException { - } + public JettySocketConnectorImpl() throws RemoteException { + } + public SocketConnector getSocketConnector() { + return (SocketConnector) connector; + } - /** - * sfStart: adds the SocketListener to the jetty server - * - * @exception SmartFrogException In case of error while starting - * @exception RemoteException In case of network/rmi error - */ - public synchronized void sfStart() throws SmartFrogException, RemoteException { - super.sfStart(); - try { - jettyHelper.bindToServer(); - bindConnector(); - } catch (Exception ex) { - throw SmartFrogDeploymentException.forward(ex); - } - } - /** - * Termination phase - */ - public synchronized void sfTerminateWith(TerminationRecord status) { - jettyHelper.terminateConnector(connector); - super.sfTerminateWith(status); - } - /** - * Create and configure the connector, then - * bind it to the http server - * @exception SmartFrogException In case of error while starting - * @exception RemoteException In case of network/rmi error + * Do any configuration. The base implementation sets up the acceptors and the max idle time, then binds the host + * and port. + * + * @throws SmartFrogException In case of error while starting + * @throws RemoteException In case of network/rmi error */ - protected void bindConnector() throws - SmartFrogException, RemoteException { - connector = createConnector(); - configureConnector(); - jettyHelper.addAndStartConnector(connector); - } - - /** - * Do any configuration. - * The base implementation sets up the acceptors and the max idle time, then binds the - * host and port. - * @exception SmartFrogException In case of error while starting - * @exception RemoteException In case of network/rmi error - */ protected void configureConnector() throws SmartFrogException, RemoteException { - //first, set up all the threads; + Server server = jettyHelper.getServer(); + // set up all the threads; int threads = sfResolve(ATTR_THREADS, 0, true); - BoundedThreadPool pool=new BoundedThreadPool(); + BoundedThreadPool pool = new BoundedThreadPool(); pool.setMinThreads(threads); pool.setMaxThreads(threads); - connector.setThreadPool(pool); - connector.setAcceptors(threads); - connector.setMaxIdleTime(sfResolve(ATTR_MAX_IDLE_TIME,0,true)); - - //now bind to the host and port - int port = sfResolve(listenerPortRef, 0, true); - String host = sfResolve(serverHostRef, (String)null, false); - connector.setPort(port); - if (host != null) { - connector.setHost(host); - } + SocketConnector socketConnector = getSocketConnector(); + socketConnector.setAcceptors(threads); + //connector.setThreadPool(pool); + //bind to the main thread pool + socketConnector.setThreadPool(server.getThreadPool()); + setMaxIdleTime(connector); + bindConnectorToPortAndHost(connector); } /** - * Override point: create a connector. - * Used in the {@link #bindConnector()} method; after creation - * it has its port and host set, then is bound to Jetty + * Override point: create a connector. Used in the {@link #bindConnector()} method; after creation it has its port + * and host set, then is bound to Jetty + * * @return a new connector (or subclass), with any config other than that done by the parent - * @exception SmartFrogException In case of error while starting - * @exception RemoteException In case of network/rmi error + * @throws SmartFrogException In case of error while starting + * @throws RemoteException In case of network/rmi error */ - protected SocketConnector createConnector() throws SmartFrogException, RemoteException { + @Override + protected Connector createConnector() throws SmartFrogException, RemoteException { return new SocketConnector(); } } Modified: trunk/core/components/jetty/src/org/smartfrog/services/jetty/listeners/SSLJettySocketConnectorImpl.java =================================================================== --- trunk/core/components/jetty/src/org/smartfrog/services/jetty/listeners/SSLJettySocketConnectorImpl.java 2007-10-12 15:43:18 UTC (rev 5262) +++ trunk/core/components/jetty/src/org/smartfrog/services/jetty/listeners/SSLJettySocketConnectorImpl.java 2007-10-12 15:44:21 UTC (rev 5263) @@ -21,6 +21,7 @@ import org.mortbay.jetty.bio.SocketConnector; import org.mortbay.jetty.security.SslSocketConnector; +import org.mortbay.jetty.Connector; import org.smartfrog.sfcore.common.SmartFrogException; import org.smartfrog.sfcore.prim.Prim; import org.smartfrog.services.filesystem.FileSystem; @@ -47,7 +48,7 @@ * @return an {@link SslSocketConnector} instance */ @Override - protected SocketConnector createConnector() throws SmartFrogException, RemoteException { + protected Connector createConnector() throws SmartFrogException, RemoteException { SslSocketConnector ssl = new SslSocketConnector(); String keystore = FileSystem.lookupAbsolutePath(this, ATTR_KEYSTORE, null, null, true, null); String keystoreType = sfResolve(ATTR_KEYSTORETYPE, "", true); Added: trunk/core/components/jetty/src/org/smartfrog/services/jetty/listeners/SelectChannelConnectorImpl.java =================================================================== --- trunk/core/components/jetty/src/org/smartfrog/services/jetty/listeners/SelectChannelConnectorImpl.java (rev 0) +++ trunk/core/components/jetty/src/org/smartfrog/services/jetty/listeners/SelectChannelConnectorImpl.java 2007-10-12 15:44:21 UTC (rev 5263) @@ -0,0 +1,54 @@ +/** (C) Copyright 2007 Hewlett-Packard Development Company, LP + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +For more information: www.smartfrog.org + +*/ +package org.smartfrog.services.jetty.listeners; + +import org.smartfrog.sfcore.common.SmartFrogException; +import org.mortbay.jetty.nio.SelectChannelConnector; +import org.mortbay.jetty.Connector; + +import java.rmi.RemoteException; + +/** + * Jetty6 has a new select channel connector; this is it + * Created 11-Oct-2007 12:14:08 + * + */ + +public class SelectChannelConnectorImpl extends AbstractConnectorImpl implements JettySocketConnector{ + + + + public SelectChannelConnectorImpl() throws RemoteException { + } + + public SelectChannelConnector getSelectChannelConnector() { + return (SelectChannelConnector) getConnector(); + } + + protected void configureConnector() throws SmartFrogException, RemoteException { + SelectChannelConnector selectChannelConnector = getSelectChannelConnector(); + setMaxIdleTime(selectChannelConnector); + bindConnectorToPortAndHost(selectChannelConnector); + } + + protected Connector createConnector() throws SmartFrogException, RemoteException { + return new SelectChannelConnector(); + } +} Modified: trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/components.sf =================================================================== --- trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/components.sf 2007-10-12 15:43:18 UTC (rev 5262) +++ trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/components.sf 2007-10-12 15:44:21 UTC (rev 5263) @@ -55,9 +55,9 @@ server LAZY PARENT:server; } - tempDir extends TempDirWithCleanup { - prefix "jetty"; - } + tempDir extends TempDirWithCleanup { + prefix "jetty"; + } tempDirServletContext extends TempDirServletContext { resourceBase LAZY tempDir:absolutePath; @@ -83,6 +83,6 @@ JettyTestCompound extends TestCompound { - testTimeout 20000; + testTimeout test.timeout; } Modified: trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/tcp19test.sf =================================================================== --- trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/tcp19test.sf 2007-10-12 15:43:18 UTC (rev 5262) +++ trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/tcp19test.sf 2007-10-12 15:44:21 UTC (rev 5263) @@ -29,10 +29,12 @@ action extends tcp19; - + //we dont care which number comes back, only that we get a number tests extends Sequence { wait extends waitForPage { port tcp19:port; + condition:maximumResponseCode 404; + condition:minimumResponseCode 200; } } Modified: trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/tcp20.sf =================================================================== --- trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/tcp20.sf 2007-10-12 15:43:18 UTC (rev 5262) +++ trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/tcp20.sf 2007-10-12 15:44:21 UTC (rev 5263) @@ -33,4 +33,5 @@ } } + sfConfig extends tcp20; Modified: trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/local_test_jetty_server.sf =================================================================== --- trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/local_test_jetty_server.sf 2007-10-12 15:43:18 UTC (rev 5262) +++ trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/local_test_jetty_server.sf 2007-10-12 15:44:21 UTC (rev 5263) @@ -20,10 +20,12 @@ #include "/org/smartfrog/services/jetty/components.sf"; #include "/org/smartfrog/services/www/jetty/test/system/ports.sf" +#include "/org/smartfrog/services/www/webapplication.sf" +#include "/org/smartfrog/services/assertions/components.sf" LocalJettyServer extends Compound { - + sfSyncTerminate true; port test.jetty.port.1; jettyhome test.jetty.home; @@ -44,5 +46,13 @@ port PARENT:port; } + sleep extends Delay { + + //short pause + delay test.liveness.delay ; + + action extends Compound { + } + } } Modified: trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/ports.sf =================================================================== --- trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/ports.sf 2007-10-12 15:43:18 UTC (rev 5262) +++ trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/ports.sf 2007-10-12 15:44:21 UTC (rev 5263) @@ -35,6 +35,14 @@ resourcebase LAZY PROPERTY java.io.tmpdir; -waitForTimeout 10000; +test.timeout 10000; + +test.waitForTimeout 5000; + +waitForTimeout test.waitForTimeout; //interval in ms between checks -waitForInterval 200; \ No newline at end of file +waitForInterval 200; + +test.liveness.delay 1000; + +test.testwar.war PROPERTY test.testwar.war; \ No newline at end of file Modified: trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/testLivenessError.sf =================================================================== --- trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/testLivenessError.sf 2007-10-12 15:43:18 UTC (rev 5262) +++ trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/testLivenessError.sf 2007-10-12 15:44:21 UTC (rev 5263) @@ -18,33 +18,26 @@ */ -#include "/org/smartfrog/services/www/webapplication.sf" -#include "/org/smartfrog/services/www/servers/testwar.sf" -#include "/org/smartfrog/services/jetty/components.sf"; -#include "/org/smartfrog/services/www/jetty/test/system/local_test_jetty_server.sf" -#include "/org/smartfrog/services/www/jetty/test/system/ports.sf" -sfConfig extends Compound { +#include "/org/smartfrog/services/www/jetty/test/system/testwar.sf" - //this is set in the test run - testwar extends TestWar; +sfConfig extends TestWarServer { - server extends LocalJettyServer { - port test.jetty.port.1; - } - deployedWar extends WebApplication { - server LAZY PARENT:server:jettyServer; - filename LAZY testwar:absolutePath; - contextPath "testwar"; - } +sleep extends Delay { - ping extends LivenessPage { - host LAZY server:listener:ipaddr; - port server:port; - page "testwar/error"; - checkFrequency 1; - queries [["status",419]]; + //short pause + delay test.liveness.delay; + + //normally you'd use the broken up attributes, but here we test the full URL + action extends LivenessPage { + host LAZY server:listener:ipaddr; + port server:port; + page "testwar/error"; + checkFrequency 1; + queries [["status",419]]; + } } + } \ No newline at end of file Modified: trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/testLivenessNoHost.sf =================================================================== --- trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/testLivenessNoHost.sf 2007-10-12 15:43:18 UTC (rev 5262) +++ trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/testLivenessNoHost.sf 2007-10-12 15:44:21 UTC (rev 5263) @@ -18,18 +18,15 @@ */ -#include "/org/smartfrog/services/www/webapplication.sf" -#include "/org/smartfrog/services/jetty/components.sf"; #include "/org/smartfrog/services/www/jetty/test/system/local_test_jetty_server.sf" -#include "/org/smartfrog/services/www/jetty/test/system/ports.sf" sfConfig extends Compound { ping extends LivenessPage { - host "no-such-host"; - port test.jetty.port.1; - page "/"; - checkFrequency 1; + host "no-such-host"; + port test.jetty.port.1; + page "/"; + checkFrequency 1; } } \ No newline at end of file Modified: trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/testLivenessURL.sf =================================================================== --- trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/testLivenessURL.sf 2007-10-12 15:43:18 UTC (rev 5262) +++ trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/testLivenessURL.sf 2007-10-12 15:44:21 UTC (rev 5263) @@ -18,39 +18,21 @@ */ -#include "/org/smartfrog/services/www/webapplication.sf" -#include "/org/smartfrog/services/www/servers/testwar.sf" -#include "/org/smartfrog/services/jetty/components.sf"; + #include "/org/smartfrog/services/www/jetty/test/system/testwar.sf" -#include "/org/smartfrog/services/www/jetty/test/system/local_test_jetty_server.sf" -#include "/org/smartfrog/services/www/jetty/test/system/ports.sf" -sfConfig extends Compound { - testwar extends TestWar; +sfConfig extends LocalJettyServer { - port test.jetty.port.1; - home test.jetty.home ; + sleep extends Delay { - /* - this is the jetty server itself - */ - server extends CoreJettyServer { + //short pause + delay test.liveness.delay; - jettyhome PARENT:home; - - port PARENT:port; - - } - - listener extends JettySocketConnector { - server LAZY PARENT:server; - } - //normally you'd use the broken up attributes, but here we test the full URL - ping extends LivenessPage { + action extends LivenessPage { url ( "http://localhost:/" ++ test.jetty.port.1 ++ "/"); minimumResponseCode 404; maximumResponseCode 404; + } } - -} \ No newline at end of file +} Modified: trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/testNestedWar.sf =================================================================== --- trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/testNestedWar.sf 2007-10-12 15:43:18 UTC (rev 5262) +++ trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/testNestedWar.sf 2007-10-12 15:44:21 UTC (rev 5263) @@ -18,11 +18,7 @@ */ -#include "/org/smartfrog/services/www/webapplication.sf" -#include "/org/smartfrog/services/jetty/components.sf"; -#include "/org/smartfrog/services/www/servers/testwar.sf" -#include "/org/smartfrog/services/www/jetty/test/system/local_test_jetty_server.sf" -#include "/org/smartfrog/services/www/jetty/test/system/ports.sf" +#include "/org/smartfrog/services/www/jetty/test/system/testwar.sf" sfConfig extends Compound { sfSyncTerminate true; @@ -46,9 +42,9 @@ } deployedWar extends WebApplication { - server LAZY PARENT:server; - filename LAZY testwar:absolutePath; - contextPath "testwar"; + server LAZY PARENT:server; + filename LAZY testwar:absolutePath; + contextPath "testwar"; } Modified: trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/testWarDeployed.sf =================================================================== --- trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/testWarDeployed.sf 2007-10-12 15:43:18 UTC (rev 5262) +++ trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/testWarDeployed.sf 2007-10-12 15:44:21 UTC (rev 5263) @@ -18,31 +18,24 @@ */ -#include "/org/smartfrog/services/www/webapplication.sf" -#include "/org/smartfrog/services/jetty/components.sf"; -#include "/org/smartfrog/services/www/servers/testwar.sf" #include "/org/smartfrog/services/www/jetty/test/system/local_test_jetty_server.sf" -sfConfig extends Compound { +sfConfig extends TestWarServer { - //this is set in the test run - testwar extends TestWar; + sleep extends Delay { - server extends LocalJettyServer; + //short pause + delay test.liveness.delay ; - deployedWar extends WebApplication { - server LAZY PARENT:server:server; - filename LAZY testwar:absolutePath; - contextPath "testwar"; + action extends LivenessPage { + enabled false; + host LAZY server:listener:ipaddr; + port server:port; + page LAZY deployedWar:absolutePath; + checkFrequency 1; + followRedirects true; + } } - ping extends LivenessPage { - host LAZY server:listener:ipaddr; - port server:port; - page LAZY deployedWar:absolutePath; - checkFrequency 1; - followRedirects true; - } - } \ No newline at end of file Modified: trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/testwar.sf =================================================================== --- trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/testwar.sf 2007-10-12 15:43:18 UTC (rev 5262) +++ trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/testwar.sf 2007-10-12 15:44:21 UTC (rev 5263) @@ -30,6 +30,45 @@ */ -#include "/org/smartfrog/services/www/servers/testwar.sf" +#include "/org/smartfrog/services/www/jetty/test/system/local_test_jetty_server.sf" +#include "/org/smartfrog/services/filesystem/file.sf" + //the war file must be present + TestWar extends FileMustExist { + filename PROPERTY test.testwar.war; + } + + +TestWarServer extends LocalJettyServer { + + testwar extends TestWar; + + deployedWar extends WebApplication { + server LAZY PARENT:server; + filename LAZY testwar:absolutePath; + contextPath "testwar"; + } +} + + + +sfConfig extends TestWarServer { + + +sleep extends Delay { + + //short pause + delay test.liveness.delay; + + //normally you'd use the broken up attributes, but here we test the full URL + action extends LivenessPage { + host LAZY server:listener:ipaddr; + port server:port; + page "testwar/error"; + checkFrequency 1; + queries [["status",419]]; + } + } + + Modified: trunk/core/components/libraries.properties =================================================================== --- trunk/core/components/libraries.properties 2007-10-12 15:43:18 UTC (rev 5262) +++ trunk/core/components/libraries.properties 2007-10-12 15:44:21 UTC (rev 5263) @@ -49,6 +49,7 @@ rome.version=0.9 quartz.version=1.5.2 servletapi.version=2.5 +slf4j.version=1.4.3 smack.version=2.2.1 stax.version=1.2.0 stax-api.version=1.0.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |