From: <st...@us...> - 2006-10-16 16:59:22
|
Revision: 3485 http://svn.sourceforge.net/smartfrog/?rev=3485&view=rev Author: steve_l Date: 2006-10-16 09:58:18 -0700 (Mon, 16 Oct 2006) Log Message: ----------- Added Paths: ----------- trunk/core/antbuild/.svnignore trunk/core/components/ant/.svnignore trunk/core/components/anubis/.svnignore trunk/core/components/cargo/.svnignore trunk/core/components/database/.svnignore trunk/core/components/deployapi/.svnignore trunk/core/components/fun/.svnignore trunk/core/components/jetty/.svnignore trunk/core/components/junit/.svnignore trunk/core/components/loggingservices/.svnignore trunk/core/components/scripting/.svnignore trunk/core/components/sfinstaller/.svnignore trunk/core/components/tomcat/.svnignore trunk/core/components/www/.svnignore trunk/core/components/xml/.svnignore trunk/core/components/xmpp/.svnignore Removed Paths: ------------- trunk/core/antbuild/.cvsignore trunk/core/components/ant/.cvsignore trunk/core/components/anubis/.cvsignore trunk/core/components/cargo/.cvsignore trunk/core/components/database/.cvsignore trunk/core/components/deployapi/.cvsignore trunk/core/components/fun/.cvsignore trunk/core/components/jetty/.cvsignore trunk/core/components/junit/.cvsignore trunk/core/components/loggingservices/.cvsignore trunk/core/components/scripting/.cvsignore trunk/core/components/sfinstaller/.cvsignore trunk/core/components/tomcat/.cvsignore trunk/core/components/www/.cvsignore trunk/core/components/xml/.cvsignore Deleted: trunk/core/antbuild/.cvsignore =================================================================== --- trunk/core/antbuild/.cvsignore 2006-10-16 16:57:40 UTC (rev 3484) +++ trunk/core/antbuild/.cvsignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -1 +0,0 @@ -*.iml Copied: trunk/core/antbuild/.svnignore (from rev 3465, trunk/core/antbuild/.cvsignore) =================================================================== --- trunk/core/antbuild/.svnignore (rev 0) +++ trunk/core/antbuild/.svnignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -0,0 +1 @@ +*.iml Property changes on: trunk/core/antbuild/.svnignore ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: trunk/core/components/ant/.cvsignore =================================================================== --- trunk/core/components/ant/.cvsignore 2006-10-16 16:57:40 UTC (rev 3484) +++ trunk/core/components/ant/.cvsignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -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 Copied: trunk/core/components/ant/.svnignore (from rev 3465, trunk/core/components/ant/.cvsignore) =================================================================== --- trunk/core/components/ant/.svnignore (rev 0) +++ trunk/core/components/ant/.svnignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -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 Property changes on: trunk/core/components/ant/.svnignore ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: trunk/core/components/anubis/.cvsignore =================================================================== --- trunk/core/components/anubis/.cvsignore 2006-10-16 16:57:40 UTC (rev 3484) +++ trunk/core/components/anubis/.cvsignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -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/anubis/.svnignore (from rev 3465, trunk/core/components/anubis/.cvsignore) =================================================================== --- trunk/core/components/anubis/.svnignore (rev 0) +++ trunk/core/components/anubis/.svnignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -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/anubis/.svnignore ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: trunk/core/components/cargo/.cvsignore =================================================================== --- trunk/core/components/cargo/.cvsignore 2006-10-16 16:57:40 UTC (rev 3484) +++ trunk/core/components/cargo/.cvsignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -1,13 +0,0 @@ -build -dist -build.properties -runtime.properties -common.properties -*.jpx -*.ipr -*.iml -*.iws -.classpath -.project -lib -version.properties Copied: trunk/core/components/cargo/.svnignore (from rev 3465, trunk/core/components/cargo/.cvsignore) =================================================================== --- trunk/core/components/cargo/.svnignore (rev 0) +++ trunk/core/components/cargo/.svnignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -0,0 +1,13 @@ +build +dist +build.properties +runtime.properties +common.properties +*.jpx +*.ipr +*.iml +*.iws +.classpath +.project +lib +version.properties Property changes on: trunk/core/components/cargo/.svnignore ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: trunk/core/components/database/.cvsignore =================================================================== --- trunk/core/components/database/.cvsignore 2006-10-16 16:57:40 UTC (rev 3484) +++ trunk/core/components/database/.cvsignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -1,3 +0,0 @@ -build -dist -*.iml \ No newline at end of file Copied: trunk/core/components/database/.svnignore (from rev 3465, trunk/core/components/database/.cvsignore) =================================================================== --- trunk/core/components/database/.svnignore (rev 0) +++ trunk/core/components/database/.svnignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -0,0 +1,3 @@ +build +dist +*.iml \ No newline at end of file Property changes on: trunk/core/components/database/.svnignore ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: trunk/core/components/deployapi/.cvsignore =================================================================== --- trunk/core/components/deployapi/.cvsignore 2006-10-16 16:57:40 UTC (rev 3484) +++ trunk/core/components/deployapi/.cvsignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -1,13 +0,0 @@ -build -dist -build.properties -runtime.properties -common.properties -*.jpx -*.ipr -*.iml -*.iws -.classpath -.project -lib - Copied: trunk/core/components/deployapi/.svnignore (from rev 3465, trunk/core/components/deployapi/.cvsignore) =================================================================== --- trunk/core/components/deployapi/.svnignore (rev 0) +++ trunk/core/components/deployapi/.svnignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -0,0 +1,13 @@ +build +dist +build.properties +runtime.properties +common.properties +*.jpx +*.ipr +*.iml +*.iws +.classpath +.project +lib + Property changes on: trunk/core/components/deployapi/.svnignore ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: trunk/core/components/fun/.cvsignore =================================================================== --- trunk/core/components/fun/.cvsignore 2006-10-16 16:57:40 UTC (rev 3484) +++ trunk/core/components/fun/.cvsignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -1,15 +0,0 @@ -build -dist -releases -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/fun/.svnignore (from rev 3465, trunk/core/components/fun/.cvsignore) =================================================================== --- trunk/core/components/fun/.svnignore (rev 0) +++ trunk/core/components/fun/.svnignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -0,0 +1,15 @@ +build +dist +releases +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/fun/.svnignore ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: trunk/core/components/jetty/.cvsignore =================================================================== --- trunk/core/components/jetty/.cvsignore 2006-10-16 16:57:40 UTC (rev 3484) +++ trunk/core/components/jetty/.cvsignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -1,4 +0,0 @@ -jetty.iml -build -dist -version.properties Copied: trunk/core/components/jetty/.svnignore (from rev 3465, trunk/core/components/jetty/.cvsignore) =================================================================== --- trunk/core/components/jetty/.svnignore (rev 0) +++ trunk/core/components/jetty/.svnignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -0,0 +1,4 @@ +jetty.iml +build +dist +version.properties Property changes on: trunk/core/components/jetty/.svnignore ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: trunk/core/components/junit/.cvsignore =================================================================== --- trunk/core/components/junit/.cvsignore 2006-10-16 16:57:40 UTC (rev 3484) +++ trunk/core/components/junit/.cvsignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -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/junit/.svnignore (from rev 3465, trunk/core/components/junit/.cvsignore) =================================================================== --- trunk/core/components/junit/.svnignore (rev 0) +++ trunk/core/components/junit/.svnignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -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/junit/.svnignore ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: trunk/core/components/loggingservices/.cvsignore =================================================================== --- trunk/core/components/loggingservices/.cvsignore 2006-10-16 16:57:40 UTC (rev 3484) +++ trunk/core/components/loggingservices/.cvsignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -1,14 +0,0 @@ -build -dist -build.properties -runtime.properties -common.properties -*.jpx -*.ipr -*.iml -*.iws -.classpath -.project - - -version.properties Copied: trunk/core/components/loggingservices/.svnignore (from rev 3465, trunk/core/components/loggingservices/.cvsignore) =================================================================== --- trunk/core/components/loggingservices/.svnignore (rev 0) +++ trunk/core/components/loggingservices/.svnignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -0,0 +1,14 @@ +build +dist +build.properties +runtime.properties +common.properties +*.jpx +*.ipr +*.iml +*.iws +.classpath +.project + + +version.properties Property changes on: trunk/core/components/loggingservices/.svnignore ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: trunk/core/components/scripting/.cvsignore =================================================================== --- trunk/core/components/scripting/.cvsignore 2006-10-16 16:57:40 UTC (rev 3484) +++ trunk/core/components/scripting/.cvsignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -1,14 +0,0 @@ -build -dist -build.properties -runtime.properties -common.properties -*.jpx -*.ipr -*.iml -*.iws -.classpath -.project - - -version.properties Copied: trunk/core/components/scripting/.svnignore (from rev 3465, trunk/core/components/scripting/.cvsignore) =================================================================== --- trunk/core/components/scripting/.svnignore (rev 0) +++ trunk/core/components/scripting/.svnignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -0,0 +1,14 @@ +build +dist +build.properties +runtime.properties +common.properties +*.jpx +*.ipr +*.iml +*.iws +.classpath +.project + + +version.properties Property changes on: trunk/core/components/scripting/.svnignore ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: trunk/core/components/sfinstaller/.cvsignore =================================================================== --- trunk/core/components/sfinstaller/.cvsignore 2006-10-16 16:57:40 UTC (rev 3484) +++ trunk/core/components/sfinstaller/.cvsignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -1,14 +0,0 @@ -build -dist -build.properties -runtime.properties -common.properties -*.jpx -*.ipr -*.iml -*.iws -.classpath -.project - - -version.properties Copied: trunk/core/components/sfinstaller/.svnignore (from rev 3465, trunk/core/components/sfinstaller/.cvsignore) =================================================================== --- trunk/core/components/sfinstaller/.svnignore (rev 0) +++ trunk/core/components/sfinstaller/.svnignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -0,0 +1,14 @@ +build +dist +build.properties +runtime.properties +common.properties +*.jpx +*.ipr +*.iml +*.iws +.classpath +.project + + +version.properties Property changes on: trunk/core/components/sfinstaller/.svnignore ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: trunk/core/components/tomcat/.cvsignore =================================================================== --- trunk/core/components/tomcat/.cvsignore 2006-10-16 16:57:40 UTC (rev 3484) +++ trunk/core/components/tomcat/.cvsignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -1,3 +0,0 @@ -build -*.iml -dist Copied: trunk/core/components/tomcat/.svnignore (from rev 3465, trunk/core/components/tomcat/.cvsignore) =================================================================== --- trunk/core/components/tomcat/.svnignore (rev 0) +++ trunk/core/components/tomcat/.svnignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -0,0 +1,3 @@ +build +*.iml +dist Property changes on: trunk/core/components/tomcat/.svnignore ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: trunk/core/components/www/.cvsignore =================================================================== --- trunk/core/components/www/.cvsignore 2006-10-16 16:57:40 UTC (rev 3484) +++ trunk/core/components/www/.cvsignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -1,4 +0,0 @@ -build -dist -*.iml -version.properties Copied: trunk/core/components/www/.svnignore (from rev 3465, trunk/core/components/www/.cvsignore) =================================================================== --- trunk/core/components/www/.svnignore (rev 0) +++ trunk/core/components/www/.svnignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -0,0 +1,4 @@ +build +dist +*.iml +version.properties Property changes on: trunk/core/components/www/.svnignore ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: trunk/core/components/xml/.cvsignore =================================================================== --- trunk/core/components/xml/.cvsignore 2006-10-16 16:57:40 UTC (rev 3484) +++ trunk/core/components/xml/.cvsignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -1,13 +0,0 @@ -build -dist -releases -version.properties -build.properties -runtime.properties -common.properties -*.jpx -*.ipr -*.iml -*.iws -.classpath -.project \ No newline at end of file Copied: trunk/core/components/xml/.svnignore (from rev 3465, trunk/core/components/xml/.cvsignore) =================================================================== --- trunk/core/components/xml/.svnignore (rev 0) +++ trunk/core/components/xml/.svnignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -0,0 +1,13 @@ +build +dist +releases +version.properties +build.properties +runtime.properties +common.properties +*.jpx +*.ipr +*.iml +*.iws +.classpath +.project \ No newline at end of file Property changes on: trunk/core/components/xml/.svnignore ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Added: trunk/core/components/xmpp/.svnignore =================================================================== --- trunk/core/components/xmpp/.svnignore (rev 0) +++ trunk/core/components/xmpp/.svnignore 2006-10-16 16:58:18 UTC (rev 3485) @@ -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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2006-10-20 16:30:56
|
Revision: 3504 http://svn.sourceforge.net/smartfrog/?rev=3504&view=rev Author: steve_l Date: 2006-10-20 09:29:06 -0700 (Fri, 20 Oct 2006) Log Message: ----------- Bringing us into compliance with the ASF license, that says we should include the ASF license reference with other copyright info Added Paths: ----------- trunk/core/components/database/doc/ trunk/core/components/database/doc/COPYRIGHT.txt trunk/core/components/fun/doc/ trunk/core/components/fun/doc/COPYRIGHT.txt trunk/core/extras/wrapper/doc/COPYRIGHT.txt Added: trunk/core/components/database/doc/COPYRIGHT.txt =================================================================== --- trunk/core/components/database/doc/COPYRIGHT.txt (rev 0) +++ trunk/core/components/database/doc/COPYRIGHT.txt 2006-10-20 16:29:06 UTC (rev 3504) @@ -0,0 +1,56 @@ +(C) Copyright 2006 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. + + +============================== + + +Some parts of this project are dervied from software +produced by the Apache Software Foundation, for which the following +copyright terms apply: + +Copyright 2000-2005 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. + +File to which this apply are: +org.smartfrog.services.database.core.TransactionImpl + + Property changes on: trunk/core/components/database/doc/COPYRIGHT.txt ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/core/components/fun/doc/COPYRIGHT.txt =================================================================== --- trunk/core/components/fun/doc/COPYRIGHT.txt (rev 0) +++ trunk/core/components/fun/doc/COPYRIGHT.txt 2006-10-20 16:29:06 UTC (rev 3504) @@ -0,0 +1,56 @@ +(C) Copyright 2006 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. + + +============================== + + +Some parts of this project are dervied from software +produced by the Apache Software Foundation, for which the following +copyright terms apply: + +Copyright 2000-2002,2004-2005 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. + +File to which this apply are: +org.smartfrog.services.fun.sound.SoundPlayerImpl + + Property changes on: trunk/core/components/fun/doc/COPYRIGHT.txt ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/core/extras/wrapper/doc/COPYRIGHT.txt =================================================================== --- trunk/core/extras/wrapper/doc/COPYRIGHT.txt (rev 0) +++ trunk/core/extras/wrapper/doc/COPYRIGHT.txt 2006-10-20 16:29:06 UTC (rev 3504) @@ -0,0 +1,60 @@ +(C) Copyright 2006 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. + + +============================== + + +Some parts of this project are dervied from software +produced by the Apache Software Foundation, for which the following +copyright terms apply: + +Copyright 2003-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. + +File to which this apply are: + +org.smartfrog.extras.wrapper.Launcher +org.smartfrog.extras.wrapper.LaunchException +org.smartfrog.extras.wrapper.Locator + + + Property changes on: trunk/core/extras/wrapper/doc/COPYRIGHT.txt ___________________________________________________________________ Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2006-10-24 14:26:47
|
Revision: 3515 http://svn.sourceforge.net/smartfrog/?rev=3515&view=rev Author: julgui Date: 2006-10-24 07:26:20 -0700 (Tue, 24 Oct 2006) Log Message: ----------- New method in SFProcess.java to centralize all InetAddress.getLocalHost() calls. SFProcess.sfDeployedHost() SFOS-17 Modified Paths: -------------- trunk/core/smartfrog/src/org/smartfrog/services/display/Display.java trunk/core/smartfrog/src/org/smartfrog/services/display/SFDisplay.java trunk/core/smartfrog/src/org/smartfrog/services/trace/SFTrace.java trunk/core/smartfrog/src/org/smartfrog/services/utils/logtofile/SFLogToFile.java trunk/core/smartfrog/src/org/smartfrog/sfcore/common/Diagnostics.java trunk/core/smartfrog/src/org/smartfrog/sfcore/logging/LogToFileImpl.java trunk/core/smartfrog/src/org/smartfrog/sfcore/prim/PrimImpl.java trunk/core/smartfrog/src/org/smartfrog/sfcore/processcompound/DefaultRootLocatorImpl.java trunk/core/smartfrog/src/org/smartfrog/sfcore/processcompound/SFProcess.java trunk/core/testharness/testcases/org/smartfrog/test/process/DaemonTest.java trunk/core/testharness/testcases/org/smartfrog/test/system/components/scripting/ScriptingTest.java trunk/core/testharness/testcases/org/smartfrog/test/unit/net/BasicNetworkingTest.java Modified: trunk/core/smartfrog/src/org/smartfrog/services/display/Display.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/display/Display.java 2006-10-24 10:10:55 UTC (rev 3514) +++ trunk/core/smartfrog/src/org/smartfrog/services/display/Display.java 2006-10-24 14:26:20 UTC (rev 3515) @@ -76,6 +76,9 @@ import java.awt.Image; +import java.rmi.RemoteException; + + /** * Multiuse Simple display object. It is possible to start / stop the data * producer. @@ -358,8 +361,7 @@ public void actionPerformed(ActionEvent evt) { - String message = "timer..." + - fmt.format(new Date()); + String message = "timer..." + fmt.format(new Date()); System.out.println("Stdout:" + message); } }); @@ -971,7 +973,7 @@ out.println("* User Work Dir: " + System.getProperty("user.dir")); try { - java.net.InetAddress localhost = java.net.InetAddress.getLocalHost(); + java.net.InetAddress localhost = SFProcess.sfDeployedHost();; out.println("* LocalHost Name: " + localhost.getHostName()); out.println("* LocalHost Add: " + localhost.getHostAddress()); @@ -1058,30 +1060,31 @@ } //End option dialog int port = 3800; - String hostName = "localhost"; + String hostName = null; + try { + hostName = SFProcess.getProcessCompound().sfDeployedHost().getCanonicalHostName(); + } catch (RemoteException e) { + hostName =""; //Ignored. + } + //New option dialgog hostName = modalOptionDialog("Management Console for ...", "HostName: ", hostName); if (hostName == null) return; try { - java.net.InetAddress.getByName(hostName); - SFProcess.getRootLocator().getRootProcessCompound( - java.net.InetAddress.getByName(hostName) - , port).sfContext(); + java.net.InetAddress.getByName(hostName); + SFProcess.getRootLocator().getRootProcessCompound(java.net.InetAddress.getByName(hostName), port); } catch (java.net.UnknownHostException uex) { this.modalErrorDialog("startMngConsole", "Couldn't start SFMngConsole for resource " + hostName + ". Unknown host."); return; } catch (java.rmi.ConnectException cex) { - this.modalErrorDialog("startMngConsole", - "Couldn't start SFMngConsole for resource " + hostName + ". " + - cex.getMessage()); + this.modalErrorDialog("startMngConsole", "Couldn't start SFMngConsole for resource " + hostName + ". " + cex.getMessage()); return; } catch (Exception e) { - this.modalErrorDialog("startMngConsole", - "Couldn't start SFMngConsole for resource " + hostName); + this.modalErrorDialog("startMngConsole", "Couldn't start SFMngConsole for resource " + hostName); return; } @@ -1099,8 +1102,7 @@ } String nameDisplay = "sfManagementConsole "; mngConsole = org.smartfrog.services.management.SFDeployDisplay. - startConsole(nameDisplay, height, width, positionDisplay, showRootProcess, showCDasChild, hostName, - port, false); + startConsole(nameDisplay, height, width, positionDisplay, showRootProcess, showCDasChild, hostName, port, false); } catch (java.net.UnknownHostException uex) { if (mngConsole != null) { mngConsole.dispose(); Modified: trunk/core/smartfrog/src/org/smartfrog/services/display/SFDisplay.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/display/SFDisplay.java 2006-10-24 10:10:55 UTC (rev 3514) +++ trunk/core/smartfrog/src/org/smartfrog/services/display/SFDisplay.java 2006-10-24 14:26:20 UTC (rev 3515) @@ -29,6 +29,7 @@ import java.rmi.RemoteException; import java.text.SimpleDateFormat; import java.util.Date; +import java.net.InetAddress; import javax.swing.Timer; @@ -39,12 +40,12 @@ import org.smartfrog.sfcore.prim.Prim; import org.smartfrog.sfcore.prim.PrimImpl; import org.smartfrog.sfcore.prim.TerminationRecord; +import org.smartfrog.sfcore.processcompound.SFProcess; /** * Implements PrintMsgInt interface and prints the message remotely. */ -public class SFDisplay extends PrimImpl implements Prim, PrintMsgInt, - PrintErrMsgInt { +public class SFDisplay extends PrimImpl implements Prim, PrintMsgInt, PrintErrMsgInt { /** String name for attribute autoClean. */ private static final String AUTO_CLEAN = "autoClean"; /** String name for attribute cleanEveryNumSec. */ @@ -164,8 +165,7 @@ // read components attributes readSFAttributes(); if (showIP) { - String hostName = (java.net.InetAddress.getLocalHost()). - toString(); + InetAddress hostName = SFProcess.sfDeployedHost(); nameDisplay = nameDisplay + " [" + hostName + "]"; nameDisplay = nameDisplay.replace('\\', '_'); nameDisplay = nameDisplay.replace('/', '_'); Modified: trunk/core/smartfrog/src/org/smartfrog/services/trace/SFTrace.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/trace/SFTrace.java 2006-10-24 10:10:55 UTC (rev 3514) +++ trunk/core/smartfrog/src/org/smartfrog/services/trace/SFTrace.java 2006-10-24 14:26:20 UTC (rev 3515) @@ -94,11 +94,10 @@ try { try { - localhost = java.net.InetAddress.getLocalHost(); + localhost = SFProcess.getProcessCompound().sfDeployedHost(); } catch (Exception ex) { if (log.isErrorEnabled()) { - log.error("sfTrace: Exception deployment: " + - ex.toString(),ex); + log.error("sfTrace: Exception deployment: " + ex.toString(),ex); } } @@ -108,8 +107,7 @@ .toString(); } catch (Exception ex) { if (log.isErrorEnabled()) { - log.error("sfTrace: Exception deployment:" + - ex.toString(),ex); + log.error("sfTrace: Exception deployment:" + ex.toString(),ex); } } @@ -117,8 +115,7 @@ processName = getSfProcessName(); } catch (Exception ex) { if (log.isErrorEnabled()) { - log.error("sfTrace: Exception deployment:" + - ex.toString()); + log.error("sfTrace: Exception deployment:" + ex.toString()); } } Modified: trunk/core/smartfrog/src/org/smartfrog/services/utils/logtofile/SFLogToFile.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/utils/logtofile/SFLogToFile.java 2006-10-24 10:10:55 UTC (rev 3514) +++ trunk/core/smartfrog/src/org/smartfrog/services/utils/logtofile/SFLogToFile.java 2006-10-24 14:26:20 UTC (rev 3515) @@ -25,7 +25,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.io.PrintStream; -import java.net.InetAddress; import java.rmi.RemoteException; import java.text.SimpleDateFormat; import java.util.Date; @@ -38,6 +37,7 @@ import org.smartfrog.sfcore.prim.PrimImpl; import org.smartfrog.sfcore.prim.TerminationRecord; import org.smartfrog.sfcore.reference.Reference; +import org.smartfrog.sfcore.processcompound.SFProcess; import org.smartfrog.services.display.PrintErrMsgInt; import org.smartfrog.services.display.PrintMsgInt; @@ -46,8 +46,13 @@ * Class used to log system.out and system.err messages into a file. * */ -public class SFLogToFile extends PrimImpl implements Prim, PrintMsgInt, - PrintErrMsgInt { +public class SFLogToFile extends PrimImpl implements Prim, PrintMsgInt, PrintErrMsgInt { + + /* + Date format + */ + static SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss.SSS yyyy/MM/dd"); + /** Reference for filename. */ Reference fileNameRef = new Reference("fileName"); /** String name for file name. */ @@ -138,8 +143,7 @@ // create the file & redirect the outputs try { - if (processName.equals(SmartFrogCoreKeys.SF_ROOT_PROCESS) || - !logOnlyInRootProcess) { + if (processName.equals(SmartFrogCoreKeys.SF_ROOT_PROCESS) || !logOnlyInRootProcess) { createFile(); redirectOutputs(); } else { @@ -162,12 +166,10 @@ RemoteException { super.sfStart(); if (detachAndTerminate) { - termR = new TerminationRecord("normal", - "Not deployed in rootProcess", this.sfCompleteName()); - + termR = new TerminationRecord("normal", "Not deployed in rootProcess", this.sfCompleteName()); TerminatorThread terminator = new TerminatorThread(this,termR).detach(); terminator.start(); - } + } } /** * Creates the file using attributes. @@ -185,7 +187,7 @@ // add hostname and date to file name try { - String hostName = InetAddress.getLocalHost().getHostName(); + String hostName = SFProcess.sfDeployedHost().getHostName(); fullFileName += hostName; } catch (Exception e) { // log the exception @@ -200,15 +202,13 @@ String timeFileName = ""; if (useTime) { - timeFileName = "_" + - new SimpleDateFormat(formatTimeString).format(now); + timeFileName = "_" + new SimpleDateFormat(formatTimeString).format(now); } String dateFileName = ""; if (useDate) { - dateFileName = "_" + - new SimpleDateFormat(formatDateString).format(now); + dateFileName = "_" + new SimpleDateFormat(formatDateString).format(now); } // add the extension @@ -282,10 +282,7 @@ *@return The formatted message */ private String formatMsg(String msg) { - msg = "[" + - (new SimpleDateFormat("HH:mm:ss.SSS dd/MM/yy").format(new Date( - System.currentTimeMillis()))) + "] " + msg; - + msg = "[" +(dateFormat.format(new Date(System.currentTimeMillis()))) + "] " + msg; return msg; } Modified: trunk/core/smartfrog/src/org/smartfrog/sfcore/common/Diagnostics.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/sfcore/common/Diagnostics.java 2006-10-24 10:10:55 UTC (rev 3514) +++ trunk/core/smartfrog/src/org/smartfrog/sfcore/common/Diagnostics.java 2006-10-24 14:26:20 UTC (rev 3515) @@ -44,7 +44,6 @@ import org.smartfrog.sfcore.prim.Prim; import org.smartfrog.sfcore.processcompound.ProcessCompound; import org.smartfrog.sfcore.processcompound.SFProcess; -import org.smartfrog.sfcore.common.Logger; import java.io.File; import java.io.FileOutputStream; @@ -62,7 +61,10 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.InetAddress; -import java.net.*; +import java.net.InetAddress; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.UnknownHostException; /** @@ -516,7 +518,7 @@ InetAddress localhost=null; out.append("Network test localhost: "); try { - localhost = InetAddress.getLocalHost(); + localhost = SFProcess.sfDeployedHost(); String localhostName = localhost.getCanonicalHostName(); out.append("hostname '"+localhostName+"', "); out.append("ip '"+localhost.getHostAddress()+"', "); @@ -529,7 +531,7 @@ } else { out.append(" [Failed], "+time2+"ms"); } - } catch (UnknownHostException ex1) { + } catch (Exception ex1) { time2=System.currentTimeMillis()-time; out.append("[Failed], Failed to resolve localhost ip, "+time2+"ms"+", "+ex1.toString()); } Modified: trunk/core/smartfrog/src/org/smartfrog/sfcore/logging/LogToFileImpl.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/sfcore/logging/LogToFileImpl.java 2006-10-24 10:10:55 UTC (rev 3514) +++ trunk/core/smartfrog/src/org/smartfrog/sfcore/logging/LogToFileImpl.java 2006-10-24 14:26:20 UTC (rev 3515) @@ -26,13 +26,13 @@ import java.io.File; import java.io.FileOutputStream; import java.io.PrintStream; -import java.net.UnknownHostException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; import org.smartfrog.sfcore.common.SmartFrogCoreKeys; import org.smartfrog.sfcore.common.SmartFrogCoreProperty; import org.smartfrog.sfcore.componentdescription.ComponentDescription; +import org.smartfrog.sfcore.processcompound.SFProcess; /** * @@ -200,12 +200,12 @@ if (useHostNameInFileName) { try { - String hostname = java.net.InetAddress.getLocalHost().getCanonicalHostName(); + String hostname = SFProcess.sfDeployedHost().getCanonicalHostName(); if ((newfileName.toString().length()>0)&&!(newfileName.toString().endsWith("_"))) { newfileName.append("_"); } newfileName.append(hostname); - } catch (UnknownHostException ex) { + } catch (SmartFrogException ex) { if (isErrorEnabled()) error("",ex); } } Modified: trunk/core/smartfrog/src/org/smartfrog/sfcore/prim/PrimImpl.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/sfcore/prim/PrimImpl.java 2006-10-24 10:10:55 UTC (rev 3514) +++ trunk/core/smartfrog/src/org/smartfrog/sfcore/prim/PrimImpl.java 2006-10-24 14:26:20 UTC (rev 3515) @@ -21,7 +21,6 @@ package org.smartfrog.sfcore.prim; import java.net.InetAddress; -import java.net.UnknownHostException; import java.rmi.NoSuchObjectException; import java.rmi.RemoteException; import java.rmi.server.RemoteStub; @@ -29,8 +28,24 @@ import java.util.Iterator; import java.util.Vector; -import org.smartfrog.sfcore.common.*; import org.smartfrog.sfcore.common.Diagnostics; +import org.smartfrog.sfcore.common.Context; +import org.smartfrog.sfcore.common.ContextImpl; +import org.smartfrog.sfcore.common.Diagnostics; +import org.smartfrog.sfcore.common.Logger; +import org.smartfrog.sfcore.common.MessageKeys; +import org.smartfrog.sfcore.common.MessageUtil; +import org.smartfrog.sfcore.common.SFMarshalledObject; +import org.smartfrog.sfcore.common.SmartFrogContextException; +import org.smartfrog.sfcore.common.SmartFrogCoreKeys; +import org.smartfrog.sfcore.common.SmartFrogDeploymentException; +import org.smartfrog.sfcore.common.SmartFrogException; +import org.smartfrog.sfcore.common.SmartFrogLifecycleException; +import org.smartfrog.sfcore.common.SmartFrogLivenessException; +import org.smartfrog.sfcore.common.SmartFrogResolutionException; +import org.smartfrog.sfcore.common.SmartFrogRuntimeException; +import org.smartfrog.sfcore.common.SmartFrogUpdateException; +import org.smartfrog.sfcore.common.TerminatorThread; import org.smartfrog.sfcore.componentdescription.ComponentDescription; import org.smartfrog.sfcore.componentdescription.ComponentDescriptionImpl; import org.smartfrog.sfcore.logging.LogFactory; @@ -284,20 +299,8 @@ */ public InetAddress sfDeployedHost() throws RemoteException { try { - String hostName = System.getProperty("java.rmi.server.hostname"); - try { - if (hostName!=null) { - return java.net.InetAddress.getByName(hostName); - } - } catch (UnknownHostException ex) { - if (sfLog().isIgnoreEnabled()){ - sfLog().ignore(MessageUtil.formatMessage(MSG_FAILED_INET_ADDRESS_LOOKUP),ex); - } -// Logger.logQuietly(MessageUtil.formatMessage(MSG_FAILED_INET_ADDRESS_LOOKUP),ex); - } - return java.net.InetAddress.getLocalHost(); + return SFProcess.sfDeployedHost(); } catch (Exception ex) { -// Logger.logQuietly(MessageUtil.formatMessage(MSG_FAILED_INET_ADDRESS_LOOKUP),ex); if (sfLog().isIgnoreEnabled()){ sfLog().ignore(MessageUtil.formatMessage(MSG_FAILED_INET_ADDRESS_LOOKUP),ex); } Modified: trunk/core/smartfrog/src/org/smartfrog/sfcore/processcompound/DefaultRootLocatorImpl.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/sfcore/processcompound/DefaultRootLocatorImpl.java 2006-10-24 10:10:55 UTC (rev 3514) +++ trunk/core/smartfrog/src/org/smartfrog/sfcore/processcompound/DefaultRootLocatorImpl.java 2006-10-24 14:26:20 UTC (rev 3515) @@ -289,10 +289,10 @@ ProcessCompound localCompound = SFProcess.getProcessCompound(); if (hostAddress == null) { - hostAddress = InetAddress.getLocalHost(); + hostAddress = SFProcess.sfDeployedHost(); } - if ((localCompound != null)&& hostAddress.equals(InetAddress.getLocalHost()) && localCompound.sfIsRoot()) { + if ((localCompound != null)&& hostAddress.equals(SFProcess.sfDeployedHost()) && localCompound.sfIsRoot()) { return localCompound; } Modified: trunk/core/smartfrog/src/org/smartfrog/sfcore/processcompound/SFProcess.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/sfcore/processcompound/SFProcess.java 2006-10-24 10:10:55 UTC (rev 3514) +++ trunk/core/smartfrog/src/org/smartfrog/sfcore/processcompound/SFProcess.java 2006-10-24 14:26:20 UTC (rev 3515) @@ -45,7 +45,9 @@ import java.util.Enumeration; import java.util.Properties; import java.rmi.ConnectException; + import org.smartfrog.sfcore.logging.LogFactory; +import org.smartfrog.sfcore.logging.LogSF; import org.smartfrog.Version; @@ -60,6 +62,10 @@ */ public class SFProcess implements MessageKeys { /** + * Log for SFProcess (Process Log). + */ + private static LogSF sfLog= LogFactory.sfGetProcessLog(); + /** * Single instance of process compound for this process */ protected static ProcessCompound processCompound; @@ -90,7 +96,7 @@ // /** ProcessLog. This log is used to log into the core log: SF_CORE_LOG // * It can be replaced using sfSetLog() // */ -// private LogSF sflog = LogFactory.sfGetProcessLog(); +// private LogSF sflog = sfLog(); private SFProcess (){ } @@ -201,7 +207,7 @@ "Deployment Failure: " + ex, comp.sfCompleteName())); } catch (Exception termex) { // ignore - if (LogFactory.sfGetProcessLog().isIgnoreEnabled()){LogFactory.sfGetProcessLog().ignore(ex); } + if (sfLog().isIgnoreEnabled()){sfLog().ignore(ex); } } } @@ -235,8 +241,8 @@ try { TerminationRecord tr = TerminationRecord.abnormal("Failed to start ", newRef); - if (LogFactory.sfGetProcessLog().isErrorEnabled()) { - LogFactory.sfGetProcessLog().error(newRef.toString(),SmartFrogException.forward(ex),tr); + if (sfLog().isErrorEnabled()) { + sfLog().error(newRef.toString(),SmartFrogException.forward(ex),tr); } comp.sfTerminate(tr); } catch (Exception termEx) { @@ -283,27 +289,27 @@ if (processCompound != null) { try { //Logger.log("Terminating sfDaemon gracefully!!"); - LogFactory.sfGetProcessLog().out("Terminating sfDaemon gracefully!!"); + sfLog().out("Terminating sfDaemon gracefully!!"); processCompound.sfTerminate(new TerminationRecord(TerminationRecord.NORMAL, "sfDaemon forced to terminate ", ((Prim) processCompound).sfCompleteName())); } catch (RemoteException re) { //Logger.log(re); //log and ignore - if (LogFactory.sfGetProcessLog().isIgnoreEnabled()) { - LogFactory.sfGetProcessLog().ignore(re); + if (sfLog().isIgnoreEnabled()) { + sfLog().ignore(re); } } catch (Throwable thr) { //Logger.log(thr); - if (LogFactory.sfGetProcessLog().isIgnoreEnabled()) { - LogFactory.sfGetProcessLog().ignore(thr); + if (sfLog().isIgnoreEnabled()) { + sfLog().ignore(thr); } } } } else { //Logger.log("sfDaemon killed!"); - LogFactory.sfGetProcessLog().out("sfDaemon killed!"); + sfLog().out("sfDaemon killed!"); //http://www.tldp.org/LDP/abs/html/exitcodes.html // 130 - Control-C is fatal error signal 2, (130 = 128 + 2) ExitCodes.exitWithError(ExitCodes.EXIT_ERROR_CODE_CRTL_ALT_DEL); @@ -322,7 +328,7 @@ oldHandler=Signal.handle(new Signal(name), this); } catch (IllegalArgumentException e) { //this happens when binding fails. In this situation, warn, but keep going - LogFactory.sfGetProcessLog().err("Failed to set control-C handler -is JVM running with -Xrs set?",e); + sfLog().err("Failed to set control-C handler -is JVM running with -Xrs set?",e); // Logger.log("Failed to set control-C handler -is JVM running with -Xrs set?"); // Logger.log(e); } @@ -547,5 +553,43 @@ return target; } + /** + * Request the host to which this process is bound to + * + * @return the host InetAddress + * + * @throws RemoteException In case of network/rmi error + * @throws SmartFrogException wrapped Exception + */ + public static InetAddress sfDeployedHost() throws SmartFrogException { + try { + String hostName = System.getProperty("java.rmi.server.hostname"); + try { + if (hostName!=null) { + return java.net.InetAddress.getByName(hostName); + } + } catch (UnknownHostException ex) { + if (sfLog().isIgnoreEnabled()){ + sfLog().ignore(MessageUtil.formatMessage(MSG_FAILED_INET_ADDRESS_LOOKUP),ex); + } + } + return java.net.InetAddress.getLocalHost(); + } catch (Exception ex) { + if (sfLog().isIgnoreEnabled()){ + sfLog().ignore(MessageUtil.formatMessage(MSG_FAILED_INET_ADDRESS_LOOKUP),ex); + } + throw SmartFrogException.forward(MessageUtil.formatMessage(MSG_FAILED_INET_ADDRESS_LOOKUP),ex); + } + } + + + /** + * Log for SFProcess. + * @return ProcessLog + */ + private static LogSF sfLog() { + return sfLog; + } + } Modified: trunk/core/testharness/testcases/org/smartfrog/test/process/DaemonTest.java =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/process/DaemonTest.java 2006-10-24 10:10:55 UTC (rev 3514) +++ trunk/core/testharness/testcases/org/smartfrog/test/process/DaemonTest.java 2006-10-24 14:26:20 UTC (rev 3515) @@ -47,7 +47,7 @@ public void testStopDaemon() throws Exception { TerminationRecord tr = new TerminationRecord("Process Terminated", null, null); - ProcessCompound sfDaemon = SFProcess.getRootLocator().getRootProcessCompound(InetAddress.getLocalHost(), 3800); + ProcessCompound sfDaemon = SFProcess.getRootLocator().getRootProcessCompound(SFProcess.sfDeployedHost(), 3800); TerminatorThread terminator = new TerminatorThread(sfDaemon, tr).detach().quietly(); terminator.start(); } Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/components/scripting/ScriptingTest.java =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/components/scripting/ScriptingTest.java 2006-10-24 10:10:55 UTC (rev 3514) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/components/scripting/ScriptingTest.java 2006-10-24 14:26:20 UTC (rev 3515) @@ -65,7 +65,7 @@ System.out.println("testCaseTCP52 process name :" +applicationtcp52.sfCompleteName()); - ProcessCompound pc= SFProcess.getRootLocator().getRootProcessCompound(InetAddress.getLocalHost()); + ProcessCompound pc= SFProcess.getRootLocator().getRootProcessCompound(SFProcess.sfDeployedHost()); Prim count=(Prim)pc.sfResolve("exam"); String actualPSfClass =(String) count.sfResolveHere("sfClass"); Modified: trunk/core/testharness/testcases/org/smartfrog/test/unit/net/BasicNetworkingTest.java =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/unit/net/BasicNetworkingTest.java 2006-10-24 10:10:55 UTC (rev 3514) +++ trunk/core/testharness/testcases/org/smartfrog/test/unit/net/BasicNetworkingTest.java 2006-10-24 14:26:20 UTC (rev 3515) @@ -25,6 +25,9 @@ import java.net.UnknownHostException; import java.util.logging.Logger; +import org.smartfrog.sfcore.processcompound.*; +import org.smartfrog.sfcore.common.*; + /** * created Jul 12, 2004 3:55:32 PM */ @@ -44,11 +47,21 @@ /** * may fail if DNS is badly set up or absent + * @throws SmartFrogException + */ + public void testProcessSfDeployedHost() throws SmartFrogException { + InetAddress addr; + addr= SFProcess.sfDeployedHost(); + logAddr("SFProcess.sfDeployedHost", addr); + } + + /** + * may fail if DNS is badly set up or absent * @throws UnknownHostException */ public void testLocalhost() throws UnknownHostException { InetAddress addr; - addr=InetAddress.getByName("localhost"); + addr= InetAddress.getByName("localhost"); logAddr("localhost", addr); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2006-10-24 18:13:32
|
Revision: 3521 http://svn.sourceforge.net/smartfrog/?rev=3521&view=rev Author: julgui Date: 2006-10-24 11:12:45 -0700 (Tue, 24 Oct 2006) Log Message: ----------- Replace instances of Throwable.printstacktrace() and System.out/err with sfLog. SFOS-22 Modified Paths: -------------- trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/apache/ApacheImpl.java trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/graphpanel/CompleteGraphPanel.java trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/graphpanel/GraphImpl.java trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/graphpanel/GraphPanel.java trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/graphpanel/ThresholdPanel.java trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/graphpanel/TideMarkPanel.java trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/graphpanel/TideMeterImpl.java trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/progresspanel/ProgressBarsImpl.java trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/progresspanel/ProgressPanel.java trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/thresholder/ThresholderImpl.java trunk/core/smartfrog/src/org/smartfrog/examples/pong/GameArena.java trunk/core/smartfrog/src/org/smartfrog/examples/pong/GameArenaWrapper.java trunk/core/smartfrog/src/org/smartfrog/examples/pong/GameFrame.java trunk/core/smartfrog/src/org/smartfrog/services/comm/mcast/SFMCastClientImpl.java trunk/core/smartfrog/src/org/smartfrog/services/display/Display.java trunk/core/smartfrog/src/org/smartfrog/services/display/SFDisplay.java trunk/core/smartfrog/src/org/smartfrog/services/display/TableUtilities.java trunk/core/smartfrog/src/org/smartfrog/services/filesystem/replacevar/SFReplaceFileVar.java trunk/core/smartfrog/src/org/smartfrog/services/management/DeployEntry.java trunk/core/smartfrog/src/org/smartfrog/services/management/DeployEntryCellRenderer.java trunk/core/smartfrog/src/org/smartfrog/services/management/DeployTreeModelSF.java trunk/core/smartfrog/src/org/smartfrog/services/management/DeployTreePanel.java trunk/core/smartfrog/src/org/smartfrog/services/management/NewAttributeDialog.java trunk/core/smartfrog/src/org/smartfrog/services/management/PopUpTable.java trunk/core/smartfrog/src/org/smartfrog/services/management/PopUpTree.java trunk/core/smartfrog/src/org/smartfrog/services/management/SFDeployDisplay.java trunk/core/smartfrog/src/org/smartfrog/services/os/runshell/RunShellImpl.java trunk/core/smartfrog/src/org/smartfrog/services/shellscript/ScriptExecutionImpl.java trunk/core/smartfrog/src/org/smartfrog/services/trace/BrowserEntry.java trunk/core/smartfrog/src/org/smartfrog/services/trace/SFTrace.java trunk/core/smartfrog/src/org/smartfrog/services/trace/TraceTreePanel.java trunk/core/smartfrog/src/org/smartfrog/services/utils/logtofile/SFLogToFile.java trunk/core/smartfrog/src/org/smartfrog/sfcore/common/ConfigurationDescriptor.java trunk/core/smartfrog/src/org/smartfrog/sfcore/logging/LogFactory.java trunk/core/smartfrog/src/org/smartfrog/sfcore/prim/PrimImpl.java trunk/core/testharness/testcases/org/smartfrog/test/system/deploy/NetElemImpl.java Modified: trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/apache/ApacheImpl.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/apache/ApacheImpl.java 2006-10-24 16:48:46 UTC (rev 3520) +++ trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/apache/ApacheImpl.java 2006-10-24 18:12:45 UTC (rev 3521) @@ -135,8 +135,7 @@ * @param newState new state of Apache */ public synchronized void setApacheState(boolean newState) { - logger.log(name, - "setting apache state to " + newState + " from " + apacheState); + logger.log(name, "setting apache state to " + newState + " from " + apacheState); if ((!apacheState) && (newState)) { apacheState = newState; @@ -174,7 +173,7 @@ if (manageDaemon) p = Runtime.getRuntime().exec(apachectlLocation + " start"); } catch (Exception e) { - e.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error (e); } logger.log(name, "httpd started"); @@ -187,7 +186,7 @@ p = Runtime.getRuntime().exec(apachectlLocation + " start"); needRestart = false; } catch (IOException e) { - e.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error (e); } } //end if (needRestart) @@ -195,6 +194,7 @@ try { Thread.sleep(interCheckTime * 1000); } catch (InterruptedException ignored) { + if (sfLog().isIgnoreEnabled()) sfLog().ignore (ignored); } try { @@ -246,8 +246,7 @@ shouldRefresh = false; } } catch (Exception e) { - logger.err(name, "error checking for processes - ignored"); - e.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error (name + "- error checking for processes - ignored",e); } } @@ -263,7 +262,7 @@ } } } catch (Exception e) { - e.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error (e); } } Modified: trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/graphpanel/CompleteGraphPanel.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/graphpanel/CompleteGraphPanel.java 2006-10-24 16:48:46 UTC (rev 3520) +++ trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/graphpanel/CompleteGraphPanel.java 2006-10-24 18:12:45 UTC (rev 3521) @@ -20,6 +20,9 @@ package org.smartfrog.examples.dynamicwebserver.gui.graphpanel; +import org.smartfrog.sfcore.logging.LogFactory; +import org.smartfrog.sfcore.logging.LogSF; + import java.awt.BorderLayout; import java.awt.Color; @@ -60,7 +63,8 @@ try { jbInit(); } catch (Exception e) { - e.printStackTrace(); + LogSF sfLog = LogFactory.getLog(this.getClass()); + if (sfLog.isErrorEnabled()) sfLog.error (e); } } @@ -79,7 +83,8 @@ try { jbInit(); } catch (Exception e) { - e.printStackTrace(); + LogSF sfLog = LogFactory.getLog(title+"_CompleteGraphPanel"); + if (sfLog.isErrorEnabled()) sfLog.error (e); } setVisible(true); Modified: trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/graphpanel/GraphImpl.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/graphpanel/GraphImpl.java 2006-10-24 16:48:46 UTC (rev 3520) +++ trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/graphpanel/GraphImpl.java 2006-10-24 18:12:45 UTC (rev 3521) @@ -33,6 +33,8 @@ import org.smartfrog.sfcore.compound.Compound; import org.smartfrog.sfcore.compound.CompoundImpl; import org.smartfrog.sfcore.prim.TerminationRecord; +import org.smartfrog.sfcore.logging.LogSF; +import org.smartfrog.sfcore.logging.LogFactory; /** @@ -318,7 +320,8 @@ try { convertData(source.getData()); } catch (Exception e) { - e.printStackTrace(); + LogSF sfLog = LogFactory.getLog(this.getClass()); + if (sfLog.isErrorEnabled()) sfLog.error (e); } } } Modified: trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/graphpanel/GraphPanel.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/graphpanel/GraphPanel.java 2006-10-24 16:48:46 UTC (rev 3520) +++ trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/graphpanel/GraphPanel.java 2006-10-24 18:12:45 UTC (rev 3521) @@ -222,10 +222,10 @@ tracker.waitForID(1, 5000); tracker.waitForID(2, 5000); } catch (InterruptedException iex) { - iex.printStackTrace(); + if (log.isErrorEnabled()) log.error (iex); } } catch (Exception e) { - e.printStackTrace(); + if (log.isErrorEnabled()) log.error (e); } } @@ -452,7 +452,7 @@ // if dirty was true, we give a chance to any of the previous function to do some work dirty = false; } catch (Throwable ex) { - ex.printStackTrace(); + if (log.isErrorEnabled()) log.error (ex); } } Modified: trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/graphpanel/ThresholdPanel.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/graphpanel/ThresholdPanel.java 2006-10-24 16:48:46 UTC (rev 3520) +++ trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/graphpanel/ThresholdPanel.java 2006-10-24 18:12:45 UTC (rev 3521) @@ -103,9 +103,10 @@ tracker.waitForID(0, 5000); tracker.waitForID(1, 5000); } catch (InterruptedException iex) { - iex.printStackTrace(); + if (log.isErrorEnabled()) log.error (iex); } } catch (Exception e) { + if (log.isIgnoreEnabled()) log.ignore (e); } } Modified: trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/graphpanel/TideMarkPanel.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/graphpanel/TideMarkPanel.java 2006-10-24 16:48:46 UTC (rev 3520) +++ trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/graphpanel/TideMarkPanel.java 2006-10-24 18:12:45 UTC (rev 3521) @@ -65,10 +65,10 @@ tracker.waitForID(0, 5000); tracker.waitForID(1, 5000); } catch (InterruptedException iex) { - iex.printStackTrace(); + if (log.isErrorEnabled()) log.error (iex); } } catch (Exception e) { - // e.printStackTrace(); + if (log.isIgnoreEnabled()) log.ignore (e); } } Modified: trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/graphpanel/TideMeterImpl.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/graphpanel/TideMeterImpl.java 2006-10-24 16:48:46 UTC (rev 3520) +++ trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/graphpanel/TideMeterImpl.java 2006-10-24 18:12:45 UTC (rev 3521) @@ -24,13 +24,17 @@ import java.rmi.RemoteException; import org.smartfrog.sfcore.compound.Compound; +import org.smartfrog.sfcore.logging.LogSF; +import org.smartfrog.sfcore.logging.LogFactory; /** * A compound to collect data from a source and convert into some other form. */ -public class TideMeterImpl extends GraphImpl implements TideMeter, Compound, - Runnable { +public class TideMeterImpl extends GraphImpl implements TideMeter, Compound, Runnable { + /** Log for this class, created using class name*/ + LogSF sfLog = LogFactory.getLog(this.getClass()); + // the tide mark pane TideMarkPanel tmp; int maxResetPeriod; @@ -105,7 +109,7 @@ convertData(lastValue); } catch (Exception e) { - e.printStackTrace(); + if (sfLog.isErrorEnabled()) sfLog.error (e); } } } Modified: trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/progresspanel/ProgressBarsImpl.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/progresspanel/ProgressBarsImpl.java 2006-10-24 16:48:46 UTC (rev 3520) +++ trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/progresspanel/ProgressBarsImpl.java 2006-10-24 18:12:45 UTC (rev 3521) @@ -134,7 +134,7 @@ try { hash.put(key, panel); } catch (Exception ex) { - ex.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error (ex); } } @@ -146,7 +146,7 @@ /** * Gets the eventSender attribute of the SFProgressBars object * - * @param msg message + * @param msgO message * * @return The eventSender value */ @@ -168,7 +168,7 @@ /** * Gets the eventTotalItems attribute of the SFProgressBars object * - * @param msg message + * @param msgO message * * @return The eventTotalItems value */ @@ -192,7 +192,7 @@ /** * Gets the eventItem attribute of the SFProgressBars object * - * @param msg message + * @param msgO message * * @return The eventItem value */ @@ -211,7 +211,7 @@ //System.out.println("Item:"+item); return Integer.parseInt(item); } catch (Exception ex) { - //ex.printStackTrace(); + if (sfLog().isIgnoreEnabled()) sfLog().ignore(ex); return -1; } } @@ -219,7 +219,7 @@ /** * Gets the eventMsg attribute of the SFProgressBars object * - * @param msg message + * @param msgO message * * @return The eventMsg value */ @@ -230,7 +230,7 @@ //System.out.println("msg:"+msg); return msg; } catch (Exception ex) { - //ex.printStackTrace(); + if (sfLog().isIgnoreEnabled()) sfLog().ignore (ex); if (msgO!=null){ return msgO.toString(); } else { @@ -425,7 +425,7 @@ } } } catch (Exception exc) { - exc.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error (exc); } } } Modified: trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/progresspanel/ProgressPanel.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/progresspanel/ProgressPanel.java 2006-10-24 16:48:46 UTC (rev 3520) +++ trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/gui/progresspanel/ProgressPanel.java 2006-10-24 18:12:45 UTC (rev 3521) @@ -20,6 +20,9 @@ package org.smartfrog.examples.dynamicwebserver.gui.progresspanel; +import org.smartfrog.sfcore.logging.LogSF; +import org.smartfrog.sfcore.logging.LogFactory; + import java.awt.BorderLayout; import java.awt.Color; import java.awt.FlowLayout; @@ -45,6 +48,8 @@ public class ProgressPanel extends JPanel { + /** Log for this class, created using class name*/ + static LogSF sfLogStatic = LogFactory.getLog(ProgressPanel.class); /* Date format */ @@ -81,7 +86,7 @@ jbInit(); jLabelTitle.setText(title); } catch (Exception ex) { - ex.printStackTrace(); + sfLogStatic.err(ex); } } @@ -116,7 +121,7 @@ } } } catch (Exception ex) { - ex.printStackTrace(); + sfLogStatic.err(ex); } } @@ -189,4 +194,6 @@ jPanelLabel.add(jLabelTitle, BorderLayout.CENTER); jPanelLabel.add(jLabel4, BorderLayout.WEST); } + + } Modified: trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/thresholder/ThresholderImpl.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/thresholder/ThresholderImpl.java 2006-10-24 16:48:46 UTC (rev 3520) +++ trunk/core/smartfrog/src/org/smartfrog/examples/dynamicwebserver/thresholder/ThresholderImpl.java 2006-10-24 18:12:45 UTC (rev 3521) @@ -47,8 +47,7 @@ * */ -public class ThresholderImpl extends CompoundImpl implements Thresholder, - Compound, SmartFrogCoreKeys { +public class ThresholderImpl extends CompoundImpl implements Thresholder, Compound, SmartFrogCoreKeys { int upperThreshold; int lowerThreshold; int pollFrequency; @@ -244,9 +243,7 @@ } } } catch (Exception e) { - logger.logOptional(name, - "excption caught in ajusting number of instances"); - e.printStackTrace(); + if (sfLog().isWarnEnabled()) sfLog().warn (name+"- exception caught in ajusting number of instances", e); } } } @@ -279,13 +276,12 @@ balancer.addServer(server); } } catch (Exception e) { - logger.logOptional(name, - "help... exception in starting instance"); - e.printStackTrace(); + if (sfLog().isWarnEnabled()) sfLog().warn (name+ "help... exception in starting instance", e); try { deployed.sfDetachAndTerminate(TerminationRecord.normal(null)); } catch (Exception ex) { + if (sfLog().isIgnoreEnabled()) sfLog().ignore (ex); } throw e; @@ -401,8 +397,7 @@ sleep(pollFrequency); logger.logOptional(name, "poller awake"); } catch (Exception e) { - logger.logOptional(name, "excpetion caught in the poller"); - e.printStackTrace(); + if (sfLog().isWarnEnabled()) sfLog().warn (name+"- exception caught in the poller",e); } } Modified: trunk/core/smartfrog/src/org/smartfrog/examples/pong/GameArena.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/examples/pong/GameArena.java 2006-10-24 16:48:46 UTC (rev 3520) +++ trunk/core/smartfrog/src/org/smartfrog/examples/pong/GameArena.java 2006-10-24 18:12:45 UTC (rev 3521) @@ -20,6 +20,9 @@ package org.smartfrog.examples.pong; +import org.smartfrog.sfcore.logging.LogSF; +import org.smartfrog.sfcore.logging.LogFactory; + import java.awt.Canvas; import java.awt.Color; import java.awt.Dimension; @@ -36,6 +39,9 @@ * Defines the Game Arena for pong game. */ public class GameArena extends Canvas implements KeyListener { + /** Log for this class, created using class name*/ + LogSF log = LogFactory.getLog(this.getClass()); + /** Image object. */ static Image offScreenImage = null; /** Graphics object. */ @@ -113,7 +119,7 @@ repaint(); } catch (Exception e) { - e.printStackTrace(); + if (log.isErrorEnabled()) log.error (e); beating = false; } } Modified: trunk/core/smartfrog/src/org/smartfrog/examples/pong/GameArenaWrapper.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/examples/pong/GameArenaWrapper.java 2006-10-24 16:48:46 UTC (rev 3520) +++ trunk/core/smartfrog/src/org/smartfrog/examples/pong/GameArenaWrapper.java 2006-10-24 18:12:45 UTC (rev 3521) @@ -75,7 +75,7 @@ RemoteException { try { super.sfDeploy(); - System.out.println(" Deploying game"); + if (sfLog().isInfoEnabled()) sfLog().info(" Deploying game"); myName = (String) sfResolve("name"); // get optional attribute opponent @@ -114,7 +114,7 @@ super.sfStart(); // create the frame, add the game arena, start the game - System.out.println(" Starting game"); + if (sfLog().isInfoEnabled()) sfLog().info(" Starting game"); gameFrame = new GameFrame(windowSize); gameArena = new ConnectedGameArena(windowSize, this); gameFrame.getContentPane().add(gameArena, BorderLayout.CENTER); @@ -153,7 +153,7 @@ * @param tr TerminationRecord object */ public synchronized void sfTerminateWith(TerminationRecord tr) { - System.out.println(" Ending game"); + if (sfLog().isInfoEnabled()) sfLog().info(" Ending game"); // check if gameArena is initialized if (gameArena != null) { gameArena.stopGame(); @@ -241,14 +241,12 @@ this.opponent = discoveredPlayer; // set the name on the display - gameArena.setOpponentName((String) opponent.sfResolve( - "name")); - System.out.println("Discovered " + - ((Prim) discoveredPlayer).sfCompleteName()); + gameArena.setOpponentName((String) opponent.sfResolve("name")); + if (sfLog().isInfoEnabled()) sfLog().info ("Discovered " + ((Prim) discoveredPlayer).sfCompleteName()); } } } catch (Exception ex) { - ex.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error (ex); } } Modified: trunk/core/smartfrog/src/org/smartfrog/examples/pong/GameFrame.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/examples/pong/GameFrame.java 2006-10-24 16:48:46 UTC (rev 3520) +++ trunk/core/smartfrog/src/org/smartfrog/examples/pong/GameFrame.java 2006-10-24 18:12:45 UTC (rev 3521) @@ -20,6 +20,9 @@ package org.smartfrog.examples.pong; +import org.smartfrog.sfcore.logging.LogSF; +import org.smartfrog.sfcore.logging.LogFactory; + import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.Rectangle; @@ -30,6 +33,10 @@ * Defines the Game Frame for pong game. */ public class GameFrame extends JFrame { + + /** Log for this class, created using class name*/ + static LogSF sfLogStatic = LogFactory.getLog(GameFrame.class); + /** A player object. */ public Player player = null; /** Default frame dimension. */ @@ -49,7 +56,7 @@ try { FrameInit(); } catch (Exception ex) { - ex.printStackTrace(); + sfLogStatic.err(ex); } } Modified: trunk/core/smartfrog/src/org/smartfrog/services/comm/mcast/SFMCastClientImpl.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/comm/mcast/SFMCastClientImpl.java 2006-10-24 16:48:46 UTC (rev 3520) +++ trunk/core/smartfrog/src/org/smartfrog/services/comm/mcast/SFMCastClientImpl.java 2006-10-24 18:12:45 UTC (rev 3521) @@ -108,7 +108,7 @@ sock.joinGroup(address); } catch (IOException e) { - error("sfDeploy","Can't create multicast addrss: " + e); + if (sfLog().isErrorEnabled()) sfLog().error("Can't create multicast addrss: " + e,e); throw SmartFrogException.forward (e); } } @@ -132,7 +132,7 @@ *@param t Termination record */ public synchronized void sfTerminateWith(TerminationRecord t) { - log("sfTerminateWith", " Terminating for reason: " + t.toString()); + if (sfLog().isErrorEnabled()) sfLog().info("Terminating for reason: " + t.toString()); if (action != null) { try { action.interrupt(); @@ -160,8 +160,7 @@ cd = sfResolve (ATR_SERVERS, cd, true); //True to Get exception thown! } catch (SmartFrogResolutionException e) { - error("readSFAttributes","Failed to read mandatory attribute "+ - ", Error:"+ e.toString()); + if (sfLog().isErrorEnabled()) sfLog().error("Failed to read mandatory attribute "+ ", Error:"+ e.toString(),e); throw e; } port = sfResolve(ATR_MCASTPORT, port, false); @@ -178,7 +177,7 @@ ByteArrayInputStream b_in = new ByteArrayInputStream(buf); int packetCount = 0; DatagramPacket rcvPacket = new DatagramPacket(buf, buf.length); - log("run","Ready to receive... add:"+this.address+" port:"+port); + if (sfLog().isInfoEnabled()) sfLog().info("Ready to receive... add:"+this.address+" port:"+port); while (true) { try { try { @@ -194,7 +193,7 @@ Object o = o_in.readObject(); str.append(", object: " + o.getClass().toString() + ", "+ o.toString()); - log("run",str.toString()); + if (sfLog().isInfoEnabled()) sfLog().info(str.toString()); //send replay //DatagramPacket sendReply = new DatagramPacket(rcvPacket.getData() //,rcvPacket.getLength(), rcvPacket.getAddress(), rcvPacket. @@ -223,82 +222,22 @@ v.add(h.nextElement()); } this.sfReplaceAttribute(ATR_SERVERS+"v", v); -// cd.getContext().put(ATR_SERVERS+"v", o); } catch (Exception ex){ - System.out.println(" Error: "+this.sfCompleteNameSafe()+" "+ - ex.getMessage()); + if (sfLog().isErrorEnabled()) sfLog().error(" Error: "+this.sfCompleteNameSafe()+" "+ ex.getMessage(),ex); } } catch (IOException e) { - exception("Problems receiving packet", e); + if (sfLog().isErrorEnabled()) sfLog().error("Problems receiving packet", e); } catch (ClassNotFoundException ex){ - exception("Problems getting object from received packet", ex); + if (sfLog().isErrorEnabled()) sfLog().error("Problems getting object from received packet", ex); } rcvPacket.setLength(buf.length); b_in.reset(); // reset so next read is from start of byte[] again } } - // Utility methods - /** - * Logs error mesasge at the standard err stream. - * @param method Name of the method - * @param message Error Message - */ - private void error(String method, String message) { - if (debug) { - StringBuffer msg = new StringBuffer(); - msg.append (myName); - msg.append ("."); - msg.append (method); - msg.append ( " [" ); - msg.append (dateFormat.format(new Date())); - msg.append ("]> "); - msg.append (message); - System.err.println(msg.toString()); - } - } - /** - * Logs mesasge at the standard out stream. - * @param method Name of the method - * @param message Log message - */ - private void log(String method, String message) { - if (debug) { - StringBuffer msg = new StringBuffer(); - msg.append (myName); - msg.append ("."); - msg.append (method); - msg.append ( " [" ); - msg.append (dateFormat.format(new Date())); - msg.append ("]> "); - msg.append (message); - System.out.println(msg.toString()); - } - } - /** - * Logs exception with stack trace at the standard err stream. - * @param method Name of the method - * @param exception The exception object - */ - private void exception(String method, Throwable exception) { - if (debug) { - StringBuffer msg = new StringBuffer(); - msg.append (myName); - msg.append ("."); - msg.append ( "Exception"); - msg.append ( " [" ); - msg.append (dateFormat.format(new Date())); - msg.append ("]> "); - //msg.append (exception.getMessage()); - msg.append("\n StackTrace: "); - msg.append(exception.getStackTrace().toString()); - System.err.println(msg.toString()); - exception.printStackTrace(); - } - } } Modified: trunk/core/smartfrog/src/org/smartfrog/services/display/Display.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/display/Display.java 2006-10-24 16:48:46 UTC (rev 3520) +++ trunk/core/smartfrog/src/org/smartfrog/services/display/Display.java 2006-10-24 18:12:45 UTC (rev 3521) @@ -72,6 +72,8 @@ import org.smartfrog.sfcore.prim.TerminationRecord; import org.smartfrog.sfcore.processcompound.SFProcess; import org.smartfrog.sfcore.reference.Reference; +import org.smartfrog.sfcore.logging.LogSF; +import org.smartfrog.sfcore.logging.LogFactory; import org.smartfrog.SFSystem; import java.awt.Image; @@ -85,6 +87,11 @@ */ public class Display extends JFrame implements ActionListener, KeyListener { /** + * Class log for static invocations + */ + static LogSF logStatic = LogFactory.getLog(Display.class); + + /** * Color for non editable screen. */ public final Color NONEDITCOLOR = new Color(80, 60, 120); @@ -287,7 +294,7 @@ try { // Execution - System.out.println("# B # Display Executing "); + if (logStatic.isInfoEnabled()) logStatic.info("# B # Display Executing "); // Display Streams OutputStream dout = System.out; @@ -330,24 +337,23 @@ } //Testing output - System.out.println( - "Testing Redirection to Display: using System.out"); + System.out.println("Testing Redirection to Display: using System.out"); outstream.println("Printing directly using PrintStream"); System.err.println("Printing directly using System.err"); // Testing standard imput from user: - BufferedReader br = new BufferedReader(new InputStreamReader( - System.in)); + BufferedReader br = new BufferedReader(new InputStreamReader(System.in)); String line = ""; System.out.println("Reading (type 'end' to finish)..."); while (!line.equals("end")) { try { - System.out.println("Enter something ;-) <ENTER>: "); + logStatic.out("Enter something ;-) <ENTER>: "); line = br.readLine(); - System.out.println("Typed: " + line); + if (logStatic.isInfoEnabled()) logStatic.info("Typed: " + line); } catch (Exception e) { - e.printStackTrace(); + if (logStatic.isErrorEnabled()) logStatic.err(e); + } //end catch @@ -362,14 +368,13 @@ public void actionPerformed(ActionEvent evt) { String message = "timer..." + fmt.format(new Date()); - System.out.println("Stdout:" + message); + if (logStatic.isInfoEnabled()) logStatic.info("Stdout:" + message); } }); t.start(); } catch (Exception e) { - System.err.println("Error in 'full' execution code:\n" + e); - e.printStackTrace(); + if (logStatic.isErrorEnabled()) logStatic.err("Error in 'full' execution code: " + e,e); } } @@ -487,8 +492,7 @@ try { printKey.print(key); } catch (Exception ex) { - System.err.println("Error printing key:\n" + ex); - ex.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error("Error printing key: "+ex.toString(),ex); } } @@ -563,7 +567,6 @@ screenScrollChanged = false; } catch (Exception e) { //this.setTitle("Error: "+e.getMessage()); - //e.printStackTrace(); } } @@ -882,11 +885,10 @@ // Terminate sfDisplayCompound try { TerminationRecord tr = new TerminationRecord - ("normal", - "User termination", null); + ("normal", "User termination", null); this.sfObj.sfDetachAndTerminate(tr); } catch (Exception ex) { - ex.printStackTrace(); + sfLog().error(ex); } } } @@ -901,16 +903,15 @@ } else { // Terminate sfDisplayCompound try { - TerminationRecord tr = new TerminationRecord("normal", - "Display close by user", null); + TerminationRecord tr = new TerminationRecord("normal", "Display close by user", null); this.sfObj.sfDetachAndTerminate(tr); } catch (Exception ex) { - ex.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error(ex); } } } else if (systemExit) { - System.out.println( - "Not part for SF System. Press <ENTER> to finish..."); + sfLog().out("Not part for SF System. Press <ENTER> to finish..."); + //System.out.println("Not part for SF System. Press <ENTER> to finish..."); System.exit(0); } @@ -1408,7 +1409,7 @@ return img; } catch (Exception e) { //ignore - e.printStackTrace(); + if (logStatic.isErrorEnabled()) logStatic.error(e); } return null; } @@ -1443,8 +1444,7 @@ pipeKeyOut = new PipedOutputStream(pipeKeyIn); printKey = new PrintStream(pipeKeyOut); } catch (Exception e) { - System.err.println("Error connecting pipes:\n" + e); - e.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error("Error connecting pipes:: "+e.toString(),e); } // Timer for autoScroll @@ -1786,5 +1786,16 @@ public void actionPerformed(ActionEvent e) { adaptee.jMenuItemProcessComp_actionPerformed(e); } + } + + public LogSF sfLog() { + try { + if (sfObj!=null) { + return LogFactory.getLog(sfObj); + } + } catch (Exception ex){ + } + return logStatic; + } } \ No newline at end of file Modified: trunk/core/smartfrog/src/org/smartfrog/services/display/SFDisplay.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/display/SFDisplay.java 2006-10-24 16:48:46 UTC (rev 3520) +++ trunk/core/smartfrog/src/org/smartfrog/services/display/SFDisplay.java 2006-10-24 18:12:45 UTC (rev 3521) @@ -322,8 +322,7 @@ } } catch (Exception e) { System.setErr(sysErr); - System.err.println("Error in SFDisplay.sfTerminateWith():" + e); - e.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error("Error in SFDisplay.sfTerminateWith():" + e,e); } try { @@ -371,8 +370,7 @@ try { printMsgImp.printMsg(msg + ""); } catch (Exception ex) { - System.out.println(ex); - ex.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error(ex); } } else { //System.out.println("" + msg); @@ -400,8 +398,7 @@ try { printMsgImp.printMsg(msg + ""); } catch (Exception ex) { - System.out.println(ex); - ex.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error(ex); } } else { //System.out.println("" + msg); Modified: trunk/core/smartfrog/src/org/smartfrog/services/display/TableUtilities.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/display/TableUtilities.java 2006-10-24 16:48:46 UTC (rev 3520) +++ trunk/core/smartfrog/src/org/smartfrog/services/display/TableUtilities.java 2006-10-24 18:12:45 UTC (rev 3521) @@ -121,8 +121,7 @@ } catch (Exception e) { // Usually this error is due to a race condition between this method // and some other code modifying the TableColumnModel of this table - System.out.println( - "Possible race condition detected, retrying..."); + System.out.println("Possible race condition detected, retrying..."); try { retries++; @@ -133,8 +132,7 @@ Thread.sleep(100); } } catch (Exception ee) { - System.err.println("Error retriying setColumnWidths:\n" + - ee); + System.err.println("Error retriying setColumnWidths:\n" + ee); ee.printStackTrace(); } } Modified: trunk/core/smartfrog/src/org/smartfrog/services/filesystem/replacevar/SFReplaceFileVar.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/filesystem/replacevar/SFReplaceFileVar.java 2006-10-24 16:48:46 UTC (rev 3520) +++ trunk/core/smartfrog/src/org/smartfrog/services/filesystem/replacevar/SFReplaceFileVar.java 2006-10-24 18:12:45 UTC (rev 3521) @@ -144,10 +144,10 @@ *@exception Exception Description of Exception */ public void sfDeploy() throws RemoteException, SmartFrogException { - log("Deploying...", 3); + if (sfLog().isInfoEnabled()) sfLog().info("Deploying..."); super.sfDeploy(); readSFAttributes(); - log("SFdeployed", 3); + if (sfLog().isInfoEnabled()) sfLog().info("SFdeployed"); } @@ -159,7 +159,7 @@ */ public void sfStart() throws RemoteException, SmartFrogException { //@ToDo: it should check if the file exist an produce an appropiate message - log("Starting...", 3); + if (sfLog().isInfoEnabled()) sfLog().info("Starting..."); super.sfStart(); //Appending lines to file @@ -171,9 +171,9 @@ if (parserVar != null) { parserVar.start(); } else { - log("sfStart: No data to parse.", 4); + if (sfLog().isWarnEnabled()) sfLog().warn("sfStart: No data to parse."); } - log("SFstarted", 3); + if (sfLog().isInfoEnabled()) sfLog().info("SFstarted"); } @@ -183,7 +183,7 @@ *@param r Description of Parameter */ public void sfTerminateWith(TerminationRecord r) { - log("SFterminatedWith " + r.toString(), 3); + if (sfLog().isInfoEnabled()) sfLog().info("SFterminatedWith " + r.toString()); this.kill(); super.sfTerminateWith(r); } @@ -202,29 +202,7 @@ } } - /** - * Log - Writes messages in the standart output - * - *@param severity Description of Parameter - *@param message Description of Parameter - */ - private void log(String message, int severity) { - try { - //if (logger != false ) { - if (logger >= severity) { - //System.out.println(" LOG: Process "+ notifierId()+" msg:" + message + ", serverity: "+ severity); - System.out.println("[" + "" + "] " + message + ", SFReplaceFileVar, " + severity); - } - } catch (Exception e) { - if (printStack != false) { - e.printStackTrace(); - } - } - } - - - /** * Description of the Method */ private void readSFAttributes() { @@ -234,10 +212,9 @@ this.logger = ((Integer) sfResolve(varLogger)).intValue(); this.setLogLevel(logger); } catch (SmartFrogResolutionException e) { - log(varLogger + " not found.", 5); + if (sfLog().isErrorEnabled()) sfLog().error(varLogger + " not found.",e); } catch (Exception ex){ - if (this.printStack) - ex.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error(ex); } try { @@ -246,14 +223,14 @@ this.printStack = (((Boolean) printStackObj).booleanValue()); } } catch (SmartFrogResolutionException e) { - log(varPrintStack + " not found.", 5); + if (sfLog().isErrorEnabled()) sfLog().error(varPrintStack + " not found.",e); } try { fileName = (String) sfResolve(varSFfileName); } catch (SmartFrogResolutionException e) { this.dataParser.setValid(false); - log(varSFfileName + " not found.", 5); + if (sfLog().isErrorEnabled()) sfLog().error(varSFfileName + " not found.",e); } if (fileName != null) { @@ -269,7 +246,7 @@ } } } catch (SmartFrogResolutionException e) { - log(varSFnewFileName + " not found.", 5); + if (sfLog().isErrorEnabled()) sfLog().error(varSFnewFileName + " not found.",e); } try { @@ -278,7 +255,7 @@ this.setShouldTerminate(((Boolean) shouldTerminateObj).booleanValue()); } } catch (SmartFrogResolutionException e) { - log(varShouldTerminate + " not found.", 5); + if (sfLog().isErrorEnabled()) sfLog().error(varShouldTerminate + " not found.",e); } try { Object shouldDetachObj = sfResolve(varShouldDetach); @@ -286,12 +263,11 @@ this.setShouldDetach(((Boolean) shouldDetachObj).booleanValue()); } } catch (SmartFrogResolutionException e) { - log(varShouldDetach + " not found.", 5); + if (sfLog().isErrorEnabled()) sfLog().error(varShouldDetach + " not found.",e); } } catch (Exception e) { - System.err.println("Error reading SF attributes: " + e.getMessage()); - e.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error("Error reading SF attributes: " + e.getMessage(),e); } } Modified: trunk/core/smartfrog/src/org/smartfrog/services/management/DeployEntry.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/management/DeployEntry.java 2006-10-24 16:48:46 UTC (rev 3520) +++ trunk/core/smartfrog/src/org/smartfrog/services/management/DeployEntry.java 2006-10-24 18:12:45 UTC (rev 3521) @@ -26,6 +26,7 @@ import org.smartfrog.sfcore.common.Context; import org.smartfrog.sfcore.common.ContextImpl; import org.smartfrog.sfcore.common.SmartFrogCoreKeys; +import org.smartfrog.sfcore.common.SmartFrogLogException; import org.smartfrog.sfcore.compound.Compound; import org.smartfrog.sfcore.prim.Prim; import org.smartfrog.sfcore.prim.PrimImpl; @@ -33,6 +34,8 @@ import org.smartfrog.sfcore.processcompound.ProcessCompound; import java.rmi.RemoteException; import org.smartfrog.sfcore.componentdescription.ComponentDescription; +import org.smartfrog.sfcore.logging.LogSF; +import org.smartfrog.sfcore.logging.LogFactory; /** @@ -43,6 +46,9 @@ */ public class DeployEntry implements Entry { + /** Log for this class, created using class name*/ + LogSF sfLog = LogFactory.getLog(DeployEntry.class); + boolean showCDasChild = true; private Object entry = null; @@ -61,9 +67,9 @@ this.entry = (Object) entry; this.showRootProcessName = showRootProcessName; this.showCDasChild=showCDasChild; + initLog(); } catch (Exception ex) { - System.out.println("sfManagementConsole (DeployEntry1): "+ex.toString()); - //ex.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error("sfManagementConsole (DeployEntry1): "+ex.toString(),ex); } } @@ -73,12 +79,10 @@ public DeployEntry() { try { this.entry = new PrimImpl(); - + initLog(); //System.out.println("Model created"); } catch (Exception ex) { - System.out.println("sfManagementConsole (DeployEntry2): "+ex.toString()); - - //ex.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error("sfManagementConsole (DeployEntry2): "+ex.toString(),ex); } } @@ -91,10 +95,9 @@ try { this.entry = message; //System.out.println("Model created"); + initLog(); } catch (Exception ex) { - System.out.println("sfManagementConsole (DeployEntry3): "+ex.toString()); - - //ex.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error("sfManagementConsole (DeployEntry3): "+ex.toString(),ex); } } @@ -144,7 +147,7 @@ //return entry; } catch (Exception ex) { //System.out.println(ex.toString()); - ex.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error(ex); } return null; @@ -200,10 +203,9 @@ } catch (java.rmi.NoSuchObjectException nex){ //Ignore. component has terminated and RMI object has been //unexported - //@TODO: Log + if (sfLog().isIgnoreEnabled()) sfLog().ignore(nex); } catch (Exception ex) { - System.out.println("sfManagementConsole (getDN.Prim): "+ex.getMessage()); - //@TODO Log + if (sfLog().isErrorEnabled()) sfLog().error(ex); } } else if (entry instanceof ComponentDescription) { //System.out.println("EntryCD: getting name"); @@ -211,8 +213,7 @@ name = ((ComponentDescription) entry).sfCompleteName().toString(); // System.out.println("EntryCD: getting name - "+name); } catch (Exception ex) { - System.out.println("sfManagementConsole (getDN.ComponentDescription): "+ex.getMessage()); - //@TODO Log + if (sfLog().isErrorEnabled()) sfLog().error(ex); } } //System.out.println("getDN(): "+name); @@ -235,7 +236,7 @@ return ((getChildren())[index][1]); } catch (Exception ex) { //System.out.println(ex.toString()); - ex.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error(ex); } } @@ -314,8 +315,7 @@ data[index][0] = name; data[index][1] = value; } catch (Exception ex) { - System.err.println("sfManagementConsole.deployEntry.getAttributes: error reading "+ - name+" >"+ex.getMessage()); + if (sfLog().isErrorEnabled()) sfLog().error("sfManagementConsole.deployEntry.getAttributes: error reading "+name+" >"+ex.getMessage()); data[index][0] = name; data[index][1] = "Error:"+ex.toString(); index++; @@ -324,18 +324,17 @@ index++; } } catch (Exception ex1) { - ex1.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error(ex1); } } return data; } catch (java.rmi.NoSuchObjectException nso){ //Ignore: tipically component terminated and unexported from rmi - //@TODO: log + if (sfLog().isIgnoreEnabled()) sfLog().ignore(nso); return empty; } catch (Exception ex) { - System.err.println("Error DeployEntry.getAttributes()" + ex.toString()); - //ex.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error("Error DeployEntry.getAttributes()" + ex.toString(),ex); return empty; } } @@ -377,7 +376,7 @@ index++; } } catch (Exception ex1) { - ex1.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error(ex1); data[index][0] = name; data[index][1] = "Error:"+ex1.toString(); index++; @@ -385,7 +384,7 @@ } return data; } catch (Exception ex) { - ex.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error(ex); return null; } } @@ -548,7 +547,7 @@ counter++; } } catch (Exception ex1) { - ex1.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error(ex1); } } return counter; @@ -562,12 +561,12 @@ * */ public void info() { - System.out.println("Info: " + this.toString()); - System.out.println(" - #Children&CD:" + this.getChildrenCount()); - System.out.println(" - #Attributes:" + this.sizeAttributes()); - System.out.println(" - isLeaf():" + this.isLeaf()); - System.out.println(" - children:" + getChildren()); - System.out.println(" - attributes:" + getAttributes()); + sfLog().out("Info: " + this.toString()); + sfLog().out(" - #Children&CD:" + this.getChildrenCount()); + sfLog().out(" - #Attributes:" + this.sizeAttributes()); + sfLog().out(" - isLeaf():" + this.isLeaf()); + sfLog().out(" - children:" + getChildren()); + sfLog().out(" - attributes:" + getAttributes()); } // Parse Name of Entry (SFObjects) @@ -622,8 +621,7 @@ } } catch (Exception ex) { - //@Todo log this. - ex.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error(ex); } return entryName; @@ -747,11 +745,26 @@ return (new DeployEntry(value,newShowRootProcessName,this.showCDasChild)); } } catch (Exception ex) { - System.out.println("Error building mgt info: " + ex); + if (sfLog().isErrorEnabled()) sfLog().error("Error building mgt info: " + ex,ex); //return new DeployEntry((ex.getMessage()+(value.toString()))); } return new DeployEntry(); } + + private void initLog (){ + try { + if (entry instanceof Prim) { + this.sfLog=LogFactory.getLog((Prim)entry); + } else { + this.sfLog=LogFactory.getLog((String)entry); + } + } catch (Exception e) { + sfLog.error(e); + } + } + private LogSF sfLog(){ + return sfLog; + } } Modified: trunk/core/smartfrog/src/org/smartfrog/services/management/DeployEntryCellRenderer.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/management/DeployEntryCellRenderer.java 2006-10-24 16:48:46 UTC (rev 3520) +++ trunk/core/smartfrog/src/org/smartfrog/services/management/DeployEntryCellRenderer.java 2006-10-24 18:12:45 UTC (rev 3521) @@ -30,9 +30,14 @@ import org.smartfrog.sfcore.compound.Compound; import org.smartfrog.sfcore.processcompound.ProcessCompound; import org.smartfrog.sfcore.common.*; +import org.smartfrog.sfcore.logging.LogSF; +import org.smartfrog.sfcore.logging.LogFactory; public class DeployEntryCellRenderer extends DefaultTreeCellRenderer { + /** Log for this class, created using class name*/ + static LogSF sfLogStatic = LogFactory.getLog(DefaultTreeCellRenderer.class); + // icons for the Tree ImageIcon icon = null; private String image_path = "org/smartfrog/services/management/icons/"; @@ -89,7 +94,7 @@ try { return new ImageIcon(org.smartfrog.SFSystem.getByteArrayForResource(path)); } catch (SmartFrogException ex) { - ex.printStackTrace(); + if (sfLogStatic.isErrorEnabled()) sfLogStatic.error(ex); } return null; } Modified: trunk/core/smartfrog/src/org/smartfrog/services/management/DeployTreeModelSF.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/management/DeployTreeModelSF.java 2006-10-24 16:48:46 UTC (rev 3520) +++ trunk/core/smartfrog/src/org/smartfrog/services/management/DeployTreeModelSF.java 2006-10-24 18:12:45 UTC (rev 3521) @@ -26,12 +26,18 @@ import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; import org.smartfrog.sfcore.processcompound.ProcessCompound; +import org.smartfrog.sfcore.logging.LogSF; +import org.smartfrog.sfcore.logging.LogFactory; +import org.smartfrog.sfcore.prim.Prim; /** * DeployTreeModelSF is the deployable tree model for SmartFrog component * hierarchy. */ public class DeployTreeModelSF implements TreeModel { + /** Log for this class, created using class name*/ + LogSF sfLog = LogFactory.getLog(DeployTreeModelSF.class); + DeployEntry entry = null; //Prim or Compound @@ -54,12 +60,10 @@ try { this.entry = new DeployEntry(); this.listeners = new Vector(); - + initLog(); //System.out.println("Model created"); } catch (Exception ex) { - System.out.println(ex.toString()); - - //ex.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error(ex); } } @@ -75,12 +79,10 @@ boolean newShowRootProcessName = (showRootProcessName&&(entry instanceof ProcessCompound)); this.entry = new DeployEntry(entry, newShowRootProcessName,showCDasChild); this.listeners = new Vector(); - + initLog(); //System.out.println("DeployTreeModel created"); } catch (Exception ex) { - System.out.println("sfManagementConsole (DeployTreeModel): "+ex.toString()); - - //ex.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error("sfManagementConsole (DeployTreeModel): "+ex.toString(),ex); } } @@ -199,8 +201,22 @@ *@param node */ public void add(String node) { - System.out.println("Not implemented. DeployTreeModelSF: " + node); - + sfLog().out("Not implemented. DeployTreeModelSF: " + node); //entry.add(node); } + + private void initLog (){ + try { + if (entry.getEntry() instanceof Prim) { + this.sfLog=LogFactory.getLog((Prim)(entry.getEntry())); + } else { + this.sfLog=LogFactory.getLog((String)entry.getEntry()); + } + } catch (Exception e) { + sfLog.error(e); + } + } + private LogSF sfLog(){ + return sfLog; + } } Modified: trunk/core/smartfrog/src/org/smartfrog/services/management/DeployTreePanel.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/management/DeployTreePanel.java 2006-10-24 16:48:46 UTC (rev 3520) +++ trunk/core/smartfrog/src/org/smartfrog/services/management/DeployTreePanel.java 2006-10-24 18:12:45 UTC (rev 3521) @@ -35,12 +35,18 @@ import java.io.StringWriter; import java.io.PrintWriter; import org.smartfrog.sfcore.common.ContextImpl; +import org.smartfrog.sfcore.logging.LogSF; +import org.smartfrog.sfcore.logging.LogFactory; /** * Tree panel for SmartFrog hierarchy of components. * */ public class DeployTreePanel extends JPanel implements TreeSelectionListener { + + /** Log for this class, created using class name*/ + LogSF sfLog = LogFactory.getLog(this.getClass()); + BorderLayout borderLayout1 = new BorderLayout(); JSplitPane jSplitPane1 = new JSplitPane(); BorderLayout borderLayout2 = new BorderLayout(); @@ -80,7 +86,7 @@ treeInit(null, false,true); jbInit(); } catch (Exception ex) { - ex.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error (ex); } } @@ -98,7 +104,7 @@ jbInit(); popupinit(); } catch (Exception ex) { - ex.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error (ex); } } @@ -279,8 +285,8 @@ DeployTreePanel test = new DeployTreePanel(); mainFrame.getContentPane().add(test); mainFrame.setVisible(true); - System.out.println("Starting...a new adventure."); - System.out.println("...Finished"); + LogFactory.getLog(DeployTreePanel.class).out("Starting...a new adventure."); + LogFactory.getLog(DeployTreePanel.class).out("...Finished"); } /** @@ -306,7 +312,7 @@ Object attrib = this.table.getValueAt(this.table.getSelectedRow(), 0); resolveAttrib(attrib); } catch (Exception ex) { - //ex.printStackTrace(); + if (sfLog().isIgnoreEnabled()) sfLog().ignore(ex); } if (e.isPopupTrigger()) { @@ -342,7 +348,7 @@ ex.printStackTrace(pw); stackTrace = ("\r\n"+sw.toString()+"\r\n"); } catch (Exception e2) { - ex.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error (e2); } } String tempString = ""; @@ -362,8 +368,7 @@ "sfManagementConsole.deployEntry.getAttributes: error reading "+ attribName+" >"+rex.getMessage(); jTextArea1.setText(err); - - //ex.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error (err,rex); } } @@ -430,4 +435,12 @@ return value; } + /** + * Log for this class + * @return + */ + private LogSF sfLog(){ + return sfLog; + } + } Modified: trunk/core/smartfrog/src/org/smartfrog/services/management/NewAttributeDialog.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/management/NewAttributeDialog.java 2006-10-24 16:48:46 UTC (rev 3520) +++ trunk/core/smartfrog/src/org/smartfrog/services/management/NewAttributeDialog.java 2006-10-24 18:12:45 UTC (rev 3521) @@ -42,12 +42,16 @@ import org.smartfrog.sfcore.parser.Phases; import org.smartfrog.sfcore.parser.SFParser; import org.smartfrog.sfcore.reference.Reference; +import org.smartfrog.sfcore.logging.LogSF; +import org.smartfrog.sfcore.logging.LogFactory; /** * Dialog to create/add/modify attributes of a SmartFrog component */ public class NewAttributeDialog extends JDialog { + /** Log for this class, created using class name*/ + LogSF sfLog = LogFactory.getLog(this.getClass()); /** Panel. */ private JPanel panel = new JPanel(); /** Save button. */ @@ -125,7 +129,7 @@ } } } catch (Exception ex) { - ex.printStackTrace(); + if (sfLog().isErrorEnabled()) sfLog().error (ex); } } @@ -246,9 +250,7 @@ ... [truncated message content] |
From: <ju...@us...> - 2006-10-25 08:52:41
|
Revision: 3523 http://svn.sourceforge.net/smartfrog/?rev=3523&view=rev Author: julgui Date: 2006-10-25 01:52:26 -0700 (Wed, 25 Oct 2006) Log Message: ----------- Renamed reference in forrest docs from CVS to SVN Modified Paths: -------------- trunk/core/forrestsite/documentation.xml trunk/core/smartfrog/docs/DefaultParser.html trunk/core/smartfrog/forrest_skin/SFCore.xml trunk/core/smartfrog/forrest_skin/anttasks.xml trunk/core/smartfrog/forrest_skin/examples.xml trunk/core/smartfrog/forrest_skin/extras.xml trunk/core/smartfrog/forrest_skin/service.xml Modified: trunk/core/forrestsite/documentation.xml =================================================================== --- trunk/core/forrestsite/documentation.xml 2006-10-24 18:28:28 UTC (rev 3522) +++ trunk/core/forrestsite/documentation.xml 2006-10-25 08:52:26 UTC (rev 3523) @@ -180,7 +180,7 @@ <fileset dir="${ExtrasHOME}/eclipse/smartfrog-plugin/shared/docs"> <include name="Readme.*" /> <include name="images/**"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> </fileset> <fileset dir="${ExtrasHOME}/sfgui/docs"> <include name="SFGuiManual.*" /> Modified: trunk/core/smartfrog/docs/DefaultParser.html =================================================================== --- trunk/core/smartfrog/docs/DefaultParser.html 2006-10-24 18:28:28 UTC (rev 3522) +++ trunk/core/smartfrog/docs/DefaultParser.html 2006-10-25 08:52:26 UTC (rev 3523) @@ -110,21 +110,26 @@ <TR> <TD ALIGN=RIGHT VALIGN=BASELINE><A NAME="prod24">BaseComponent</A></TD> <TD ALIGN=CENTER VALIGN=BASELINE>::=</TD> -<TD ALIGN=LEFT VALIGN=BASELINE>( <NULL> | <A HREF="#prod25">BaseReference</A> )? ( <SEMICOLON> | ( <LBRACE> <A HREF="#prod2">AttributesNoEOF</A> <RBRACE> ) )</TD> +<TD ALIGN=LEFT VALIGN=BASELINE>( <NULL> | <A HREF="#prod25">LinkReference</A> )? ( <SEMICOLON> | ( <LBRACE> <A HREF="#prod2">AttributesNoEOF</A> <RBRACE> ) )</TD> </TR> <TR> <TD ALIGN=RIGHT VALIGN=BASELINE><A NAME="prod6">ReferenceNoEOF</A></TD> <TD ALIGN=CENTER VALIGN=BASELINE>::=</TD> -<TD ALIGN=LEFT VALIGN=BASELINE>( <LAZY> )? <A HREF="#prod25">BaseReference</A></TD> +<TD ALIGN=LEFT VALIGN=BASELINE>( <LAZY> )? <A HREF="#prod26">BaseReference</A></TD> </TR> <TR> -<TD ALIGN=RIGHT VALIGN=BASELINE><A NAME="prod25">BaseReference</A></TD> +<TD ALIGN=RIGHT VALIGN=BASELINE><A NAME="prod26">BaseReference</A></TD> <TD ALIGN=CENTER VALIGN=BASELINE>::=</TD> -<TD ALIGN=LEFT VALIGN=BASELINE><A HREF="#prod26">ReferencePart</A> ( <REFPARTSEP> <A HREF="#prod26">ReferencePart</A> )*</TD> +<TD ALIGN=LEFT VALIGN=BASELINE>( ( ( <OPTIONAL> ( <OPSTART> <A HREF="#prod11">Primitive</A> ")" )? )? <A HREF="#prod25">LinkReference</A> ) | ( <APPLY> <LBRACE> <A HREF="#prod2">AttributesNoEOF</A> <RBRACE> ) | ( <ASSERT> <LBRACE> <A HREF="#prod2">AttributesNoEOF</A> <RBRACE> ) )</TD> </TR> <TR> -<TD ALIGN=RIGHT VALIGN=BASELINE><A NAME="prod26">ReferencePart</A></TD> +<TD ALIGN=RIGHT VALIGN=BASELINE><A NAME="prod25">LinkReference</A></TD> <TD ALIGN=CENTER VALIGN=BASELINE>::=</TD> +<TD ALIGN=LEFT VALIGN=BASELINE><A HREF="#prod27">ReferencePart</A> ( <REFPARTSEP> <A HREF="#prod27">ReferencePart</A> )*</TD> +</TR> +<TR> +<TD ALIGN=RIGHT VALIGN=BASELINE><A NAME="prod27">ReferencePart</A></TD> +<TD ALIGN=CENTER VALIGN=BASELINE>::=</TD> <TD ALIGN=LEFT VALIGN=BASELINE>( <ROOT> )</TD> </TR> <TR> @@ -180,10 +185,10 @@ <TR> <TD ALIGN=RIGHT VALIGN=BASELINE><A NAME="prod11">Primitive</A></TD> <TD ALIGN=CENTER VALIGN=BASELINE>::=</TD> -<TD ALIGN=LEFT VALIGN=BASELINE>( ( <NULL> ) | ( <A HREF="#prod14">String</A> ) | ( <A HREF="#prod27">Number</A> ) | ( <A HREF="#prod28">Boolean</A> ) | ( <A HREF="#prod29">ByteArray</A> ) | ( <VECTORSTART> ( <A HREF="#prod11">Primitive</A> ( <COMMA> <A HREF="#prod11">Primitive</A> )* )? <VECTOREND> ) )</TD> +<TD ALIGN=LEFT VALIGN=BASELINE>( ( <NULL> ) | ( <A HREF="#prod14">String</A> ) | ( <A HREF="#prod28">Number</A> ) | ( <A HREF="#prod29">Boolean</A> ) | ( <A HREF="#prod30">ByteArray</A> ) | ( <VECTORSTART> ( <A HREF="#prod11">Primitive</A> ( <COMMA> <A HREF="#prod11">Primitive</A> )* )? <VECTOREND> ) | <DATA> <A HREF="#prod26">BaseReference</A> | <TBD> )</TD> </TR> <TR> -<TD ALIGN=RIGHT VALIGN=BASELINE><A NAME="prod27">Number</A></TD> +<TD ALIGN=RIGHT VALIGN=BASELINE><A NAME="prod28">Number</A></TD> <TD ALIGN=CENTER VALIGN=BASELINE>::=</TD> <TD ALIGN=LEFT VALIGN=BASELINE>( <DOUBLE> | <FLOAT> | <INTEGER> | <LONG> )</TD> </TR> @@ -193,12 +198,12 @@ <TD ALIGN=LEFT VALIGN=BASELINE>( ( <STRING> ) | ( <MULTILINESTRING> ) )</TD> </TR> <TR> -<TD ALIGN=RIGHT VALIGN=BASELINE><A NAME="prod28">Boolean</A></TD> +<TD ALIGN=RIGHT VALIGN=BASELINE><A NAME="prod29">Boolean</A></TD> <TD ALIGN=CENTER VALIGN=BASELINE>::=</TD> <TD ALIGN=LEFT VALIGN=BASELINE>( <TRUE> | <FALSE> )</TD> </TR> <TR> -<TD ALIGN=RIGHT VALIGN=BASELINE><A NAME="prod29">ByteArray</A></TD> +<TD ALIGN=RIGHT VALIGN=BASELINE><A NAME="prod30">ByteArray</A></TD> <TD ALIGN=CENTER VALIGN=BASELINE>::=</TD> <TD ALIGN=LEFT VALIGN=BASELINE>( ( <BYTEARRAY> ) )</TD> </TR> Modified: trunk/core/smartfrog/forrest_skin/SFCore.xml =================================================================== --- trunk/core/smartfrog/forrest_skin/SFCore.xml 2006-10-24 18:28:28 UTC (rev 3522) +++ trunk/core/smartfrog/forrest_skin/SFCore.xml 2006-10-25 08:52:26 UTC (rev 3523) @@ -26,7 +26,7 @@ <section id="BuildSmartFrog"> <title>Building SmartFrog System</title> <p>This document describes how to build the SmartFrog framework from its source files. It describes how to set up the development system, and how to execute the build scripts. -Links to document : <a href="build.html">HTML</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/build.html">CVS (Online)</a>" </p> +Links to document : <a href="build.html">HTML</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/build.html">SVN (Online)</a>" </p> </section> <section id="SmartFrogTutorial"> @@ -36,20 +36,20 @@ system configuration and deployment using the framework. It brings together material from The SmartFrog Reference Manual, The SmartFrog User Guide and The SmartFrog API (Javadoc), which should be consulted for details. -Links to document : <a href="SmartFrogTutorial.html">HTML</a> , <a href="SmartFrogTutorial.pdf">PDF</a> and "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/SmartFrogTutorial.pdf">CVS (Online)</a>" </p> +Links to document : <a href="SmartFrogTutorial.html">HTML</a> , <a href="SmartFrogTutorial.pdf">PDF</a> and "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/SmartFrogTutorial.pdf">SVN (Online)</a>" </p> </section> <section id="QuickReference"> <title>Quick Reference</title> <p>Quick Reference to SmartFrog Language Links to document : <a href="sfQuickRef.html">HTML</a> , <a href="sfQuickRef.pdf">PDF</a> and - <a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/sfQuickRef.pdf">CVS (Online)</a> </p> + <a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/sfQuickRef.pdf">SVN (Online)</a> </p> </section> <section id="UserManual"> <title>User Manual</title> <p>This manual is aimed at those wanting to run the SmartFrog framework. It assumes that user is working with the binary distribution of the SmartFrog framework. - Links to document : <a href="sfUserManual.html">HTML</a> , <a href="sfUserManual.pdf">PDF</a> , <a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/sfUserManual.pdf">CVS (Online)</a> </p> + Links to document : <a href="sfUserManual.html">HTML</a> , <a href="sfUserManual.pdf">PDF</a> , <a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/sfUserManual.pdf">SVN (Online)</a> </p> </section> <section id="Reference"> @@ -57,23 +57,23 @@ <p> This manual is aimed at those wanting to use and understand the workings of SmartFrog. It is not a basic tutorial, though hopefully it is not too obscure, either. The notation is described fully, as is the component model. The framework, however, is only outlined. For a detailed reference description of the framework APIs, users should refer to the accompanying Javadoc files. - Links to document : <a href="sfReference.html">HTML</a> , <a href="sfReference.pdf">PDF</a> , <a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/sfReference.pdf">CVS (Online)</a> </p> + Links to document : <a href="sfReference.html">HTML</a> , <a href="sfReference.pdf">PDF</a> , <a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/sfReference.pdf">SVN (Online)</a> </p> </section> <section id="WorkFlow"> <title>WorkFlow</title> <p>This document shows how the SmartFrog system has been extended to become a simple and lightweight workflow-like system (known as SmartFlow) for carrying out complex tasks requiring distributed actions on clusters of machines, and where ordering, recovery from failure, etc. are important features. - Links to document : <a href="sfWorkflow.html">HTML</a> , <a href="sfWorkflow.pdf">PDF</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/sfWorkflow.pdf">CVS (Online)</a>" </p> + Links to document : <a href="sfWorkflow.html">HTML</a> , <a href="sfWorkflow.pdf">PDF</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/sfWorkflow.pdf">SVN (Online)</a>" </p> </section> <section id="IDEDevelopment"> <title>IDE Development</title> <p>This document covers how to work with the SmartFrog source trees from inside IDEs. - Links to document : <a href="IDE_development.html">HTML </a> , <a href="IDE_development.pdf">PDF</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/IDE_development.pdf">CVS (Online)</a>" </p> + Links to document : <a href="IDE_development.html">HTML </a> , <a href="IDE_development.pdf">PDF</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/IDE_development.pdf">SVN (Online)</a>" </p> </section> <section id="Logging"> <title>Logging</title> <p>SmartFrog has a logging system as part of its fundamental core which can be extended in interesting ways, but which provides the component writer with that consistent interface common for all components and the core of SmartFrog itself. - Links to document : <a href="sfLogging.html">HTML</a> , <a href="sfLogging.pdf">PDF</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/sfLogging.pdf">CVS (Online)</a>" </p> + Links to document : <a href="sfLogging.html">HTML</a> , <a href="sfLogging.pdf">PDF</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/sfLogging.pdf">SVN (Online)</a>" </p> </section> </body> Modified: trunk/core/smartfrog/forrest_skin/anttasks.xml =================================================================== --- trunk/core/smartfrog/forrest_skin/anttasks.xml 2006-10-24 18:28:28 UTC (rev 3522) +++ trunk/core/smartfrog/forrest_skin/anttasks.xml 2006-10-25 08:52:26 UTC (rev 3523) @@ -25,7 +25,7 @@ <title>Ant task Index</title> <p>These are the Ant tasks to deploy and undeploy applications with SmartFrog during a build process. Links to document : <a href="antTasksManual/index.html">HTML</a> and - "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/antTasksManual/index.html">CVS (Online)</a>" </p> + "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/antTasksManual/index.html">SVN (Online)</a>" </p> </section> Modified: trunk/core/smartfrog/forrest_skin/examples.xml =================================================================== --- trunk/core/smartfrog/forrest_skin/examples.xml 2006-10-24 18:28:28 UTC (rev 3522) +++ trunk/core/smartfrog/forrest_skin/examples.xml 2006-10-25 08:52:26 UTC (rev 3523) @@ -24,7 +24,7 @@ <section id="DynamicWebserverExample"> <title>Dynamic Webserver Example </title> <p>The Dynamic Web Example is an example of an adaptive application built using SmartFrog. The concept is relatively simple, in that the system implements a web server that adapts to load by deploying or removing web servers according to the load. - Links to document : <a href="sfDynamicWebServerExample.html">HTML</a> , <a href="sfDynamicWebServerExample.pdf">PDF</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/sfDynamicWebServerExample.pdf">CVS (Online)</a>" </p> + Links to document : <a href="sfDynamicWebServerExample.html">HTML</a> , <a href="sfDynamicWebServerExample.pdf">PDF</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/sfDynamicWebServerExample.pdf">SVN (Online)</a>" </p> </section> Modified: trunk/core/smartfrog/forrest_skin/extras.xml =================================================================== --- trunk/core/smartfrog/forrest_skin/extras.xml 2006-10-24 18:28:28 UTC (rev 3522) +++ trunk/core/smartfrog/forrest_skin/extras.xml 2006-10-25 08:52:26 UTC (rev 3523) @@ -24,27 +24,27 @@ <section id="CSFExtentions"> <title>CSF Extentions</title> <p>This document describes some extensions provided to allow experimentation with constraint resolution technologies in conjunction with the SmartFrog language. These extensions are not intended to provide the definitive SmartFrog Constraint System, but are designed to allow a wide variety of different technologies to be used for this purpose. Consequently, the extensions themselves provide very limited syntactic or semantic support, and mostly the support is in the form of free textual annotations that are then interpreted by an appropriate plug-in for the specific constraint solver in use. - Links to document : <a href="csfExtensions.html">HTML</a> , <a href="csfExtensions.pdf">PDF</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/csfExtensions.pdf">CVS (Online)</a>" </p> + Links to document : <a href="csfExtensions.html">HTML</a> , <a href="csfExtensions.pdf">PDF</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/csfExtensions.pdf">SVN (Online)</a>" </p> </section> <section id="SFDebugger"> <title>SmartFrog Debugger</title> <p>This document describes about SmartFrog debugger which is a tool designed to allow debugging of SmartFrog component descriptions at various lifecycle methods at runtime. - Links to document : <a href="sfDebugger_readme.html">HTML</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/extras/sfDebugger/doc/sfDebugger_readme.sxw">CVS (Online)</a>" </p> + Links to document : <a href="sfDebugger_readme.html">HTML</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/extras/sfDebugger/doc/sfDebugger_readme.sxw">SVN (Online)</a>" </p> </section> <section id="EclipsePlugin"> <title>SmartFrog Eclipse plug-in</title> <p>Ths document describes about the SmartFrog Eclipse plug-in that provides the user with one common integrated development environment (IDE) in which to develop SmartFrog description files and Java component files. The Eclipse platform offers the benefits of project management, version control, and sophisticated Java development tools for writing, compiling, testing, and debugging Java applications. - Links to document : <a href="Readme.html">HTML</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/extras/eclipse/smartfrog-plugin/shared/docs/Readme.html">CVS (Online)</a>" </p> + Links to document : <a href="Readme.html">HTML</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/extras/eclipse/smartfrog-plugin/shared/docs/Readme.html">SVN (Online)</a>" </p> </section> <section id="SFGui"> <title>SFGui</title> <p>This document describes about SFGui whic is a light and simple editor to help in writing and debugging SmartFrog descriptions. - Links to document : <a href="SFGuiManual.html">HTML</a> , <a href="SFGuiManual.pdf">PDF</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/extras/sfgui/docs/SFGuiManual.pdf">CVS (Online)</a>" </p> + Links to document : <a href="SFGuiManual.html">HTML</a> , <a href="SFGuiManual.pdf">PDF</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/extras/sfgui/docs/SFGuiManual.pdf">SVN (Online)</a>" </p> </section> Modified: trunk/core/smartfrog/forrest_skin/service.xml =================================================================== --- trunk/core/smartfrog/forrest_skin/service.xml 2006-10-24 18:28:28 UTC (rev 3522) +++ trunk/core/smartfrog/forrest_skin/service.xml 2006-10-25 08:52:26 UTC (rev 3523) @@ -26,19 +26,19 @@ <title>Java</title> <p> These tasks make it easier to execute Java programs in separate processes. The Java component runs Java Programs. It is an extension of the runshell component, so all attributes associated with that are usable. the exception is the shellCmd attribute, which is rebound to the JVM - Links to document : <a href="components/java.html">HTML</a> , <a href="components/java.pdf">PDF</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/components/java.pdf">CVS(Online)</a>" </p> + Links to document : <a href="components/java.html">HTML</a> , <a href="components/java.pdf">PDF</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/components/java.pdf">SVN(Online)</a>" </p> </section> <section id="FileSystem"> <title>File System</title> <p> The file components provide a cross platform way of representing files. - Links to document : <a href="components/filesystem.html">HTML</a> , <a href="components/filesystem.pdf">PDF</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/components/filesystem.pdf">CVS (Online)</a>" </p> + Links to document : <a href="components/filesystem.html">HTML</a> , <a href="components/filesystem.pdf">PDF</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/components/filesystem.pdf">SVN (Online)</a>" </p> </section> <section id="Assertions"> <title>Assertions</title> <p>The assertion components in SmartFrog aim to provide a way of validating parts of the deployment descriptor. They also enable one to verify that methods invoked on referenced component instances return true or false, which can be used to incorporate more checks into the system's operation. - Links to document : <a href="components/assertions.html">HTML</a> , <a href="components/assertions.pdf">PDF</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/components/assertions.pdf">CVS (Online)</a>" </p> + Links to document : <a href="components/assertions.html">HTML</a> , <a href="components/assertions.pdf">PDF</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/components/assertions.pdf">SVN (Online)</a>" </p> </section> <section id="DecPageLoading"> <title>Declarative Page Loading</title> @@ -49,7 +49,7 @@ <section id="ShellScript"> <title>ShellScript </title> <p>This document shows how the SmartFrog system can make this process easy through the use of the process management and shell scripting components provided as part of the core release. - Links to document : <a href="sfShellScript.html">HTML</a> , <a href="sfShellScript.pdf">PDF</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/sfShellScript.pdf">CVS (Online) </a>" </p> + Links to document : <a href="sfShellScript.html">HTML</a> , <a href="sfShellScript.pdf">PDF</a> , "<a href="http://svn.sourceforge.net/viewvc/*checkout*/smartfrog/trunk/core/smartfrog/docs/sfShellScript.pdf">SVN (Online) </a>" </p> </section> @@ -57,7 +57,7 @@ <section id="WebComponents"> <title>WebComponents </title> <p>The SmartFrog Web components provide a set of components for defining web applications (WAR applications), Enterprise (EAR) applications and Servlets for deployment onto a Java Application Server such as JBoss, WebLogic or Apache Geronmio, or a Java Web Server such as Jetty or Tomcat. It also includes a liveness page component, that can retrieve an HTTP page from a server as its liveness test, integrating web page visiblity with application liveness. - Links to document : <a href="sfWebComponents.html">HTML</a> , "<a href="http://cvs.sourceforge.net/viewcvs.py/*checkout*/smartfrog/core/smartfrog/docs/sfWebComponents.sxw">CVS(Online)</a>" </p> + Links to document : <a href="sfWebComponents.html">HTML</a> , "<a href="http://cvs.sourceforge.net/viewcvs.py/*checkout*/smartfrog/core/smartfrog/docs/sfWebComponents.sxw">SVN(Online)</a>" </p> </section> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2006-10-26 17:20:50
|
Revision: 3532 http://svn.sourceforge.net/smartfrog/?rev=3532&view=rev Author: julgui Date: 2006-10-26 10:20:17 -0700 (Thu, 26 Oct 2006) Log Message: ----------- Renamed reference in forrest docs from CVS to SVN Modified Paths: -------------- trunk/core/antbuild/xml/core.xml trunk/core/common.xml trunk/core/components/ant/buildRelease.xml trunk/core/components/anubis/buildRelease.xml trunk/core/components/anubisdeployer/buildRelease.xml trunk/core/components/buildRelease-template.xml trunk/core/components/buildRelease.xml trunk/core/components/dns/buildRelease.xml trunk/core/components/emailer/buildRelease.xml trunk/core/components/jetty/buildRelease.xml trunk/core/components/loggingservices/buildRelease.xml trunk/core/components/net/buildRelease.xml trunk/core/components/rest/build.xml trunk/core/components/scripting/buildRelease.xml trunk/core/components/slp/buildRelease.xml trunk/core/components/ssh/buildRelease.xml trunk/core/components/tomcat/buildRelease.xml trunk/core/components/www/buildRelease.xml trunk/core/components/xml/buildRelease.xml trunk/core/extras/ant/build.xml trunk/core/extras/eclipse/smartfrog-plugin/master.xml trunk/core/extras/eclipse/smartfrog-plugin/pull.xml trunk/core/extras/eclipse/smartfrog-plugin/smartfrog-plugin-project/build.xml trunk/core/sfdeprecated/logger/buildRelease.xml trunk/core/sfdeprecated/utils/buildRelease.xml trunk/core/smartfrog/buildRelease.xml trunk/core/smartfrog/documentation.xml trunk/core/testharness/buildRelease.xml Modified: trunk/core/antbuild/xml/core.xml =================================================================== --- trunk/core/antbuild/xml/core.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/antbuild/xml/core.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -167,9 +167,9 @@ <!-- ========================================================== --> <target name="load-library-versions" depends="core.init-core"> - <!-- per project, CVS managed override --> + <!-- per project, SVN managed override --> <property file="libraries.properties" /> - <!-- central CVS managed libraries list --> + <!-- central SVN managed libraries list --> <property file="${smartfrog.components.dir}/libraries.properties" /> </target> Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/common.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -1274,9 +1274,9 @@ <!-- init all the maven2 support --> <!-- ========================================================== --> <target name="m2-init" depends="init,init-proxy,declare-extended-smartfrog-tasks"> - <!-- per project, CVS managed override --> + <!-- per project, SVN managed override --> <property file="libraries.properties" /> - <!-- central CVS managed libraries list --> + <!-- central SVN managed libraries list --> <property file="${smartfrog.components.dir}/libraries.properties" /> <!-- Maven2 stuff Modified: trunk/core/components/ant/buildRelease.xml =================================================================== --- trunk/core/components/ant/buildRelease.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/components/ant/buildRelease.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -68,7 +68,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> <exclude name="**/*.dfPackage"/> <exclude name="**/Cvs"/> <exclude name="**/.#*"/> @@ -134,7 +134,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> <exclude name="**/*.dfPackage"/> <exclude name="**/Cvs"/> <exclude name="bin/tools/**"/> Modified: trunk/core/components/anubis/buildRelease.xml =================================================================== --- trunk/core/components/anubis/buildRelease.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/components/anubis/buildRelease.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -68,7 +68,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> <exclude name="**/*.dfPackage"/> <exclude name="**/Cvs"/> <exclude name="**/.#*"/> @@ -132,7 +132,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> <exclude name="**/*.dfPackage"/> <exclude name="**/Cvs"/> <exclude name="bin/tools/**"/> Modified: trunk/core/components/anubisdeployer/buildRelease.xml =================================================================== --- trunk/core/components/anubisdeployer/buildRelease.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/components/anubisdeployer/buildRelease.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -68,7 +68,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> <exclude name="**/*.dfPackage"/> <exclude name="**/Cvs"/> <exclude name="**/.#*"/> @@ -134,7 +134,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> <exclude name="**/*.dfPackage"/> <exclude name="**/Cvs"/> <exclude name="bin/tools/**"/> Modified: trunk/core/components/buildRelease-template.xml =================================================================== --- trunk/core/components/buildRelease-template.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/components/buildRelease-template.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -235,7 +235,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> <exclude name="**/*.dfPackage"/> <exclude name="**/Cvs"/> <exclude name="**/.#*"/> @@ -300,7 +300,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> <exclude name="**/*.dfPackage"/> <exclude name="**/Cvs"/> <exclude name="bin/tools/**"/> Modified: trunk/core/components/buildRelease.xml =================================================================== --- trunk/core/components/buildRelease.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/components/buildRelease.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -161,7 +161,7 @@ <include name="${dist}/src/**"/> <include name="${dist}/build.xml"/> <include name="${dist}/src.zip"/> - <exclude name="**/CVS" /> + <exclude name="**/SVN" /> <exclude name="**/*.dfPackage" /> <exclude name="**/Cvs" /> <exclude name="**/.#*" /> @@ -226,7 +226,7 @@ <include name="${dist}/src/**"/> <include name="${dist}/build.xml"/> <include name="${dist}/src.zip"/> - <exclude name="**/CVS" /> + <exclude name="**/SVN" /> <exclude name="**/*.dfPackage" /> <exclude name="**/Cvs" /> <exclude name="**/.#*" /> Modified: trunk/core/components/dns/buildRelease.xml =================================================================== --- trunk/core/components/dns/buildRelease.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/components/dns/buildRelease.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -68,7 +68,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> <exclude name="**/*.dfPackage"/> <exclude name="**/Cvs"/> <exclude name="**/.#*"/> @@ -134,7 +134,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> <exclude name="**/*.dfPackage"/> <exclude name="**/Cvs"/> <exclude name="bin/tools/**"/> Modified: trunk/core/components/emailer/buildRelease.xml =================================================================== --- trunk/core/components/emailer/buildRelease.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/components/emailer/buildRelease.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -68,7 +68,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> <exclude name="**/*.dfPackage"/> <exclude name="**/Cvs"/> <exclude name="**/.#*"/> @@ -134,7 +134,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> <exclude name="**/*.dfPackage"/> <exclude name="**/Cvs"/> <exclude name="bin/tools/**"/> Modified: trunk/core/components/jetty/buildRelease.xml =================================================================== --- trunk/core/components/jetty/buildRelease.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/components/jetty/buildRelease.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -68,7 +68,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> <exclude name="**/*.dfPackage"/> <exclude name="**/Cvs"/> <exclude name="**/.#*"/> @@ -134,7 +134,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> <exclude name="**/*.dfPackage"/> <exclude name="**/Cvs"/> <exclude name="bin/tools/**"/> Modified: trunk/core/components/loggingservices/buildRelease.xml =================================================================== --- trunk/core/components/loggingservices/buildRelease.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/components/loggingservices/buildRelease.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -211,7 +211,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS" /> + <exclude name="**/SVN" /> <exclude name="**/*.dfPackage" /> <exclude name="**/Cvs" /> <exclude name="**/.#*" /> @@ -276,7 +276,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS" /> + <exclude name="**/SVN" /> <exclude name="**/*.dfPackage" /> <exclude name="**/Cvs" /> <exclude name="bin/tools/**"/> Modified: trunk/core/components/net/buildRelease.xml =================================================================== --- trunk/core/components/net/buildRelease.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/components/net/buildRelease.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -226,7 +226,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> <exclude name="**/*.dfPackage"/> <exclude name="**/Cvs"/> <exclude name="**/.#*"/> @@ -291,7 +291,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> <exclude name="**/*.dfPackage"/> <exclude name="**/Cvs"/> <exclude name="bin/tools/**"/> Modified: trunk/core/components/rest/build.xml =================================================================== --- trunk/core/components/rest/build.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/components/rest/build.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -75,7 +75,7 @@ basedir="${build.dir}"> <exclude name="build.xml"/> <exclude name="WEB-INF/web.xml"/> - <exclude name="**/CVS/**"/> + <exclude name="**/SVN/**"/> <exclude name="src/**"/> </war> Modified: trunk/core/components/scripting/buildRelease.xml =================================================================== --- trunk/core/components/scripting/buildRelease.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/components/scripting/buildRelease.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -213,7 +213,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS" /> + <exclude name="**/SVN" /> <exclude name="**/*.dfPackage" /> <exclude name="**/Cvs" /> <exclude name="**/.#*" /> @@ -278,7 +278,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> <exclude name="**/*.dfPackage"/> <exclude name="**/Cvs"/> <exclude name="bin/tools/**"/> Modified: trunk/core/components/slp/buildRelease.xml =================================================================== --- trunk/core/components/slp/buildRelease.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/components/slp/buildRelease.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -231,7 +231,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> <exclude name="**/*.dfPackage"/> <exclude name="**/Cvs"/> <exclude name="**/.#*"/> @@ -300,7 +300,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> <exclude name="**/*.dfPackage"/> <exclude name="**/Cvs"/> <exclude name="bin/tools/**"/> Modified: trunk/core/components/ssh/buildRelease.xml =================================================================== --- trunk/core/components/ssh/buildRelease.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/components/ssh/buildRelease.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -210,7 +210,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS" /> + <exclude name="**/SVN" /> <exclude name="**/*.dfPackage" /> <exclude name="**/Cvs" /> <exclude name="**/.#*" /> @@ -274,7 +274,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS" /> + <exclude name="**/SVN" /> <exclude name="**/*.dfPackage" /> <exclude name="**/Cvs" /> <exclude name="bin/tools/**"/> Modified: trunk/core/components/tomcat/buildRelease.xml =================================================================== --- trunk/core/components/tomcat/buildRelease.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/components/tomcat/buildRelease.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -66,7 +66,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> <exclude name="**/*.dfPackage"/> <exclude name="**/Cvs"/> <exclude name="**/.#*"/> @@ -129,7 +129,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> <exclude name="**/*.dfPackage"/> <exclude name="**/Cvs"/> <exclude name="bin/tools/**"/> Modified: trunk/core/components/www/buildRelease.xml =================================================================== --- trunk/core/components/www/buildRelease.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/components/www/buildRelease.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -68,7 +68,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> <exclude name="**/*.dfPackage"/> <exclude name="**/Cvs"/> <exclude name="**/.#*"/> @@ -137,7 +137,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> <exclude name="**/*.dfPackage"/> <exclude name="**/Cvs"/> <exclude name="bin/tools/**"/> Modified: trunk/core/components/xml/buildRelease.xml =================================================================== --- trunk/core/components/xml/buildRelease.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/components/xml/buildRelease.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -66,7 +66,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> <exclude name="**/*.dfPackage"/> <exclude name="**/Cvs"/> <exclude name="**/.#*"/> @@ -132,7 +132,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> <exclude name="**/*.dfPackage"/> <exclude name="**/Cvs"/> <exclude name="bin/tools/**"/> Modified: trunk/core/extras/ant/build.xml =================================================================== --- trunk/core/extras/ant/build.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/extras/ant/build.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -240,7 +240,7 @@ </target> <!-- ==================================================================== --> -<!-- this little section hacks into Ant's own CVS tree to hand off document +<!-- this little section hacks into Ant's own SVN tree to hand off document generation. It is nasty because the automated docgen is not quite production ready --> @@ -262,7 +262,7 @@ refid="xdoclet.extra.classpath"/> </target> -<!-- probe for xdocs, which is only in CVS, not redist packages --> +<!-- probe for xdocs, which is only in SVN, not redist packages --> <target name="probe-xdocs" depends="init-xdocs" > <available property="xdocs.found" file="${xdocs.dir}/build.xml"/> </target> Modified: trunk/core/extras/eclipse/smartfrog-plugin/master.xml =================================================================== --- trunk/core/extras/eclipse/smartfrog-plugin/master.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/extras/eclipse/smartfrog-plugin/master.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -1,7 +1,7 @@ <project name="smartfrog-plugin" default="build" basedir="."> <property environment="env"/> - <property name="cvs.root" value=":pserver:${env.CVS_USR}:${env.CVS_PWD}@${env.CVS_TUNNEL}:/cvs"/> + <property name="cvs.root" value=":pserver:${env.SVN_USR}:${env.SVN_PWD}@${env.SVN_TUNNEL}:/cvs"/> <target name="build"> <cvs cvsRoot="${cvs.root}" package="${ant.project.name}/build.xml" quiet="true" dest=".." /> Modified: trunk/core/extras/eclipse/smartfrog-plugin/pull.xml =================================================================== --- trunk/core/extras/eclipse/smartfrog-plugin/pull.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/extras/eclipse/smartfrog-plugin/pull.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -28,7 +28,7 @@ </target> <target name="pullSource"> - <cvs cvsRoot=":pserver:${env.CVS_USR}:${env.CVS_PWD}@${env.CVS_TUNNEL}:/cvs" + <cvs cvsRoot=":pserver:${env.SVN_USR}:${env.SVN_PWD}@${env.SVN_TUNNEL}:/cvs" package="${ant.project.name}/src" date="${Label}" dest=".." @@ -36,7 +36,7 @@ </target> <target name="pullTest"> - <cvs cvsRoot=":pserver:${env.CVS_USR}:${env.CVS_PWD}@${env.CVS_TUNNEL}:/cvs" + <cvs cvsRoot=":pserver:${env.SVN_USR}:${env.SVN_PWD}@${env.SVN_TUNNEL}:/cvs" package="${ant.project.name}/test" date="${Label}" dest=".." @@ -44,7 +44,7 @@ </target> <target name="pullDistribution"> - <cvs cvsRoot=":pserver:${env.CVS_USR}:${env.CVS_PWD}@${env.CVS_TUNNEL}:/cvs" + <cvs cvsRoot=":pserver:${env.SVN_USR}:${env.SVN_PWD}@${env.SVN_TUNNEL}:/cvs" package="${ant.project.name}/${dist}" date="${Label}" dest=".." Modified: trunk/core/extras/eclipse/smartfrog-plugin/smartfrog-plugin-project/build.xml =================================================================== --- trunk/core/extras/eclipse/smartfrog-plugin/smartfrog-plugin-project/build.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/extras/eclipse/smartfrog-plugin/smartfrog-plugin-project/build.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -70,7 +70,7 @@ <copy todir="${plugin.dest}"> <fileset dir="${basedir}"> - <exclude name="**/CVS/**"/> + <exclude name="**/SVN/**"/> <!-- key directories --> <include name="SmartFrog/**"/> <include name="icons/**"/> Modified: trunk/core/sfdeprecated/logger/buildRelease.xml =================================================================== --- trunk/core/sfdeprecated/logger/buildRelease.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/sfdeprecated/logger/buildRelease.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -198,7 +198,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS" /> + <exclude name="**/SVN" /> <exclude name="**/*.dfPackage" /> <exclude name="**/Cvs" /> <exclude name="**/.#*" /> @@ -262,7 +262,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS" /> + <exclude name="**/SVN" /> <exclude name="**/*.dfPackage" /> <exclude name="**/Cvs" /> <exclude name="bin/tools/**"/> Modified: trunk/core/sfdeprecated/utils/buildRelease.xml =================================================================== --- trunk/core/sfdeprecated/utils/buildRelease.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/sfdeprecated/utils/buildRelease.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -210,7 +210,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS" /> + <exclude name="**/SVN" /> <exclude name="**/*.dfPackage" /> <exclude name="**/Cvs" /> <exclude name="**/.#*" /> @@ -274,7 +274,7 @@ <include name="LICENSE.txt"/> <include name="changes.txt"/> <include name="readme.txt"/> - <exclude name="**/CVS" /> + <exclude name="**/SVN" /> <exclude name="**/*.dfPackage" /> <exclude name="**/Cvs" /> <exclude name="bin/tools/**"/> Modified: trunk/core/smartfrog/buildRelease.xml =================================================================== --- trunk/core/smartfrog/buildRelease.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/smartfrog/buildRelease.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -280,7 +280,7 @@ <include name="changes.txt"/> <include name="readme.txt"/> <include name="sf-build-version.properties"/> - <exclude name="**/CVS" /> + <exclude name="**/SVN" /> <exclude name="**/*.dfPackage" /> <exclude name="**/Cvs" /> <exclude name="**/.#*" /> @@ -409,7 +409,7 @@ <include name="changes.txt"/> <include name="readme.txt"/> <include name="sf-build-version.properties"/> - <exclude name="**/CVS" /> + <exclude name="**/SVN" /> <exclude name="**/*.dfPackage" /> <exclude name="**/Cvs" /> <exclude name="bin/tools/**"/> Modified: trunk/core/smartfrog/documentation.xml =================================================================== --- trunk/core/smartfrog/documentation.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/smartfrog/documentation.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -134,7 +134,7 @@ <fileset dir="${ExtrasHOME}/eclipse/smartfrog-plugin/shared/docs"> <include name="Readme.*" /> <include name="images/**"/> - <exclude name="**/CVS"/> + <exclude name="**/SVN"/> </fileset> <fileset dir="${ExtrasHOME}/sfgui/docs"> <include name="SFGuiManual.*" /> Modified: trunk/core/testharness/buildRelease.xml =================================================================== --- trunk/core/testharness/buildRelease.xml 2006-10-26 16:50:33 UTC (rev 3531) +++ trunk/core/testharness/buildRelease.xml 2006-10-26 17:20:17 UTC (rev 3532) @@ -128,7 +128,7 @@ <include name="build.xml"/> <include name="buildRelease.xml"/> <include name="rmitargets"/> - <exclude name="**/CVS" /> + <exclude name="**/SVN" /> <exclude name="**/*.dfPackage" /> <exclude name="**/Cvs" /> <exclude name="**/.#*" /> @@ -151,7 +151,7 @@ <include name="build.xml"/> <include name="buildRelease.xml"/> <include name="rmitargets"/> - <exclude name="**/CVS" /> + <exclude name="**/SVN" /> <exclude name="**/*.dfPackage" /> <exclude name="**/Cvs" /> <exclude name="**/.#*" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2006-10-26 18:08:46
|
Revision: 3534 http://svn.sourceforge.net/smartfrog/?rev=3534&view=rev Author: julgui Date: 2006-10-26 11:08:34 -0700 (Thu, 26 Oct 2006) Log Message: ----------- Build messages simplified. Modified Paths: -------------- trunk/core/common.xml trunk/core/components/build.xml trunk/core/components/releaseBuild.xml trunk/core/smartfrog/build.xml trunk/core/smartfrog/releaseBuild.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2006-10-26 17:26:08 UTC (rev 3533) +++ trunk/core/common.xml 2006-10-26 18:08:34 UTC (rev 3534) @@ -453,9 +453,7 @@ > <!-- Java Docs for all --> <echo message=""/> - <echo message="------------------------------------------------------------------------"/> - <echo message=" Creating Java Docs for ${javadoc.header} [${dist.jdocs.dir}]"/> - <echo message="------------------------------------------------------------------------"/> + <echo message="----------------Creating Java Docs for ${javadoc.header} [${dist.jdocs.dir}]---------------"/> <mkdir dir="${dist.jdocs.dir}"/> <sf-javadoc sourcepath="${src.dir}" Modified: trunk/core/components/build.xml =================================================================== --- trunk/core/components/build.xml 2006-10-26 17:26:08 UTC (rev 3533) +++ trunk/core/components/build.xml 2006-10-26 18:08:34 UTC (rev 3534) @@ -457,9 +457,7 @@ <target name="jdocs" depends="init, initjdocs" description="Generates the API documentation"> <!-- Java Docs for all --> <echo message=""/> - <echo message="------------------------------------------------------------------------"/> - <echo message=" Creating Java Docs for ${Name.System} ${version} [${dist.jdocs.dir}]"/> - <echo message="------------------------------------------------------------------------"/> + <echo message="---------Creating Java Docs for ${Name.System} ${version} [${dist.jdocs.dir}]--------"/> <sf-javadoc packagenames="org.smartfrog.*" destdir="${comp.dist.jdocs.dir}" Modified: trunk/core/components/releaseBuild.xml =================================================================== --- trunk/core/components/releaseBuild.xml 2006-10-26 17:26:08 UTC (rev 3533) +++ trunk/core/components/releaseBuild.xml 2006-10-26 18:08:34 UTC (rev 3534) @@ -66,9 +66,8 @@ <property name="year" value=""/> <echo message=""/> <echo message="==================================================================="/> - <echo message="= ${Name} ${version}"/> - <echo message="= ${name} "/> - <echo message="==================================================================="/> + <echo message="= ${Name} ${version}, ${name} > + <echo message=""/> </target> <!-- =================================================================== --> @@ -185,9 +184,7 @@ <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="------------------------------------------------------------------------"/> + <echo message="-------Creating Java Docs for ${Name} examples [${jdocs}]----------"/> <mkdir dir="${jdocs}"/> <javadoc packagenames="org.smartfrog.*" sourcepath="${src}" Modified: trunk/core/smartfrog/build.xml =================================================================== --- trunk/core/smartfrog/build.xml 2006-10-26 17:26:08 UTC (rev 3533) +++ trunk/core/smartfrog/build.xml 2006-10-26 18:08:34 UTC (rev 3534) @@ -455,9 +455,7 @@ 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="------------------------------------------------------------------------"/> + <echo message="------------Creating Java Docs for ${Name.System} ${version} [${dist.dir}/${jdocs}]---------"/> <mkdir dir="${dist.jdocs.dir}"/> <javadoc packagenames="org.smartfrog.*" Modified: trunk/core/smartfrog/releaseBuild.xml =================================================================== --- trunk/core/smartfrog/releaseBuild.xml 2006-10-26 17:26:08 UTC (rev 3533) +++ trunk/core/smartfrog/releaseBuild.xml 2006-10-26 18:08:34 UTC (rev 3534) @@ -254,9 +254,7 @@ <target name="jdocs" depends="init, generateversion" description="Generates the API documentation"> <!-- Java Docs for all --> <echo message=""/> - <echo message="------------------------------------------------------------------------"/> - <echo message=" Creating Java Docs for ${Name} examples [${jdocs}]"/> - <echo message="------------------------------------------------------------------------"/> + <echo message="------- Creating Java Docs for ${Name} examples [${jdocs}]--------"/> <mkdir dir="${jdocs}"/> <javadoc packagenames="org.smartfrog.examples.*" sourcepath="${src}" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2006-10-27 09:16:04
|
Revision: 3535 http://svn.sourceforge.net/smartfrog/?rev=3535&view=rev Author: julgui Date: 2006-10-27 02:15:41 -0700 (Fri, 27 Oct 2006) Log Message: ----------- Less verbose build.xml. From <echo message="==================================================================="/> <echo message="= ${Name.System} ${version}"/> <echo message="= ${Name.Company} "/> <echo message="==================================================================="/> <echo message=""/> <echo message="(${ant.version})"/> To: <echo message="==================================================================="/> <echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> Modified Paths: -------------- trunk/core/components/ant/build.xml trunk/core/components/arithmetic-testharness/build.xml trunk/core/components/dns/build.xml trunk/core/components/emailer/build.xml trunk/core/components/loggingservices/build.xml trunk/core/components/net/build.xml trunk/core/components/scripting/build.xml trunk/core/components/sfinstaller/build.xml trunk/core/components/ssh/build.xml trunk/core/extras/sfDebugger/build.xml trunk/core/extras/sfgui/build.xml trunk/core/sfdeprecated/logger/build.xml trunk/core/sfdeprecated/utils/build.xml Modified: trunk/core/components/ant/build.xml =================================================================== --- trunk/core/components/ant/build.xml 2006-10-26 18:08:34 UTC (rev 3534) +++ trunk/core/components/ant/build.xml 2006-10-27 09:15:41 UTC (rev 3535) @@ -62,14 +62,10 @@ <property name="version" value="smartfrog components"/> <!--property name="Version" value="1.00.000_beta"/--> <property name="year" value="2006"/> - <echo message=""/> <echo message="==================================================================="/> - <echo message="= ${Name.System} ${version}"/> - <echo message="= ${Name.Company} "/> + <echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> <echo message="==================================================================="/> - <echo message=""/> - <echo message="(${ant.version})"/> <available property="nice.task.present" classname="org.apache.tools.ant.taskdefs.Nice" /> </target> Modified: trunk/core/components/arithmetic-testharness/build.xml =================================================================== --- trunk/core/components/arithmetic-testharness/build.xml 2006-10-26 18:08:34 UTC (rev 3534) +++ trunk/core/components/arithmetic-testharness/build.xml 2006-10-27 09:15:41 UTC (rev 3535) @@ -53,12 +53,8 @@ <property name="year" value="2005"/> <echo message=""/> - <echo message="==================================================================="/> - <echo message="= ${Name.System} ${version}"/> - <echo message="= ${Name.Company} "/> - <echo message="==================================================================="/> - <echo message=""/> - <echo message="(${ant.version})"/> +<echo message="==================================================================="/> +<echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> </target> Modified: trunk/core/components/dns/build.xml =================================================================== --- trunk/core/components/dns/build.xml 2006-10-26 18:08:34 UTC (rev 3534) +++ trunk/core/components/dns/build.xml 2006-10-27 09:15:41 UTC (rev 3535) @@ -54,12 +54,8 @@ <property name="year" value="2004"/> <echo message=""/> - <echo message="==================================================================="/> - <echo message="= ${Name.System} ${version}"/> - <echo message="= ${Name.Company} "/> - <echo message="==================================================================="/> - <echo message=""/> - <echo message="(${ant.version})"/> +<echo message="==================================================================="/> +<echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> </target> Modified: trunk/core/components/emailer/build.xml =================================================================== --- trunk/core/components/emailer/build.xml 2006-10-26 18:08:34 UTC (rev 3534) +++ trunk/core/components/emailer/build.xml 2006-10-27 09:15:41 UTC (rev 3535) @@ -51,12 +51,8 @@ <property name="year" value="2004"/> <echo message=""/> - <echo message="==================================================================="/> - <echo message="= ${Name.System} ${version}"/> - <echo message="= ${Name.Company} "/> - <echo message="==================================================================="/> - <echo message=""/> - <echo message="(${ant.version})"/> +<echo message="==================================================================="/> +<echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> </target> Modified: trunk/core/components/loggingservices/build.xml =================================================================== --- trunk/core/components/loggingservices/build.xml 2006-10-26 18:08:34 UTC (rev 3534) +++ trunk/core/components/loggingservices/build.xml 2006-10-27 09:15:41 UTC (rev 3535) @@ -73,12 +73,8 @@ <echo message=""/> - <echo message="==================================================================="/> - <echo message="= ${Name.System} ${version}"/> - <echo message="= ${Name.Company} "/> - <echo message="==================================================================="/> - <echo message=""/> - <echo message="(${ant.version})"/> +<echo message="==================================================================="/> +<echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> </target> Modified: trunk/core/components/net/build.xml =================================================================== --- trunk/core/components/net/build.xml 2006-10-26 18:08:34 UTC (rev 3534) +++ trunk/core/components/net/build.xml 2006-10-27 09:15:41 UTC (rev 3535) @@ -74,12 +74,8 @@ <property name="year" value="2004"/> <echo message=""/> - <echo message="==================================================================="/> - <echo message="= ${Name.System} ${version}"/> - <echo message="= ${Name.Company} "/> - <echo message="==================================================================="/> - <echo message=""/> - <echo message="(${ant.version})"/> +<echo message="==================================================================="/> +<echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> </target> Modified: trunk/core/components/scripting/build.xml =================================================================== --- trunk/core/components/scripting/build.xml 2006-10-26 18:08:34 UTC (rev 3534) +++ trunk/core/components/scripting/build.xml 2006-10-27 09:15:41 UTC (rev 3535) @@ -64,12 +64,8 @@ <property name="year" value="2004"/> <echo message=""/> - <echo message="==================================================================="/> - <echo message="= ${Name.System} ${version}"/> - <echo message="= ${Name.Company} "/> - <echo message="==================================================================="/> - <echo message=""/> - <echo message="(${ant.version})"/> +<echo message="==================================================================="/> +<echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> <available property="nice.task.present" classname="org.apache.tools.ant.taskdefs.Nice" /> </target> Modified: trunk/core/components/sfinstaller/build.xml =================================================================== --- trunk/core/components/sfinstaller/build.xml 2006-10-26 18:08:34 UTC (rev 3534) +++ trunk/core/components/sfinstaller/build.xml 2006-10-27 09:15:41 UTC (rev 3535) @@ -70,12 +70,8 @@ <property name="year" value="2004"/> <echo message=""/> - <echo message="==================================================================="/> - <echo message="= ${Name.System} ${version}"/> - <echo message="= ${Name.Company} "/> - <echo message="==================================================================="/> - <echo message=""/> - <echo message="(${ant.version})"/> +<echo message="==================================================================="/> +<echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> </target> Modified: trunk/core/components/ssh/build.xml =================================================================== --- trunk/core/components/ssh/build.xml 2006-10-26 18:08:34 UTC (rev 3534) +++ trunk/core/components/ssh/build.xml 2006-10-27 09:15:41 UTC (rev 3535) @@ -70,12 +70,8 @@ <property name="year" value="2004"/> <echo message=""/> - <echo message="==================================================================="/> - <echo message="= ${Name.System} ${version}"/> - <echo message="= ${Name.Company} "/> - <echo message="==================================================================="/> - <echo message=""/> - <echo message="(${ant.version})"/> +<echo message="==================================================================="/> +<echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> </target> Modified: trunk/core/extras/sfDebugger/build.xml =================================================================== --- trunk/core/extras/sfDebugger/build.xml 2006-10-26 18:08:34 UTC (rev 3534) +++ trunk/core/extras/sfDebugger/build.xml 2006-10-27 09:15:41 UTC (rev 3535) @@ -50,12 +50,8 @@ <property name="year" value="2004"/> <echo message=""/> - <echo message="==================================================================="/> - <echo message="= ${Name.System} ${version}"/> - <echo message="= ${Name.Company} "/> - <echo message="==================================================================="/> - <echo message=""/> - <echo message="(${ant.version})"/> +<echo message="==================================================================="/> +<echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> </target> Modified: trunk/core/extras/sfgui/build.xml =================================================================== --- trunk/core/extras/sfgui/build.xml 2006-10-26 18:08:34 UTC (rev 3534) +++ trunk/core/extras/sfgui/build.xml 2006-10-27 09:15:41 UTC (rev 3535) @@ -49,12 +49,8 @@ <property name="year" value="2004"/> <echo message=""/> - <echo message="==================================================================="/> - <echo message="= ${Name.System} ${version}"/> - <echo message="= ${Name.Company} "/> - <echo message="==================================================================="/> - <echo message=""/> - <echo message="(${ant.version})"/> +<echo message="==================================================================="/> +<echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> <available property="nice.task.present" classname="org.apache.tools.ant.taskdefs.Nice" /> </target> Modified: trunk/core/sfdeprecated/logger/build.xml =================================================================== --- trunk/core/sfdeprecated/logger/build.xml 2006-10-26 18:08:34 UTC (rev 3534) +++ trunk/core/sfdeprecated/logger/build.xml 2006-10-27 09:15:41 UTC (rev 3535) @@ -53,12 +53,8 @@ <property name="year" value="2004"/> <echo message=""/> - <echo message="==================================================================="/> - <echo message="= ${Name.System} ${version}"/> - <echo message="= ${Name.Company} "/> - <echo message="==================================================================="/> - <echo message=""/> - <echo message="(${ant.version})"/> +<echo message="==================================================================="/> +<echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> </target> Modified: trunk/core/sfdeprecated/utils/build.xml =================================================================== --- trunk/core/sfdeprecated/utils/build.xml 2006-10-26 18:08:34 UTC (rev 3534) +++ trunk/core/sfdeprecated/utils/build.xml 2006-10-27 09:15:41 UTC (rev 3535) @@ -52,12 +52,8 @@ <property name="year" value="2004"/> <echo message=""/> - <echo message="==================================================================="/> - <echo message="= ${Name.System} ${version}"/> - <echo message="= ${Name.Company} "/> - <echo message="==================================================================="/> - <echo message=""/> - <echo message="(${ant.version})"/> +<echo message="==================================================================="/> +<echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> </target> <!-- =================================================================== --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2006-10-27 13:18:58
|
Revision: 3537 http://svn.sourceforge.net/smartfrog/?rev=3537&view=rev Author: julgui Date: 2006-10-27 06:17:48 -0700 (Fri, 27 Oct 2006) Log Message: ----------- Build messages simplified. Modified Paths: -------------- trunk/core/components/ant/build.xml trunk/core/components/arithmetic-testharness/build.xml trunk/core/components/dns/build.xml trunk/core/components/emailer/build.xml trunk/core/components/loggingservices/build.xml trunk/core/components/net/build.xml trunk/core/components/scripting/build.xml trunk/core/components/sfinstaller/build.xml trunk/core/components/ssh/build.xml trunk/core/extras/sfDebugger/build.xml trunk/core/extras/sfgui/build.xml trunk/core/sfdeprecated/logger/build.xml trunk/core/sfdeprecated/utils/build.xml Modified: trunk/core/components/ant/build.xml =================================================================== --- trunk/core/components/ant/build.xml 2006-10-27 09:22:44 UTC (rev 3536) +++ trunk/core/components/ant/build.xml 2006-10-27 13:17:48 UTC (rev 3537) @@ -64,7 +64,7 @@ <property name="year" value="2006"/> <echo message=""/> <echo message="==================================================================="/> - <echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> + <echo message="= ${Name.System} ${version}, ${Name.Company} (${ant.version}) "/> <echo message="==================================================================="/> <available property="nice.task.present" classname="org.apache.tools.ant.taskdefs.Nice" /> </target> Modified: trunk/core/components/arithmetic-testharness/build.xml =================================================================== --- trunk/core/components/arithmetic-testharness/build.xml 2006-10-27 09:22:44 UTC (rev 3536) +++ trunk/core/components/arithmetic-testharness/build.xml 2006-10-27 13:17:48 UTC (rev 3537) @@ -54,7 +54,7 @@ <echo message=""/> <echo message="==================================================================="/> -<echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> + <echo message="= ${Name.System} ${version}, ${Name.Company} (${ant.version})"/> </target> Modified: trunk/core/components/dns/build.xml =================================================================== --- trunk/core/components/dns/build.xml 2006-10-27 09:22:44 UTC (rev 3536) +++ trunk/core/components/dns/build.xml 2006-10-27 13:17:48 UTC (rev 3537) @@ -55,7 +55,7 @@ <echo message=""/> <echo message="==================================================================="/> -<echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> + <echo message="= ${Name.System} ${version}, ${Name.Company} (${ant.version})"/> </target> Modified: trunk/core/components/emailer/build.xml =================================================================== --- trunk/core/components/emailer/build.xml 2006-10-27 09:22:44 UTC (rev 3536) +++ trunk/core/components/emailer/build.xml 2006-10-27 13:17:48 UTC (rev 3537) @@ -52,7 +52,7 @@ <echo message=""/> <echo message="==================================================================="/> -<echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> + <echo message="= ${Name.System} ${version}, ${Name.Company} (${ant.version})"/> </target> Modified: trunk/core/components/loggingservices/build.xml =================================================================== --- trunk/core/components/loggingservices/build.xml 2006-10-27 09:22:44 UTC (rev 3536) +++ trunk/core/components/loggingservices/build.xml 2006-10-27 13:17:48 UTC (rev 3537) @@ -74,7 +74,7 @@ <echo message=""/> <echo message="==================================================================="/> -<echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> + <echo message="= ${Name.System} ${version}, ${Name.Company} (${ant.version})"/> </target> Modified: trunk/core/components/net/build.xml =================================================================== --- trunk/core/components/net/build.xml 2006-10-27 09:22:44 UTC (rev 3536) +++ trunk/core/components/net/build.xml 2006-10-27 13:17:48 UTC (rev 3537) @@ -75,7 +75,7 @@ <echo message=""/> <echo message="==================================================================="/> -<echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> + <echo message="= ${Name.System} ${version}, ${Name.Company} (${ant.version})"/> </target> Modified: trunk/core/components/scripting/build.xml =================================================================== --- trunk/core/components/scripting/build.xml 2006-10-27 09:22:44 UTC (rev 3536) +++ trunk/core/components/scripting/build.xml 2006-10-27 13:17:48 UTC (rev 3537) @@ -65,7 +65,7 @@ <echo message=""/> <echo message="==================================================================="/> -<echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> + <echo message="= ${Name.System} ${version}, ${Name.Company} (${ant.version})"/> <available property="nice.task.present" classname="org.apache.tools.ant.taskdefs.Nice" /> </target> Modified: trunk/core/components/sfinstaller/build.xml =================================================================== --- trunk/core/components/sfinstaller/build.xml 2006-10-27 09:22:44 UTC (rev 3536) +++ trunk/core/components/sfinstaller/build.xml 2006-10-27 13:17:48 UTC (rev 3537) @@ -71,7 +71,7 @@ <echo message=""/> <echo message="==================================================================="/> -<echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> + <echo message="= ${Name.System} ${version}, ${Name.Company} (${ant.version})"/> </target> Modified: trunk/core/components/ssh/build.xml =================================================================== --- trunk/core/components/ssh/build.xml 2006-10-27 09:22:44 UTC (rev 3536) +++ trunk/core/components/ssh/build.xml 2006-10-27 13:17:48 UTC (rev 3537) @@ -71,7 +71,7 @@ <echo message=""/> <echo message="==================================================================="/> -<echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> + <echo message="= ${Name.System} ${version}, ${Name.Company} (${ant.version})"/> </target> Modified: trunk/core/extras/sfDebugger/build.xml =================================================================== --- trunk/core/extras/sfDebugger/build.xml 2006-10-27 09:22:44 UTC (rev 3536) +++ trunk/core/extras/sfDebugger/build.xml 2006-10-27 13:17:48 UTC (rev 3537) @@ -51,7 +51,7 @@ <echo message=""/> <echo message="==================================================================="/> -<echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> + <echo message="= ${Name.System} ${version}, ${Name.Company} (${ant.version})"/> </target> Modified: trunk/core/extras/sfgui/build.xml =================================================================== --- trunk/core/extras/sfgui/build.xml 2006-10-27 09:22:44 UTC (rev 3536) +++ trunk/core/extras/sfgui/build.xml 2006-10-27 13:17:48 UTC (rev 3537) @@ -50,7 +50,7 @@ <echo message=""/> <echo message="==================================================================="/> -<echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> + <echo message="= ${Name.System} ${version}, ${Name.Company} (${ant.version})"/> <available property="nice.task.present" classname="org.apache.tools.ant.taskdefs.Nice" /> </target> Modified: trunk/core/sfdeprecated/logger/build.xml =================================================================== --- trunk/core/sfdeprecated/logger/build.xml 2006-10-27 09:22:44 UTC (rev 3536) +++ trunk/core/sfdeprecated/logger/build.xml 2006-10-27 13:17:48 UTC (rev 3537) @@ -54,7 +54,7 @@ <echo message=""/> <echo message="==================================================================="/> -<echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> + <echo message="= ${Name.System} ${version}, ${Name.Company} (${ant.version})"/> </target> Modified: trunk/core/sfdeprecated/utils/build.xml =================================================================== --- trunk/core/sfdeprecated/utils/build.xml 2006-10-27 09:22:44 UTC (rev 3536) +++ trunk/core/sfdeprecated/utils/build.xml 2006-10-27 13:17:48 UTC (rev 3537) @@ -53,7 +53,7 @@ <echo message=""/> <echo message="==================================================================="/> -<echo message="= ${Name.System} ${version}", ${Name.Company} (${ant.version})"/> + <echo message="= ${Name.System} ${version}, ${Name.Company} (${ant.version})"/> </target> <!-- =================================================================== --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2006-10-31 15:00:53
|
Revision: 3543 http://svn.sourceforge.net/smartfrog/?rev=3543&view=rev Author: julgui Date: 2006-10-31 06:47:39 -0800 (Tue, 31 Oct 2006) Log Message: ----------- Cleaning output from build process. The CC reports are too cluttered. Modified Paths: -------------- trunk/core/common.xml trunk/core/components/buildRelease-template.xml trunk/core/components/slp/build.xml trunk/core/components/slp/buildRelease.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2006-10-31 14:16:54 UTC (rev 3542) +++ trunk/core/common.xml 2006-10-31 14:47:39 UTC (rev 3543) @@ -43,9 +43,8 @@ <dirname property="antfile.dir" file="${ant.file.common}"/> <property name="core.dir" location="${antfile.dir}"/> - <!-- This is to decide the directory strecture for the components, and default is false --> + <!-- This is to decide the directory structure for the components, and default is false --> <property name="is.component" value="false" /> - <echo> Is component "${is.component}" </echo> <!-- the common.properties file lets you provide a single declaration of overrides (like the compiler settings) that apply across @@ -59,10 +58,8 @@ <property name="smartfrog.home" location="${core.dir}/smartfrog"/> <property name="smartfrog.dist.dir" location="${smartfrog.home}/dist" /> - <property name="smartfrog.dist.lib.dir" - location="${smartfrog.dist.dir}/lib"/> - <property name="smartfrog.components.dir" - location="${core.dir}/components"/> + <property name="smartfrog.dist.lib.dir" location="${smartfrog.dist.dir}/lib"/> + <property name="smartfrog.components.dir" location="${core.dir}/components"/> <!-- Compile options for Smartfrog Release --> <property name="javac.debug.mode" value="true"/> @@ -260,7 +257,6 @@ <available file="${user.home}/.ant/lib/junit-3.8.2.jar"/> </condition> - <echo >In project ${project.name}</echo> <echo level="verbose">system.tests.enabled=${system.tests.enabled}</echo> <echo level="verbose">unit.tests.enabled=${unit.tests.enabled}</echo> Modified: trunk/core/components/buildRelease-template.xml =================================================================== --- trunk/core/components/buildRelease-template.xml 2006-10-31 14:16:54 UTC (rev 3542) +++ trunk/core/components/buildRelease-template.xml 2006-10-31 14:47:39 UTC (rev 3543) @@ -51,7 +51,7 @@ <echo> =================================================================== ${Name.Framework} - ${Name.System} - ${Name.Company} - =================================================================== + </echo> </target> Modified: trunk/core/components/slp/build.xml =================================================================== --- trunk/core/components/slp/build.xml 2006-10-31 14:16:54 UTC (rev 3542) +++ trunk/core/components/slp/build.xml 2006-10-31 14:47:39 UTC (rev 3543) @@ -76,11 +76,8 @@ <echo message=""/> <echo message="==================================================================="/> - <echo message="= ${Name.System} ${version}"/> - <echo message="= ${Name.Author} "/> - <echo message="==================================================================="/> + <echo message="= ${Name.System} ${version} ${Name.Author} "/> <echo message=""/> - <echo message="(${ant.version})"/> <available property="nice.task.present" classname="org.apache.tools.ant.taskdefs.Nice" /> </target> Modified: trunk/core/components/slp/buildRelease.xml =================================================================== --- trunk/core/components/slp/buildRelease.xml 2006-10-31 14:16:54 UTC (rev 3542) +++ trunk/core/components/slp/buildRelease.xml 2006-10-31 14:47:39 UTC (rev 3543) @@ -64,7 +64,6 @@ <echo> =================================================================== ${Name.Framework} - ${Name.System} - ${Name.Company} - =================================================================== </echo> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2006-11-01 16:18:57
|
Revision: 3555 http://svn.sourceforge.net/smartfrog/?rev=3555&view=rev Author: steve_l Date: 2006-11-01 08:18:17 -0800 (Wed, 01 Nov 2006) Log Message: ----------- A bit more tweakage here. Parallel probably works, its just the test. Sequence, well, sequence may not be right. Modified Paths: -------------- trunk/core/components/xmpp/test/files/gmail_smartfrog_to_smartfrog.sf trunk/core/smartfrog/src/org/smartfrog/services/assertions/FailComponent.java trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/combinators/Sequence.java trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/combinators/parallel.sf trunk/core/testharness/src/org/smartfrog/test/DeployingTestBase.java trunk/core/testharness/src/org/smartfrog/test/SmartFrogTestBase.java trunk/core/testharness/testcases/org/smartfrog/test/system/java/LibraryTest.java trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/parallel/ParallelTest.java trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/parallel/testEmptyParallel.sf trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/parallel/testSimpleParallel.sf trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/sequence/SequenceTest.java trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/sequence/testFailingSequence.sf trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/sequence/testSequence.sf Added Paths: ----------- trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/parallel/testEmptyParallelTerminating.sf Modified: trunk/core/components/xmpp/test/files/gmail_smartfrog_to_smartfrog.sf =================================================================== --- trunk/core/components/xmpp/test/files/gmail_smartfrog_to_smartfrog.sf 2006-11-01 16:08:55 UTC (rev 3554) +++ trunk/core/components/xmpp/test/files/gmail_smartfrog_to_smartfrog.sf 2006-11-01 16:18:17 UTC (rev 3555) @@ -21,6 +21,9 @@ #include "/org/smartfrog/services/xmpp/components.sf" #include "/org/smartfrog/sfcore/workflow/components.sf" +/** + * this is an example that sends a message using google + */ sfConfig extends Sequence { debug extends XmppDebugging { @@ -35,6 +38,4 @@ message "hello, world"; } - - } \ No newline at end of file Modified: trunk/core/smartfrog/src/org/smartfrog/services/assertions/FailComponent.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/assertions/FailComponent.java 2006-11-01 16:08:55 UTC (rev 3554) +++ trunk/core/smartfrog/src/org/smartfrog/services/assertions/FailComponent.java 2006-11-01 16:18:17 UTC (rev 3555) @@ -81,8 +81,8 @@ } TerminationRecord record; Reference name = this.sfCompleteNameSafe(); - record = normal ? TerminationRecord.normal(name) : TerminationRecord.abnormal(message, name); - record.description = message; + record=new TerminationRecord(normal?TerminationRecord.NORMAL:TerminationRecord.ABNORMAL, + message,name); TerminatorThread terminator = new TerminatorThread(this, record); if (detach) terminator.detach(); if (!notifyParent) terminator.quietly(); Modified: trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/combinators/Sequence.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/combinators/Sequence.java 2006-11-01 16:08:55 UTC (rev 3554) +++ trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/combinators/Sequence.java 2006-11-01 16:18:17 UTC (rev 3555) @@ -21,16 +21,13 @@ package org.smartfrog.sfcore.workflow.combinators; import java.rmi.RemoteException; -import java.util.Enumeration; -import org.smartfrog.sfcore.common.Context; import org.smartfrog.sfcore.common.SmartFrogException; import org.smartfrog.sfcore.common.SmartFrogRuntimeException; import org.smartfrog.sfcore.componentdescription.ComponentDescription; import org.smartfrog.sfcore.compound.Compound; import org.smartfrog.sfcore.prim.Prim; import org.smartfrog.sfcore.prim.TerminationRecord; -import org.smartfrog.sfcore.reference.Reference; import org.smartfrog.sfcore.workflow.eventbus.EventCompoundImpl; import org.smartfrog.sfcore.common.*; @@ -121,7 +118,7 @@ * @return true whenever a child component is not started */ protected boolean onChildTerminated(TerminationRecord status, Prim comp) { - boolean forward = true; + boolean terminate = true; if (status.isNormal()) { if (actionKeys.hasMoreElements()) { @@ -135,7 +132,7 @@ ComponentDescription act = (ComponentDescription) actions.get(componentName); sfCreateNewChild(componentName, act, null); //do not forward the event - forward = false; + terminate = false; } catch (Exception e) { //oops, something went wrong if (sfLog().isErrorEnabled()) { @@ -145,7 +142,7 @@ .abnormal("error in starting next component: exception " + e, name, e); sfTerminate(tr); //we've triggered an abnormal shutdown, so no forwarding of the earlier event - forward = false; + terminate = false; } } else { @@ -154,7 +151,7 @@ if (sfLog().isDebugEnabled()) { sfLog().debug("no more components for sequence " + name.toString()); } - forward = true; + terminate = true; } } else { //abnormal terminations @@ -163,9 +160,9 @@ SmartFrogException.forward(status.cause), status); } - forward = true; + terminate = true; } - return forward; + return terminate; } } Modified: trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/combinators/parallel.sf =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/combinators/parallel.sf 2006-11-01 16:08:55 UTC (rev 3554) +++ trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/combinators/parallel.sf 2006-11-01 16:18:17 UTC (rev 3555) @@ -38,7 +38,6 @@ description ##flag which indicates that the parallel component should terminate immediately if there are no children to deploy#; } -} } // Deploy children in parallel? Set to true to deploy every child component //in a new thread Modified: trunk/core/testharness/src/org/smartfrog/test/DeployingTestBase.java =================================================================== --- trunk/core/testharness/src/org/smartfrog/test/DeployingTestBase.java 2006-11-01 16:08:55 UTC (rev 3554) +++ trunk/core/testharness/src/org/smartfrog/test/DeployingTestBase.java 2006-11-01 16:18:17 UTC (rev 3555) @@ -49,14 +49,18 @@ } - protected void expectSuccessfulTermination(TestBlock testBlock) throws Throwable { - TerminationRecord status = spinUntilFinished(testBlock); - assertTrue("unexpected exit status" + status, status.isNormal()); + protected TerminationRecord expectSuccessfulTermination(TestBlock testBlock) throws Throwable { + return expectTermination(testBlock, true); } - protected void expectAbnormalTermination(TestBlock testBlock) throws Throwable { + protected TerminationRecord expectAbnormalTermination(TestBlock testBlock) throws Throwable { + return expectTermination(testBlock, false); + } + + protected TerminationRecord expectTermination(TestBlock testBlock,boolean normal) throws Throwable { TerminationRecord status = spinUntilFinished(testBlock); - assertFalse("unexpected exit status"+status, status.isNormal()); + assertTrue("unexpected exit status" + status, normal==status.isNormal()); + return status; } /** Modified: trunk/core/testharness/src/org/smartfrog/test/SmartFrogTestBase.java =================================================================== --- trunk/core/testharness/src/org/smartfrog/test/SmartFrogTestBase.java 2006-11-01 16:08:55 UTC (rev 3554) +++ trunk/core/testharness/src/org/smartfrog/test/SmartFrogTestBase.java 2006-11-01 16:18:17 UTC (rev 3555) @@ -382,9 +382,9 @@ assertNotNull("No substring ", substring); final boolean contained = source.indexOf(substring)>=0; - if(!contained) - { - String message = "- Did not find ["+substring+"] in ["+source+"]"+"\n, Result:"+cfgDescMsg; + if(!contained) { + String message = "- Did not find ["+substring+"] in ["+source+"]"+ + (cfgDescMsg!=null?("\n, Result:"+cfgDescMsg):""); System.out.println(message); if (extraText != null) { System.out.println(extraText); Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/java/LibraryTest.java =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/java/LibraryTest.java 2006-11-01 16:08:55 UTC (rev 3554) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/java/LibraryTest.java 2006-11-01 16:18:17 UTC (rev 3555) @@ -26,9 +26,15 @@ import org.smartfrog.services.os.java.LibraryArtifact; import org.smartfrog.services.filesystem.FileUsingComponent; import org.smartfrog.sfcore.prim.Prim; +import org.smartfrog.sfcore.common.SmartFrogException; +import org.smartfrog.sfcore.security.SFGeneralSecurityException; import java.io.File; +import java.rmi.RemoteException; +import java.net.UnknownHostException; +import junit.framework.AssertionFailedError; + /** * Test library work * created 04-Apr-2005 15:35:58 @@ -36,6 +42,7 @@ public class LibraryTest extends SmartFrogTestBase { public static final String FILES = JavaPackageTest.FILES; + private static final String EXCEPTION_JUNIT_ASSERTION_FAILED = "junit.framework.AssertionFailedError"; public LibraryTest(String name) { @@ -131,6 +138,11 @@ File file = new File(filename); assertTrue("not found " + filename, file.exists()); file.delete(); + } catch(Throwable thrown) { + //connection refused exceptions are a sign of being offline + assertFaultCauseAndTextContains(thrown,EXCEPTION_SMARTFROG, "connection refused",null); + System.out.println("No connection to the remote server; ignoring result"); + System.out.println(thrown); } finally { terminateApplication(application); } @@ -151,11 +163,15 @@ * @throws Throwable */ public void testMaven2DownloadBadSha1() throws Throwable { - deployExpectingException(FILES + "testMaven2DownloadBadSha1.sf", - "testMaven2DownloadBadSha1", - EXCEPTION_LIFECYCLE, - null, - EXCEPTION_SMARTFROG, - LibraryArtifactImpl.ERROR_CHECKSUM_FAILURE); + try { + deployExpectingException(FILES + "testMaven2DownloadBadSha1.sf", + "testMaven2DownloadBadSha1", + EXCEPTION_LIFECYCLE, + null, + EXCEPTION_SMARTFROG, + LibraryArtifactImpl.ERROR_CHECKSUM_FAILURE); + } catch (AssertionFailedError thrown) { + assertFaultCauseAndTextContains(thrown, EXCEPTION_JUNIT_ASSERTION_FAILED, "connection refused", null); + } } } Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/parallel/ParallelTest.java =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/parallel/ParallelTest.java 2006-11-01 16:08:55 UTC (rev 3554) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/parallel/ParallelTest.java 2006-11-01 16:18:17 UTC (rev 3555) @@ -29,22 +29,39 @@ */ public class ParallelTest extends DeployingTestBase { protected static final String FILES = "org/smartfrog/test/system/workflow/parallel/"; + private TestBlock block; public ParallelTest(String s) { super(s); } + + public void setBlock(Prim prim) { + setBlock((TestBlock) prim); + } + + public void setBlock(TestBlock block) { + this.block = block; + } + public void testEmptyParallel() throws Throwable { application=deployExpectingSuccess(FILES +"testEmptyParallel.sf","testEmptyParallel"); - TestBlock block=(TestBlock)application; + setBlock(application); expectSuccessfulTermination(block); + assertAttributeEquals(application, TestBlock.ATTR_FORCEDTIMEOUT, true); } public void testSimpleParallel() throws Throwable { application = deployExpectingSuccess(FILES + "testSimpleParallel.sf", "testSimpleParallel"); - TestBlock block = (TestBlock) application; + setBlock(application); expectSuccessfulTermination(block); - Prim action=block.getAction(); - Prim toggle=(Prim) ((Prim) block).sfResolve("toggle"); + Prim toggle=(Prim) (application.sfResolve("toggle")); assertAttributeEquals(toggle,"value",true); } + + public void testEmptyParallelTerminating() throws Throwable { + application = deployExpectingSuccess(FILES + "testEmptyParallelTerminating.sf", + "testEmptyParallelTerminating"); + block = (TestBlock) application; + expectSuccessfulTermination(block); + } } Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/parallel/testEmptyParallel.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/parallel/testEmptyParallel.sf 2006-11-01 16:08:55 UTC (rev 3554) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/parallel/testEmptyParallel.sf 2006-11-01 16:18:17 UTC (rev 3555) @@ -22,10 +22,13 @@ #include "/org/smartfrog/test/system/workflow/parallel/components.sf" /** - * deploy a parallel component. expect it to terminate if there are no active children + * Deploy a parallel component. + * There are no active children; it will stay around */ sfConfig extends TestBlock { - + timeout 2000; + expectTimeout true; + action extends Parallel { } Added: trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/parallel/testEmptyParallelTerminating.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/parallel/testEmptyParallelTerminating.sf (rev 0) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/parallel/testEmptyParallelTerminating.sf 2006-11-01 16:18:17 UTC (rev 3555) @@ -0,0 +1,37 @@ +/** (C) Copyright 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 + + */ + + +#include "/org/smartfrog/test/system/workflow/parallel/components.sf" + +/** + * deploy a parallel component. expect it to terminate if there are no active children + */ +sfConfig extends TestBlock { + + action extends Parallel { + terminateOnEmptyDeploy true; + } + +} + + + + \ No newline at end of file Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/parallel/testSimpleParallel.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/parallel/testSimpleParallel.sf 2006-11-01 16:08:55 UTC (rev 3554) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/parallel/testSimpleParallel.sf 2006-11-01 16:18:17 UTC (rev 3555) @@ -22,7 +22,8 @@ #include "/org/smartfrog/test/system/workflow/parallel/components.sf" /** - * deploy a parallel component. expect it to terminate once there are no active children + * deploy a parallel component. + * Expect it to terminate once there are no active children */ sfConfig extends TestBlock { Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/sequence/SequenceTest.java =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/sequence/SequenceTest.java 2006-11-01 16:08:55 UTC (rev 3554) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/sequence/SequenceTest.java 2006-11-01 16:18:17 UTC (rev 3555) @@ -24,6 +24,7 @@ import org.smartfrog.test.DeployingTestBase; import org.smartfrog.services.assertions.TestBlock; import org.smartfrog.sfcore.prim.Prim; +import org.smartfrog.sfcore.prim.TerminationRecord; /** * @author Ashish Awasthi @@ -39,21 +40,27 @@ application=deployExpectingSuccess(FILES+"testSequence.sf","testSequence"); TestBlock block=(TestBlock)application; expectSuccessfulTermination(block); +/* Prim sequence = block.getAction(); Prim toggle1 = (Prim) sequence.sfResolve("toggle1"); Prim toggle2 = (Prim) sequence.sfResolve("toggle2"); assertAttributeEquals(toggle1, "value", true); assertAttributeEquals(toggle2, "value", true); +*/ } public void testComponentFailureInNewSequence() throws Throwable { application = deployExpectingSuccess(FILES + "testFailingSequence.sf", "testFailingSequence"); TestBlock block = (TestBlock) application; - expectAbnormalTermination(block); + TerminationRecord record = expectAbnormalTermination(block); + assertContains(record.description, "mid-sequence"); +/* Prim sequence=block.getAction(); + assertNotNull("empty sequence action in the testblock", sequence); Prim toggle1=(Prim)sequence.sfResolve("toggle1"); Prim toggle2 = (Prim) sequence.sfResolve("toggle2"); assertAttributeEquals(toggle1,"value",true); assertAttributeEquals(toggle2, "value", false); +*/ } } Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/sequence/testFailingSequence.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/sequence/testFailingSequence.sf 2006-11-01 16:08:55 UTC (rev 3554) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/sequence/testFailingSequence.sf 2006-11-01 16:18:17 UTC (rev 3555) @@ -26,15 +26,23 @@ * removes that but second component fails and thus third is never executed. */ testSequence extends Sequence { + //to diagnose RMI problems + sfExport true; toggle1 extends ToggleToTrueWorkflow; fail extends Fail { - message "end of sequence"; + message "halted mid-sequence"; normal false; } + //these should never be reached. toggle2 extends ToggleToTrueWorkflow; + + fail extends Fail { + message "overrun"; + normal false; + } } sfConfig extends TestBlock { Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/sequence/testSequence.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/sequence/testSequence.sf 2006-11-01 16:08:55 UTC (rev 3554) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/sequence/testSequence.sf 2006-11-01 16:18:17 UTC (rev 3555) @@ -27,11 +27,14 @@ sfConfig extends TestBlock { action extends Sequence { + //to diagnose RMI problems + sfExport true; toggle1 extends ToggleToTrueWorkflow; toggle2 extends ToggleToTrueWorkflow; } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2006-11-06 13:48:37
|
Revision: 3566 http://svn.sourceforge.net/smartfrog/?rev=3566&view=rev Author: julgui Date: 2006-11-06 05:48:18 -0800 (Mon, 06 Nov 2006) Log Message: ----------- Test for ConfigurationDescriptors: improved. Modified Paths: -------------- trunk/core/smartfrog/src/org/smartfrog/sfcore/common/OptionSet.java trunk/core/testharness/src/org/smartfrog/test/SmartFrogTestBase.java trunk/core/testharness/testcases/org/smartfrog/test/system/deploy/ConfigurationDescriptorDeployTest.java trunk/core/testharness/testcases/org/smartfrog/test/unit/sfcore/common/ConfigurationDescriptorTestURLs.java Modified: trunk/core/smartfrog/src/org/smartfrog/sfcore/common/OptionSet.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/sfcore/common/OptionSet.java 2006-11-03 16:57:15 UTC (rev 3565) +++ trunk/core/smartfrog/src/org/smartfrog/sfcore/common/OptionSet.java 2006-11-06 13:48:18 UTC (rev 3566) @@ -154,7 +154,7 @@ case 'f': try { - this.readCfgDescriptorsFile(args[++i]); + cfgDescriptors = readCfgDescriptorsFile(args[++i]); } catch (SmartFrogInitException ex){ exitCode = ExitCodes.EXIT_ERROR_CODE_BAD_ARGS; //Logger.log(ex); @@ -209,9 +209,11 @@ * @param fileURL file to be read * @throws SmartFrogException if failed to read */ - private void readCfgDescriptorsFile(String fileURL) throws SmartFrogException{ + public static Vector readCfgDescriptorsFile(String fileURL) throws SmartFrogException{ String line; LineNumberReader file=null; + /** Vector for configurationDescriptors to be deployed. */ + Vector cfgDescriptors = new Vector(); try { file = new LineNumberReader (new BufferedReader(new InputStreamReader( (org.smartfrog.SFSystem.getInputStreamForResource(fileURL))))); @@ -223,7 +225,7 @@ if (line.length()>0){ //Logger.log(" Reading and Creating: "+line); if (!(line.startsWith("#"))&&!(line.startsWith("//"))){ - this.cfgDescriptors.add(new ConfigurationDescriptor(line)); + cfgDescriptors.add(new ConfigurationDescriptor(line)); //Logger.log(" result: " + this.cfgDescriptors.lastElement().toString()); } else { //Ignore @@ -254,5 +256,6 @@ } } } + return cfgDescriptors; } } Modified: trunk/core/testharness/src/org/smartfrog/test/SmartFrogTestBase.java =================================================================== --- trunk/core/testharness/src/org/smartfrog/test/SmartFrogTestBase.java 2006-11-03 16:57:15 UTC (rev 3565) +++ trunk/core/testharness/src/org/smartfrog/test/SmartFrogTestBase.java 2006-11-06 13:48:18 UTC (rev 3566) @@ -432,13 +432,16 @@ * @throws SFGeneralSecurityException * @throws UnknownHostException */ - public void startSmartFrog() throws SmartFrogException, RemoteException, - SFGeneralSecurityException, UnknownHostException { + public void startSmartFrog() throws SmartFrogException, RemoteException, SFGeneralSecurityException, UnknownHostException { if(!SFSystem.isSmartfrogInit()) { SFSystem.runSmartFrog(); } } + public void terminateSmartFrog() throws SmartFrogException, RemoteException, SFGeneralSecurityException, UnknownHostException { + SFSystem.runConfigurationDescriptor(new ConfigurationDescriptor(":TERMINATE:::localhost:")); + } + /** * Deploys an application and returns the refence to deployed application. * @param testURL URL to test Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/deploy/ConfigurationDescriptorDeployTest.java =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/deploy/ConfigurationDescriptorDeployTest.java 2006-11-03 16:57:15 UTC (rev 3565) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/deploy/ConfigurationDescriptorDeployTest.java 2006-11-06 13:48:18 UTC (rev 3566) @@ -29,10 +29,12 @@ import java.util.Enumeration; +import java.util.Vector; import java.rmi.RemoteException; import java.net.UnknownHostException; import org.smartfrog.sfcore.common.SmartFrogException; +import org.smartfrog.sfcore.common.OptionSet; import org.smartfrog.sfcore.security.SFGeneralSecurityException; import org.smartfrog.sfcore.prim.Prim; import org.smartfrog.test.unit.sfcore.common.ConfigurationDescriptorTestURLs; @@ -145,32 +147,37 @@ */ /** * Deploys an application and returns the refence to deployed application. - * @param sfact SFACT: SmartFrog Action Descriptors + * @param fileURL file with a list of SFACT: SmartFrog Action Descriptors * @param testDescription Description for the test - * @return Reference to deployed application + * @return Reference to last deployed application * @throws RemoteException in the event of remote trouble. */ - - protected Prim deployExpectingSuccess2(String sfact, String testDescription) + protected Prim deployExpectingSuccessFile(String fileURL, String testDescription) throws Throwable { - testDescription = "- Test description: \n " + testDescription + " - \n"; - ConfigurationDescriptor cfgDesc = new ConfigurationDescriptor(sfact); + testDescription = "- Test descriptions file: \n " + testDescription + " - \n"; + Vector cfgDescS = OptionSet.readCfgDescriptorsFile (fileURL); try { startSmartFrog(); - Object deployedApp = SFSystem.runConfigurationDescriptor(cfgDesc, true); - System.out.println("\n" + testDescription + "\n " + cfgDesc.toString("\n ")); - if (deployedApp instanceof Prim) { - return ((Prim) deployedApp); - } else if (deployedApp instanceof ConfigurationDescriptor) { - Throwable exception = ((ConfigurationDescriptor) deployedApp). - resultException; - if (exception != null) ; - { - throw exception; - } - } + Object deployedApp=null; + for (Enumeration items = cfgDescS.elements(); items.hasMoreElements();) { + ConfigurationDescriptor cfgDesc =(ConfigurationDescriptor)items.nextElement(); + deployedApp = SFSystem.runConfigurationDescriptor( cfgDesc); + System.out.println("\n" + testDescription + "\n " + cfgDesc.toString("\n ")); + if (deployedApp instanceof Prim) { + System.out.println("\n" + testDescription + "\n " + cfgDesc.toString("\n "+ ((Prim) deployedApp).sfCompleteName())); + } else if (deployedApp instanceof ConfigurationDescriptor) { + Throwable exception = ((ConfigurationDescriptor) deployedApp).resultException; + if (exception != null) ; + { + throw exception; + } + } + } //for + if (deployedApp instanceof Prim) { + return ((Prim) deployedApp); + } } catch (Throwable throwable) { - System.out.println("\n" + testDescription + "\n " + cfgDesc.toString("\n ")); + System.out.println("\n" + testDescription + "\n " + fileURL); logChainedException(throwable); throw throwable; } @@ -181,78 +188,84 @@ public void testurlTest01() throws Throwable { - String sfact = urlTest01; - String description = "testurlTest01(" + sfact + ")"; - application = deployExpectingSuccess2(sfact, description); - } + String sfact = fileURLTest01; + String description = "testFileURLTest01 (" + sfact + ")"; + application = deployExpectingSuccessFile(sfact, description); + Thread.sleep(5*1000); + application = null; + terminateSmartFrog(); + Thread.sleep(5*1000); + startSmartFrog(); - public void testurlTest02() throws Throwable { - String sfact = urlTest02; - String description = "testurlTest02(" + sfact + ")"; - application = deployExpectingSuccess2(sfact, description); } +// +// public void testurlTest02() throws Throwable { +// String sfact = urlTest02; +// String description = "testurlTest02(" + sfact + ")"; +// application = deployExpectingSuccess2(sfact, description); +// } +// +// public void testurlTest03() throws Throwable { +// String sfact = urlTest03; +// String description = "testurlTest03(" + sfact + ")"; +// application = deployExpectingSuccess2(sfact, description); +// } +// +// public void testurlTest04() throws Throwable { +// String sfact = urlTest04; +// String description = "testurlTest04(" + sfact + ")"; +// application = deployExpectingSuccess2(sfact, description); +// } +// +// public void testurlTest05() throws Throwable { +// String sfact = urlTest05; +// String description = "testurlTest05(" + sfact + ")"; +// application = deployExpectingSuccess2(sfact, description); +// } +// +// public void testurlTest06() throws Throwable { +// String sfact = urlTest06; +// String description = "testurlTest06(" + sfact + ")"; +// application = deployExpectingSuccess2(sfact, description); +// } +// +// public void testurlTest07() throws Throwable { +// String sfact = urlTest07; +// String description = "testurlTest07(" + sfact + ")"; +// application = deployExpectingSuccess2(sfact, description); +// } +// +// +// public void testurlTest08() throws Throwable { +// String sfact = urlTest08; +// String description = "testurlTest08(" + sfact + ")"; +// application = deployExpectingSuccess2(sfact, description); +// } +// +// public void testurlTest09() throws Throwable { +// String sfact = urlTest09; +// String description = "testurlTest09(" + sfact + ")"; +// application = deployExpectingSuccess2(sfact, description); +// } +// +// public void testurlTest09b() throws Throwable { +// String sfact = urlTest07b; +// String description = "testurlTest07b(" + sfact + ")"; +// application = deployExpectingSuccess2(sfact, description); +// } +// +// public void testurlTest10() throws Throwable { +// String sfact = urlTest10; +// String description = "testurlTest10(" + sfact + ")"; +// application = deployExpectingSuccess2(sfact, description); +// } +// +// public void testurlTest11() throws Throwable { +// String sfact = urlTest11; +// String description = "testurlTest11(" + sfact + ")"; +// application = deployExpectingSuccess2(sfact, description); +// } - public void testurlTest03() throws Throwable { - String sfact = urlTest03; - String description = "testurlTest03(" + sfact + ")"; - application = deployExpectingSuccess2(sfact, description); - } - - public void testurlTest04() throws Throwable { - String sfact = urlTest04; - String description = "testurlTest04(" + sfact + ")"; - application = deployExpectingSuccess2(sfact, description); - } - - public void testurlTest05() throws Throwable { - String sfact = urlTest05; - String description = "testurlTest05(" + sfact + ")"; - application = deployExpectingSuccess2(sfact, description); - } - - public void testurlTest06() throws Throwable { - String sfact = urlTest06; - String description = "testurlTest06(" + sfact + ")"; - application = deployExpectingSuccess2(sfact, description); - } - - public void testurlTest07() throws Throwable { - String sfact = urlTest07; - String description = "testurlTest07(" + sfact + ")"; - application = deployExpectingSuccess2(sfact, description); - } - - - public void testurlTest08() throws Throwable { - String sfact = urlTest08; - String description = "testurlTest08(" + sfact + ")"; - application = deployExpectingSuccess2(sfact, description); - } - - public void testurlTest09() throws Throwable { - String sfact = urlTest09; - String description = "testurlTest09(" + sfact + ")"; - application = deployExpectingSuccess2(sfact, description); - } - - public void testurlTest09b() throws Throwable { - String sfact = urlTest07b; - String description = "testurlTest07b(" + sfact + ")"; - application = deployExpectingSuccess2(sfact, description); - } - - public void testurlTest10() throws Throwable { - String sfact = urlTest10; - String description = "testurlTest10(" + sfact + ")"; - application = deployExpectingSuccess2(sfact, description); - } - - public void testurlTest11() throws Throwable { - String sfact = urlTest11; - String description = "testurlTest11(" + sfact + ")"; - application = deployExpectingSuccess2(sfact, description); - } - // 12 and 12b cannot be run when 7 is. // public void testurlTest12 ()throws Throwable{ // String sfact = urlTest12; Modified: trunk/core/testharness/testcases/org/smartfrog/test/unit/sfcore/common/ConfigurationDescriptorTestURLs.java =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/unit/sfcore/common/ConfigurationDescriptorTestURLs.java 2006-11-03 16:57:15 UTC (rev 3565) +++ trunk/core/testharness/testcases/org/smartfrog/test/unit/sfcore/common/ConfigurationDescriptorTestURLs.java 2006-11-06 13:48:18 UTC (rev 3566) @@ -67,6 +67,8 @@ String urlTestN06 =":::::"; String urlTestN07 ="\"HOST localhost:sfDefault:\":DEPLOY:org/smartfrog/examples/counter/example.sf::localhost:"; String urlTestN08 ="\"HOST localhost:rootProcess:\":DEPLOY:org/smartfrog/examples/counter/example.sf::localhost:"; + + String fileURLTest01 = "org/smartfrog/examples/configurationdescriptor/example.sfcd"; // String url =""; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2006-11-10 19:11:08
|
Revision: 3585 http://svn.sourceforge.net/smartfrog/?rev=3585&view=rev Author: julgui Date: 2006-11-10 11:10:52 -0800 (Fri, 10 Nov 2006) Log Message: ----------- sfGui won't terminate daemon during exit unless it did start the daemon in the first place. Modified Paths: -------------- trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/InfoProcess.java trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/MainFrame.java trunk/core/smartfrog/lib/SFGuiBrowser.jar Modified: trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/InfoProcess.java =================================================================== --- trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/InfoProcess.java 2006-11-10 08:09:45 UTC (rev 3584) +++ trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/InfoProcess.java 2006-11-10 19:10:52 UTC (rev 3585) @@ -86,7 +86,8 @@ } public void stop (){ - cleanProcess(); // Review this for not killing it! Use an auxiliary process. + if (this.process==null) return; + if ((!this.process.getStatus().equals("running"))) return; //System.out.println("process.Stop:stopping -"+this.getProcessName()+" Cmd:"+this.stopCmd); if (this.stopCmd!=null){ process=new RunProcess(this.stopCmd+" "+this.stopAtt, this.workDir, this.processName, this.envProp); @@ -96,7 +97,7 @@ } else { //process=new RunProcess(this.startCmd+" "+this.startAtt, this.workDir, this.processName); this.statusInfo="Stopped(no Stop cmd)"; - } + } //System.out.println("process.Stop:stop end -"+this.getProcessName()); } Modified: trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/MainFrame.java =================================================================== --- trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/MainFrame.java 2006-11-10 08:09:45 UTC (rev 3584) +++ trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/MainFrame.java 2006-11-10 19:10:52 UTC (rev 3585) @@ -79,7 +79,7 @@ /** * Description of the Field */ - public final static String version = "v0.7 r24"; + public final static String version = "v0.7 r26"; // This has to be done properly !!!!!!!!!!!!!!! no static. Because of crap log. static PrintStream msg = System.out; static JLabel statusBar = new JLabel(); @@ -1541,6 +1541,15 @@ */ void runSFDaemon() { String cmd = ""; + + String cmdStop = "java" + " " + + "-cp \"" + classpath + "\" " + + this.sfSystemClass + " " + + "-a"+" " + + this.sfDaemonProcessName + ":TERMINATE:::" + + "" + this.hostNameTextField.getText()+ ":"+ " " + + "-e"; + if (isWindows == false) { //linux cmd = "java" + " " @@ -1550,14 +1559,6 @@ + cmdSFDaemon + "" + sfDaemonProcessName + " " + this.sfSystemClass + ""; -// cmd = "java" + " " -// + "-cp " + classpath + " " -// + sfDaemonDefIniFileProperty + sfDaemonDefIniFile + " " -// + sfDaemonDefSFFileProperty + sfDaemonDefSFFile + " " -// + cmdSFDaemon + "" + sfDaemonProcessName + " " -// + this.sfSystemClass -// + ""; - } else { // windows cmd = "java" + " " @@ -1568,14 +1569,13 @@ + this.sfSystemClass + ""; } - this.runExe("sfDaemon", cmd, "."); + this.runExe("sfDaemon", cmd, cmdStop, "."); } /** * Main processing commands method for the MainFrame object */ - void stopSFDaemon() { - + void stopSFDaemonBtn() { String cmd = ""; cmd = "java" + " " @@ -1591,7 +1591,29 @@ this.runExe("sfStopDaemon", cmd, "."); } + /** + * Main processing commands method for the MainFrame object + */ + void stopSFDaemon() { + this.processPanel.mngProcess.stopProcess("sfDaemon"); + +// String cmd = ""; +// +// cmd = "java" + " " +// + "-cp \"" + classpath + "\" " +// + this.sfSystemClass + " " +// + "-a"+" " +// + this.sfDaemonProcessName + ":TERMINATE:::" +// + "" + this.hostNameTextField.getText()+ ":"+ " " +// + "-e"; +// +// +// +// this.runExe("sfStopDaemon", cmd, "."); + } + + /** * Main processing commands method for the MainFrame object * @@ -1625,6 +1647,27 @@ } } + /** + * Main processing commands method for the MainFrame object + * + *@param name Description of Parameter + *@param exeCmd Description of Parameter + *@param workDir Description of Parameter + */ + public void runExe(String name, String exeCmd, String stopCmd, String workDir) { + try { + auxProcess = new InfoProcess(name, exeCmd, " ", stopCmd, " ", workDir, null); + auxProcess.start(); + this.processPanel.mngProcess.addProcess(auxProcess, true); + this.processPanel.refresh(); + log("Process Running: " + "" + name, "RUNExe", 3); + output.requestFocus(); + } catch (Exception ex) { + log(ex.getMessage(), "RUNExe(" + name + ")", 5); + ex.printStackTrace(); + } + } + /** * Main processing commands method for the MainFrame object * @@ -3600,7 +3643,7 @@ } void jButtonSFStopDaemon_actionPerformed(ActionEvent e) { - this.stopSFDaemon(); + this.stopSFDaemonBtn(); } void jMenuItemStopSfDaemon_actionPerformed(ActionEvent e) { Modified: trunk/core/smartfrog/lib/SFGuiBrowser.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...> - 2006-11-16 11:20:53
|
Revision: 3598 http://svn.sourceforge.net/smartfrog/?rev=3598&view=rev Author: steve_l Date: 2006-11-16 03:20:52 -0800 (Thu, 16 Nov 2006) Log Message: ----------- Some tweaks to the test compounds, and a few more javadocs Modified Paths: -------------- trunk/core/smartfrog/src/org/smartfrog/services/assertions/FailComponent.java trunk/core/smartfrog/src/org/smartfrog/services/assertions/TestBlockImpl.java trunk/core/smartfrog/src/org/smartfrog/services/assertions/TestCompoundImpl.java trunk/core/testharness/src/org/smartfrog/test/DeployingTestBase.java trunk/core/testharness/src/org/smartfrog/test/SmartFrogTestBase.java trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/TestCompoundsTest.java trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testSmartFrogException.sf Modified: trunk/core/smartfrog/src/org/smartfrog/services/assertions/FailComponent.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/assertions/FailComponent.java 2006-11-16 10:25:19 UTC (rev 3597) +++ trunk/core/smartfrog/src/org/smartfrog/services/assertions/FailComponent.java 2006-11-16 11:20:52 UTC (rev 3598) @@ -79,13 +79,18 @@ return; } } + TerminationRecord record = createTerminationRecord(); + TerminatorThread terminator = new TerminatorThread(this, record); + terminator.setShouldDetach(detach); + terminator.setNotifyParent(notifyParent); + terminator.start(); + } + + private TerminationRecord createTerminationRecord() { TerminationRecord record; - Reference name = this.sfCompleteNameSafe(); + Reference name = sfCompleteNameSafe(); record=new TerminationRecord(normal?TerminationRecord.NORMAL:TerminationRecord.ABNORMAL, message,name); - TerminatorThread terminator = new TerminatorThread(this, record); - if (detach) terminator.detach(); - if (!notifyParent) terminator.quietly(); - terminator.run(); + return record; } } Modified: trunk/core/smartfrog/src/org/smartfrog/services/assertions/TestBlockImpl.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/assertions/TestBlockImpl.java 2006-11-16 10:25:19 UTC (rev 3597) +++ trunk/core/smartfrog/src/org/smartfrog/services/assertions/TestBlockImpl.java 2006-11-16 11:20:52 UTC (rev 3598) @@ -146,7 +146,9 @@ /** * log the end of the event. This may trigger workflow termination. * does nothing if finished==true. - * @param record + * @param record termination record + * @throws SmartFrogRuntimeException smartfrog problems + * @throws RemoteException RMI problems */ private synchronized void end(TerminationRecord record) throws SmartFrogRuntimeException, RemoteException { Modified: trunk/core/smartfrog/src/org/smartfrog/services/assertions/TestCompoundImpl.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/assertions/TestCompoundImpl.java 2006-11-16 10:25:19 UTC (rev 3597) +++ trunk/core/smartfrog/src/org/smartfrog/services/assertions/TestCompoundImpl.java 2006-11-16 11:20:52 UTC (rev 3598) @@ -216,7 +216,7 @@ * @return true if the termination event is to be forwarded up the chain. */ protected boolean onChildTerminated(TerminationRecord status, Prim comp) { - boolean forward=true; + boolean terminate =true; boolean tearDownTime=false; TerminationRecord error=null; if (actionPrim == comp) { @@ -254,6 +254,8 @@ + "but got " + status; sfLog().error(errorText); error = TerminationRecord.abnormal(errorText, status.id); + //propagate any exception + error.cause=status.cause; } } tearDownTime=true; @@ -273,7 +275,7 @@ if(tearDownTime && teardownCD!=null) { try { sfCreateNewChild(name + "_teardownRunning", teardownCD, null); - forward = false; + terminate = false; } catch (Exception e) { error = TerminationRecord.abnormal("failed to start teardown", name,e); @@ -299,14 +301,14 @@ this.failed=true; sfTerminate(error); //dont forward, as we are terminating with an error - forward = false; + terminate = false; } else { this.status = status; this.finished=true; this.succeeded=true; } //trigger termination. - return forward; + return terminate; } Modified: trunk/core/testharness/src/org/smartfrog/test/DeployingTestBase.java =================================================================== --- trunk/core/testharness/src/org/smartfrog/test/DeployingTestBase.java 2006-11-16 10:25:19 UTC (rev 3597) +++ trunk/core/testharness/src/org/smartfrog/test/DeployingTestBase.java 2006-11-16 11:20:52 UTC (rev 3598) @@ -25,6 +25,7 @@ import org.smartfrog.services.assertions.TestBlock; import java.rmi.RemoteException; +import java.rmi.NoSuchObjectException; /** * Add an application that is always destroyed on teardown @@ -58,22 +59,26 @@ /** * Delay until a test has finished, sleeping (and yielding the CPU) until * that point is reached. There is no timeout. - * @param testBlock + * @param testBlock component to spin on * @return the termination record of the component * @throws Throwable */ - protected TerminationRecord spinUntilFinished(TestBlock testBlock,long timeout) throws Throwable { + protected TerminationRecord spinUntilFinished(TestBlock testBlock, long timeout) throws Throwable { try { - long endtime = System.currentTimeMillis() +timeout; - while (!testBlock.isFinished() && System.currentTimeMillis()<endtime) { + long endtime = System.currentTimeMillis() + timeout; + while (!testBlock.isFinished() && System.currentTimeMillis() < endtime) { Thread.sleep(SPIN_INTERVAL); } - assertTrue("timeout waiting for application to finish",testBlock.isFinished()); + assertTrue("timeout waiting for application to finish", testBlock.isFinished()); TerminationRecord status = testBlock.getStatus(); return status; + } catch (NoSuchObjectException e) { + //some kind of remoting problem may happen during termination. + logThrowable("Object has been deleted", e); + throw e; } catch (RemoteException e) { //some kind of remoting problem may happen during termination. - logThrowable("RMI excaptions during spin-waits may be network race conditions",e); + logThrowable("RMI exceptions during spin-waits may be network race conditions", e); throw e; } @@ -82,7 +87,7 @@ /** * Delay until a test has finished, sleeping (and yielding the CPU) until * that point is reached. There is no timeout. - * @param testBlock + * @param testBlock component to spin on * @return the termination record of the component * @throws Throwable */ Modified: trunk/core/testharness/src/org/smartfrog/test/SmartFrogTestBase.java =================================================================== --- trunk/core/testharness/src/org/smartfrog/test/SmartFrogTestBase.java 2006-11-16 10:25:19 UTC (rev 3597) +++ trunk/core/testharness/src/org/smartfrog/test/SmartFrogTestBase.java 2006-11-16 11:20:52 UTC (rev 3598) @@ -343,8 +343,9 @@ /** * assert that a throwable's classname is of a given type/substring - * @param thrown - * @param name + * @param thrown what was thrown + * @param name the name of the class + * @param cfgDescMsg description (can be null) */ public void assertThrowableNamed(Throwable thrown,String name, String cfgDescMsg) { assertContains(thrown.getClass().getName(),name, cfgDescMsg, extractDiagnosticsInfo(thrown)); @@ -352,7 +353,7 @@ /** * extract as much info as we can from a throwable. - * @param thrown + * @param thrown what was thrown * @return a string describing the throwable; includes a stack trace */ protected String extractDiagnosticsInfo(Throwable thrown) { Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/TestCompoundsTest.java =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/TestCompoundsTest.java 2006-11-16 10:25:19 UTC (rev 3597) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/TestCompoundsTest.java 2006-11-16 11:20:52 UTC (rev 3598) @@ -19,14 +19,12 @@ */ package org.smartfrog.test.system.assertions.testcompounds; -import org.smartfrog.test.SmartFrogTestBase; import org.smartfrog.test.DeployingTestBase; import org.smartfrog.services.assertions.TestCompoundImpl; import org.smartfrog.services.assertions.TestBlock; -import org.smartfrog.sfcore.prim.Prim; +import org.smartfrog.sfcore.prim.TerminationRecord; +import org.smartfrog.sfcore.common.SmartFrogException; -import java.rmi.RemoteException; - /** * Date: 30-Apr-2004 * Time: 22:03:23 @@ -42,63 +40,58 @@ } public void testEmptySequence() throws Throwable { - application =deployExpectingSuccess(TestCompoundsTest.FILES + "testEmptySequence.sf", "testEmptySequence"); + application = deployExpectingSuccess(TestCompoundsTest.FILES + "testEmptySequence.sf", "testEmptySequence"); expectSuccessfulTermination((TestBlock) application); } - public void NOtestFailure() throws Throwable { - application =deployExpectingSuccess(TestCompoundsTest.FILES + "testFailure.sf", "testFailure"); + public void testFailure() throws Throwable { + TerminationRecord record = deployToAbnormalTermination("testFailure"); + assertRecordContains(record, "failure message",null,null); } - - public void NOtestUnexpectedFailure() throws Throwable { - deployExpectingException(TestCompoundsTest.FILES + "testUnexpectedFailure.sf", - "testUnexpectedFailure", null, TestCompoundImpl.TEST_FAILED_WRONG_STATUS); + private TerminationRecord deployToAbnormalTermination(String test) throws Throwable { + application = deployExpectingSuccess(TestCompoundsTest.FILES + test +".sf", test); + TerminationRecord record = expectAbnormalTermination((TestBlock) application); + return record; } - public void NOtestFailureWrongMessage() throws Throwable { - deployExpectingException(TestCompoundsTest.FILES + "testFailureWrongMessage.sf", - "testFailureWrongMessage",null, TestCompoundImpl.TEST_FAILED_WRONG_STATUS); + protected void assertRecordContains(TerminationRecord record, + String descriptionText, + String throwableClass, + String throwableText) { + if(descriptionText!=null) { + assertContains(record.description,descriptionText); + } + if(throwableClass !=null || throwableText !=null) { + if(record.cause!=null) { + assertFaultCauseAndTextContains(record.cause, + throwableClass, throwableText, null); + } else { + fail("Expected Termination record "+record+" to contain " + +" a throwable "+(throwableClass!=null?throwableClass:"") + + (throwableText!=null?(" with text"+throwableText):"")); + } + + } } - - public void NOtestFailureWrongMessage2() throws Throwable { - application = deployExpectingSuccess(TestCompoundsTest.FILES + "testFailureWrongMessage.sf", - "testFailureWrongMessage"); -/* app.sfPing(null); - app.sfPing(null); - app.sfPing(null); - app.sfPing(null); - app.sfPing(null); - app.sfPing(null);*/ - //terminateApplication(app); - application =null; - + public void testUnexpectedFailure() throws Throwable { + TerminationRecord record = deployToAbnormalTermination("testUnexpectedFailure"); } - /** - * spin, pinging the application until it terminates successfully or not. - * @param ping ping every second? - * @param secondsToSpin number of seconds to spin - * @param expectNormal is a normal exit expected? - * @param errorText any error text to look for - * @param exceptionName - * @param exceptionText - */ - public void spinUntilTerminated(Prim app,boolean ping, int secondsToSpin, - boolean expectNormal,String errorText,String exceptionName,String exceptionText) - throws RemoteException { - - terminateApplication(app); + public void testFailureWrongMessage() throws Throwable { + TerminationRecord record = deployToAbnormalTermination("testFailureWrongMessage"); + assertRecordContains(record, TestCompoundImpl.TEST_FAILED_WRONG_STATUS, null, null); } - public void NOtestFailureWrongMessageNested() throws Throwable { + public void testFailureWrongMessageNested() throws Throwable { application =deployExpectingSuccess(TestCompoundsTest.FILES + "testFailureWrongMessageNested.sf", "testFailureWrongMessageNested"); } - public void NOtestSmartFrogException() throws Throwable { - application =deployExpectingSuccess(TestCompoundsTest.FILES + "testSmartFrogException.sf", "testSmartFrogException"); + public void testSmartFrogException() throws Throwable { + deployExpectingException(TestCompoundsTest.FILES + "testSmartFrogException.sf", + "testSmartFrogException", SmartFrogException.class.toString(), "SFE"); } } Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testSmartFrogException.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testSmartFrogException.sf 2006-11-16 10:25:19 UTC (rev 3597) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testSmartFrogException.sf 2006-11-16 11:20:52 UTC (rev 3598) @@ -34,7 +34,7 @@ sfConfig extends ExpectDeployFailure { action extends SmartFrogException { - message "failure message"; + message "SFE"; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2006-11-16 11:22:06
|
Revision: 3599 http://svn.sourceforge.net/smartfrog/?rev=3599&view=rev Author: steve_l Date: 2006-11-16 03:22:01 -0800 (Thu, 16 Nov 2006) Log Message: ----------- Ivy files Modified Paths: -------------- trunk/core/antbuild/ivy/ivyconf.xml trunk/core/smartfrog/ivy.xml Added Paths: ----------- trunk/core/antbuild/ivy/configurations.xml trunk/core/antbuild/ivy/ivy-doc.xsl trunk/core/components/jetty/ivy.xml trunk/core/components/www/ivy.xml trunk/core/components/www/testwar/ivy.xml trunk/core/components/xml/ivy.xml trunk/core/extras/ant/ivy.xml trunk/core/testharness/ivy.xml Added: trunk/core/antbuild/ivy/configurations.xml =================================================================== --- trunk/core/antbuild/ivy/configurations.xml (rev 0) +++ trunk/core/antbuild/ivy/configurations.xml 2006-11-16 11:22:01 UTC (rev 3599) @@ -0,0 +1,14 @@ +<!-- these are the standard configurations --> +<configurations defaultconfmapping="default"> + <conf name="default" extends="master,runtime"/> + <conf name="compile" visibility="private" + description="artifacts needed to compile the application"/> + <conf name="unittest" extends="compile" + description="the classpath needed to run unittests"/> + <conf name="systemtest" extends="unittest" + description="the classpath needed to run systemtests"/> + <conf name="test" extends="systemtest" + description="the classpath needed to run tests"/> + <conf name="master" description="contains the artifact but no dependencies"/> + <conf name="runtime" description="runtime but not the artifact"/> +</configurations> Added: trunk/core/antbuild/ivy/ivy-doc.xsl =================================================================== --- trunk/core/antbuild/ivy/ivy-doc.xsl (rev 0) +++ trunk/core/antbuild/ivy/ivy-doc.xsl 2006-11-16 11:22:01 UTC (rev 3599) @@ -0,0 +1,291 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> +<!-- + You can copy and modify this xsl for your own use, providing that transformed + ivy files keep a visible link to ivy site (if you don't modify it, it's the + link on ivy logo), and that you respect the following license + + BSD License for IvyRep +Copyright (c) 2005, JAYASOFT +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of JAYASOFT nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + --> +<xsl:template match="/ivy-module"> + <xsl:variable name="repositories" select="/ivy-module/info/repository"/> + <xsl:variable name="ivyauthors" select="/ivy-module/info/ivyauthor"/> + <xsl:variable name="licenses" select="/ivy-module/info/license"/> + <xsl:variable name="configurations" select="/ivy-module/configurations"/> + <xsl:variable name="public.conf" select="$configurations/conf[not(@visibility) and not(@deprecated)] | $configurations/conf[@visibility='public' and not(@deprecated)]"/> + <xsl:variable name="deprecated.conf" select="configurations/conf[not(@visibility) and @deprecated] | configurations/conf[@visibility='public' and @deprecated]"/> + <xsl:variable name="private.conf" select="configurations/conf[@visibility='private']"/> + + <xsl:variable name="artifacts" select="/ivy-module/publications/artifact"/> + <xsl:variable name="dependencies" select="/ivy-module/dependencies/dependency"/> + + <html> + <head> + <title><xsl:value-of select="info/@module"/> by <xsl:value-of select="info/@organisation"/> :: Ivy description</title> + <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"/> + <meta http-equiv="content-language" content="en"/> + <meta name="robots" content="index,follow"/> + <link rel="stylesheet" type="text/css" href="http://ivyrep.jayasoft.org/ivy-style.css"/> + </head> + <body> + <div id="logo"><a href="http://ivy.jayasoft.org/"><img src="http://ivy.jayasoft.org/logo.png"/></a><br/><a id="rep" href="http://ivyrep.jayasoft.org/">Ivy Repository</a></div> + <h1> + <span id="module"> + <xsl:element name="a"> + <xsl:attribute name="href">http://ivyrep.jayasoft.org/<xsl:value-of select="info/@organisation"/>/<xsl:value-of select="info/@module"/>/</xsl:attribute> + <xsl:value-of select="info/@module"/> + </xsl:element> + </span> + by + <span id="organisation"> + <xsl:element name="a"> + <xsl:attribute name="href">http://ivyrep.jayasoft.org/<xsl:value-of select="info/@organisation"/>/</xsl:attribute> + <xsl:value-of select="info/@organisation"/> + </xsl:element> + </span></h1> + <div id="revision"><span id="revision">Revision: </span><xsl:value-of select="info/@revision"/></div> + <table class="header"> + <tr><td class="title">Status</td><td class="value"><xsl:value-of select="info/@status"/></td></tr> + <tr><td class="title">Home Page</td><td class="value"> + <xsl:if test="info/description/@homepage"> + <xsl:element name="a"> + <xsl:attribute name="href"><xsl:value-of select="info/description/@homepage"/></xsl:attribute> + <xsl:value-of select="info/description/@homepage"/> + </xsl:element> + </xsl:if> + </td></tr> + <tr><td class="title">Licenses</td><td class="value"> + <xsl:for-each select="$licenses"> + <xsl:if test="@url"> + <xsl:element name="a"> + <xsl:attribute name="href"><xsl:value-of select="@url"/></xsl:attribute> + <xsl:value-of select="@name"/> + </xsl:element> + </xsl:if> + <xsl:if test="not(@url)"> + <xsl:value-of select="@name"/> + </xsl:if> + </xsl:for-each> + </td></tr> + <tr><td class="title">Ivy Authors</td><td class="value"> + <xsl:for-each select="$ivyauthors"> + <xsl:if test="@url"> + <xsl:element name="a"> + <xsl:attribute name="href"><xsl:value-of select="@url"/></xsl:attribute> + <xsl:value-of select="@name"/> + </xsl:element> + </xsl:if> + <xsl:if test="not(@url)"> + <xsl:value-of select="@name"/> + </xsl:if> + </xsl:for-each> + </td></tr> + <tr><td class="title">Description</td><td class="value"><xsl:copy-of select="info/description"/></td></tr> + </table> + + <xsl:if test="count($repositories) > 0"> + <div id="repositories"> + <h2>Public Repositories</h2> + <table> + <thead> + <tr> + <th>Name</th> + <th>Url</th> + <th>Pattern</th> + <th>Ivys</th> + <th>Artifacts</th> + </tr> + </thead> + <tbody> + <xsl:for-each select="$repositories"> + <tr> + <td><xsl:value-of select="@name"/></td> + <td> + <xsl:element name="a"> + <xsl:attribute name="href"><xsl:value-of select="@url"/></xsl:attribute> + <xsl:value-of select="@url"/> + </xsl:element> + </td> + <td><xsl:value-of select="@pattern"/></td> + <td><xsl:value-of select="@ivys"/></td> + <td><xsl:value-of select="@artifacts"/></td> + </tr> + </xsl:for-each> + </tbody> + </table> + </div> + </xsl:if> + + <div id="public-confs" class="conf"> + <h2>Public Configurations</h2> + <table> + <thead> + <tr> + <th class="conf-name">Name</th> + <th class="conf-desc">Description</th> + <th class="conf-extends">Extends</th> + </tr> + </thead> + <tbody> + <xsl:for-each select="$public.conf"> + <tr> + <td><xsl:value-of select="@name"/></td> + <td><xsl:value-of select="@description"/></td> + <td><xsl:value-of select="@extends"/></td> + </tr> + </xsl:for-each> + <xsl:if test="count($public.conf) = 0"> + <tr> + <td>default</td> + <td/> + <td/> + </tr> + </xsl:if> + </tbody> + </table> + </div> + + <xsl:if test="count($deprecated.conf) > 0"> + <div id="deprecated-confs" class="conf"> + <h2>Deprecated Configurations</h2> + <table> + <thead> + <tr> + <th class="conf-name">Name</th> + <th class="conf-desc">Description</th> + <th class="conf-extends">Extends</th> + </tr> + </thead> + <tbody> + <xsl:for-each select="$deprecated.conf"> + <tr> + <td><xsl:value-of select="@name"/></td> + <td><xsl:value-of select="@description"/></td> + <td><xsl:value-of select="@extends"/></td> + </tr> + </xsl:for-each> + </tbody> + </table> + </div> + </xsl:if> + + <xsl:if test="count($private.conf) > 0"> + <div id="deprecated-confs" class="conf"> + <h2>Private Configurations</h2> + <table> + <thead> + <tr> + <th class="conf-name">Name</th> + <th class="conf-desc">Description</th> + <th class="conf-extends">Extends</th> + </tr> + </thead> + <tbody> + <xsl:for-each select="$private.conf"> + <tr> + <td><xsl:value-of select="@name"/></td> + <td><xsl:value-of select="@description"/></td> + <td><xsl:value-of select="@extends"/></td> + </tr> + </xsl:for-each> + </tbody> + </table> + </div> + </xsl:if> + + <div id="artifacts"> + <h2>Published Artifacts</h2> + <table> + <thead> + <tr> + <th class="art-name">Name</th> + <th class="art-type">Type</th> + <th class="art-conf">Configurations</th> + </tr> + </thead> + <tbody> + <xsl:for-each select="$artifacts"> + <tr> + <td><xsl:value-of select="@name"/></td> + <td><xsl:value-of select="@type"/></td> + <td> + <xsl:value-of select="@conf"/> + <xsl:for-each select="conf"> + <xsl:if test="position() > 1">, + </xsl:if> + <xsl:value-of select="@name"/> + </xsl:for-each> + <xsl:if test="not(@conf) and count(conf) = 0"> + <i>all</i> + </xsl:if> + </td> + </tr> + </xsl:for-each> + <xsl:if test="count($artifacts) = 0"> + <td><xsl:value-of select="info/@module"/></td> + <td>jar</td> + <td><i>all</i></td> + </xsl:if> + </tbody> + </table> + </div> + + <xsl:if test="count($dependencies) > 0"> + <div id="dependencies"> + <h2>Dependencies</h2> + <table> + <thead> + <tr> + <th class="dep-org">Organisation</th> + <th class="dep-name">Name</th> + <th class="dep-rev">Revision</th> + </tr> + </thead> + <tbody> + <xsl:for-each select="$dependencies"> + <tr> + <td><xsl:if test="not(@org)"><xsl:value-of select="/ivy-module/info/@organisation"/></xsl:if><xsl:value-of select="@org"/></td> + <td> + <xsl:element name="a"> + <xsl:attribute name="href">http://ivyrep.jayasoft.org/<xsl:if test="not(@org)"><xsl:value-of select="/ivy-module/info/@organisation"/></xsl:if><xsl:value-of select="@org"/>/<xsl:value-of select="@name"/>/ivy-<xsl:value-of select="@rev"/>.xml</xsl:attribute> + <xsl:value-of select="@name"/> + </xsl:element> + </td> + <td><xsl:value-of select="@rev"/></td> + </tr> + </xsl:for-each> + </tbody> + </table> + </div> + </xsl:if> + + + </body> + </html> +</xsl:template> +</xsl:stylesheet> \ No newline at end of file Modified: trunk/core/antbuild/ivy/ivyconf.xml =================================================================== --- trunk/core/antbuild/ivy/ivyconf.xml 2006-11-16 11:20:52 UTC (rev 3598) +++ trunk/core/antbuild/ivy/ivyconf.xml 2006-11-16 11:22:01 UTC (rev 3599) @@ -20,14 +20,19 @@ <include url="${ivy.default.conf.dir}/ivyconf-local.xml"/> <conf defaultResolver="default"/> <resolvers> +<!-- BUGBUG: not a real m2 repo structure <filesystem name="team"> ivys="true" artifacts="true" m2compatible="true" > - <artifact pattern="${ivy.conf.dir}/repository/${maven2.pattern.ext}"/> - <ivy pattern="${ivy.conf.dir}/repository/${maven2.pattern}.xml"/> + <artifact pattern="${root.dir}/antbuild/repository/${maven2.pattern.ext}"/> + <ivy pattern="${root.dir}/antbuild/repository/${maven2.pattern}.xml"/> + </filesystem>--> + <filesystem name="team"> + ivys="true" artifacts="true" + m2compatible="true" > + <artifact pattern="${root.dir}/antbuild/repository/${maven2.pattern.ext}"/> + <ivy pattern="${root.dir}/antbuild/repository/${maven2.pattern}.xml"/> </filesystem> - <ivyrep name="ivyrep"/> - <ivyrep name="sandbox" ivyroot="http://opensvn.csie.org/ivyrepsandbox/"/> <ibiblio name="maven2" root="${ibiblio-maven2-root}" pattern="${maven2.pattern.ext}" @@ -36,8 +41,6 @@ <chain name="default" dual="true"> <resolver ref="local"/> <resolver ref="team"/> -<!-- <resolver ref="ivyrep"/> - <resolver ref="sandbox"/>--> <resolver ref="maven2"/> </chain> <chain name="internal"> @@ -46,6 +49,6 @@ </chain> </resolvers> <modules> - <module organisation="org.antbook" name=".*" resolver="internal"/> + <module organisation="org.smartfrog" name=".*" resolver="internal"/> </modules> </ivyconf> \ No newline at end of file Added: trunk/core/components/jetty/ivy.xml =================================================================== --- trunk/core/components/jetty/ivy.xml (rev 0) +++ trunk/core/components/jetty/ivy.xml 2006-11-16 11:22:01 UTC (rev 3599) @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?> +<ivy-module version="1.0"> + <info organisation="org.smartfrog" module="sf-jetty"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description>SmartFrog jetty component</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="unittest" extends="compile" + description="the classpath needed to run unittests"/> + <conf name="systemtest" extends="unittest" + description="the classpath needed to run systemtests"/> + <conf name="test" extends="systemtest" + description="the classpath needed to run tests"/> + <conf name="master" description="contains the artifact but no dependencies"/> + <conf name="runtime" description="runtime but not the artifact"/> + </configurations> + <publications> + <!--get the artifact from our module name--> + <artifact conf="master"/> + </publications> + <dependencies> + <dependency org="org.smartfrog" + name="sf-www" + changing="true" + rev="latest.integration" + conf="compile->default;runtime->default;systemtest->default"/> + <dependency org="org.smartfrog" + name="sf-tasks" + rev="latest.integration" + conf="build->default"/> + <dependency org="javax.servlet" + name="servlet-api" + rev="${servletapi.version}" + conf="compile->master"/> + <dependency org="org.mortbay.jetty" + name="jetty" + rev="${jetty.version}" + conf="compile->default;runtime->default"/> + </dependencies> +</ivy-module> \ No newline at end of file Added: trunk/core/components/www/ivy.xml =================================================================== --- trunk/core/components/www/ivy.xml (rev 0) +++ trunk/core/components/www/ivy.xml 2006-11-16 11:22:01 UTC (rev 3599) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?> +<ivy-module version="1.0"> + <info organisation="org.smartfrog" module="sf-www"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description>SmartFrog web component</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="unittest" extends="compile" + description="the classpath needed to run unittests"/> + <conf name="systemtest" extends="unittest" + description="the classpath needed to run systemtests"/> + <conf name="test" extends="systemtest" + description="the classpath needed to run tests"/> + <conf name="master" description="contains the artifact but no dependencies"/> + <conf name="runtime" description="runtime but not the artifact"/> + </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->services;runtime->services;systemtest->services"/> + <dependency org="org.smartfrog" + name="sf-tasks" + rev="latest.integration" + conf="build->default"/> + <dependency org="javax.servlet" + name="servlet-api" + rev="${servletapi.version}" + conf="compile->master"/> + </dependencies> +</ivy-module> \ No newline at end of file Added: trunk/core/components/www/testwar/ivy.xml =================================================================== --- trunk/core/components/www/testwar/ivy.xml (rev 0) +++ trunk/core/components/www/testwar/ivy.xml 2006-11-16 11:22:01 UTC (rev 3599) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?> +<ivy-module version="1.0"> + <info organisation="org.smartfrog" module="sf-www"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description>SmartFrog web component</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="unittest" extends="compile" + description="the classpath needed to run unittests"/> + <conf name="systemtest" extends="unittest" + description="the classpath needed to run systemtests"/> + <conf name="test" extends="systemtest" + description="the classpath needed to run tests"/> + <conf name="master" description="contains the artifact but no dependencies"/> + <conf name="runtime" description="runtime but not the artifact"/> + </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->services;runtime->services;systemtest->services"/> + <dependency org="org.smartfrog" + name="sf-tasks" + rev="latest.integration" + conf="build->default"/> + </dependencies> +</ivy-module> \ No newline at end of file Added: trunk/core/components/xml/ivy.xml =================================================================== --- trunk/core/components/xml/ivy.xml (rev 0) +++ trunk/core/components/xml/ivy.xml 2006-11-16 11:22:01 UTC (rev 3599) @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?> +<ivy-module version="1.0"> + <info organisation="org.smartfrog" module="sf-xml"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description>XML support by way of Xom</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="unittest" extends="compile" + description="the classpath needed to run unittests"/> + <conf name="systemtest" extends="unittest" + description="the classpath needed to run systemtests"/> + <conf name="test" extends="systemtest" + description="the classpath needed to run tests"/> + <conf name="master" description="contains the artifact but no dependencies"/> + <conf name="runtime" description="runtime but not the artifact"/> + </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->services;runtime->services;systemtest->services"/> + <dependency org="org.smartfrog" + name="sf-tasks" + rev="latest.integration" + conf="build->default"/> + <dependency org="xerces" + name="xercesImpl" + rev="${xerces.version}" + conf="compile->master;runtime->master"/> + <dependency org="xerces" + name="xmlParserAPIs" + rev="${xerces.version}" + conf="compile->master;runtime->master"/> + + <!--xom depends on Jaxen, which is a mess. exclude it--> + <dependency org="xom" + name="xom" + rev="${xom.version}" + conf="compile->master;runtime->master"/> + <!-- here jaxen is included, but none of its dependencies--> + <dependency org="jaxen" + name="jaxen" + rev="${jaxen.version}" + conf="compile->master;runtime->master"/> + </dependencies> +</ivy-module> \ No newline at end of file Added: trunk/core/extras/ant/ivy.xml =================================================================== --- trunk/core/extras/ant/ivy.xml (rev 0) +++ trunk/core/extras/ant/ivy.xml 2006-11-16 11:22:01 UTC (rev 3599) @@ -0,0 +1,43 @@ +<?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-m32"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description>Alpine SOAP stack, M32 prototype</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="compile" visibility="private" + description="artifacts needed to compile the application"/> + <conf name="unittest" extends="compile" + description="the classpath needed to run unittests"/> + <conf name="systemtest" extends="unittest" + description="the classpath needed to run systemtests"/> + <conf name="test" extends="systemtest" + description="the classpath needed to run tests"/> + <conf name="master" description="contains the artifact but no dependencies"/> + <conf name="runtime" description="runtime but not the artifact"/> + </configurations> + + <publications> + <!--get the artifact from our module name--> + <artifact /> + </publications> + <dependencies> + <dependency org="org.smartfrog" + name="smartfrog" + rev="latest.integration" + conf="compile->core;runtime->core;systemtest->services"/> + <!--still a bit unstable--> + <dependency org="junit" + name="junit" + rev="${junit.version}" + conf="unittest->default"/> + </dependencies> +</ivy-module> \ No newline at end of file Modified: trunk/core/smartfrog/ivy.xml =================================================================== --- trunk/core/smartfrog/ivy.xml 2006-11-16 11:20:52 UTC (rev 3598) +++ trunk/core/smartfrog/ivy.xml 2006-11-16 11:22:01 UTC (rev 3599) @@ -4,21 +4,39 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../antbuild/ivy/ivy.xsd" > - <info organisation="org.smartfrog" module="smartfrog"/> - <!-- define our configurations, based on the maven set --> + <info organisation="org.smartfrog" module="smartfrog"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description>Smartfrog core, services and examples</description> + </info> + <!-- define our configurations --> <configurations defaultconfmapping="default"> - <conf name="compile" visibility="private"/> - <conf name="test" extends="compile" visibility="private"/> - <conf name="master" description="contains the artifact but no dependencies"/> + <conf name="default" extends="master,runtime"/> + <conf name="compile" visibility="private" + description="artifacts needed to compile the application"/> + <conf name="unittest" extends="compile" + description="the classpath needed to run unittests"/> + <conf name="systemtest" extends="compile" + description="the classpath needed to run systemtests"/> + <conf name="test" extends="unittest,systemtest" + description="the classpath needed to run tests"/> + <conf name="core" description="the core smartfrog JAR only"/> + <conf name="services" description="the core and sfServices JAR" extends="core"/> + <conf name="examples" description="the core, sfSercies and sfExamples JARs" + extends="services"/> + + <conf name="master" description="contains the artifact but no dependencies" + extends="services"/> <conf name="runtime" description="runtime but not the artifact"/> - <conf name="default" extends="master,runtime"/> + + <!--non standard configurations--> <conf name="javacc" visibility="private"/> </configurations> <publications> <!--get the artifact from our module name--> - <artifact name="${smartfrog.title}"/> - <artifact name="${sf-examples.title}" /> - <artifact name="${sf-services.title}"/> + <artifact name="${smartfrog.title}" conf="core"/> + <artifact name="${sf-services.title}" conf="services"/> + <artifact name="${sf-examples.title}" conf="examples"/> </publications> <dependencies> Added: trunk/core/testharness/ivy.xml =================================================================== --- trunk/core/testharness/ivy.xml (rev 0) +++ trunk/core/testharness/ivy.xml 2006-11-16 11:22:01 UTC (rev 3599) @@ -0,0 +1,40 @@ +<?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-testharness"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description>Smartfrog test harness, for running smartfrog under junit 3.8.x</description> + </info> +<!-- <configurations defaultconfmapping="runtime"> + <include file="${basedir}/../antbuild/ivy/configurations.xml"/> + </configurations>--> + <configurations defaultconfmapping="default"> + <conf name="default" extends="master,runtime"/> + <conf name="compile" visibility="private" + description="artifacts needed to compile the application"/> + <conf name="unittest" extends="compile" + description="the classpath needed to run unittests"/> + <conf name="systemtest" extends="unittest" + description="the classpath needed to run systemtests"/> + <conf name="test" extends="systemtest" + description="the classpath needed to run tests"/> + <conf name="master" description="contains the artifact but no dependencies"/> + <conf name="runtime" description="runtime but not the artifact"/> + </configurations> + <publications> + <!--get the artifact from our module name--> + <artifact /> + </publications> + <dependencies> + <dependency org="org.smartfrog" + name="smartfrog" + changing="true" + rev="latest.integration" + conf="compile->examples;runtime->examples"/> + <dependency org="junit" + name="junit" + rev="${junit.version}" + conf="compile->default;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...> - 2006-11-16 17:03:25
|
Revision: 3607 http://svn.sourceforge.net/smartfrog/?rev=3607&view=rev Author: steve_l Date: 2006-11-16 09:03:19 -0800 (Thu, 16 Nov 2006) Log Message: ----------- Ivy files for lots of components. the scripting one is incomplete, but the rest generate dependencies artifacts for a standard set of configurations. Modified Paths: -------------- trunk/core/antbuild/ivy/configurations.xml trunk/core/antbuild/ivy/ivyconf.xml trunk/core/common.xml trunk/core/components/database/.svnignore trunk/core/components/jetty/ivy.xml trunk/core/components/libraries.properties trunk/core/components/www/ivy.xml trunk/core/components/xml/ivy.xml trunk/core/extras/ant/ivy.xml trunk/core/testharness/ivy.xml Added Paths: ----------- trunk/core/components/ant/ivy.xml trunk/core/components/anubis/ivy.xml trunk/core/components/cargo/ivy.xml trunk/core/components/database/ivy.xml trunk/core/components/junit/ivy.xml trunk/core/components/loggingservices/ivy.xml trunk/core/components/scripting/ivy.xml trunk/core/components/tomcat/ivy.xml trunk/core/components/xmpp/ivy.xml trunk/core/extras/cdl/ivy.xml Modified: trunk/core/antbuild/ivy/configurations.xml =================================================================== --- trunk/core/antbuild/ivy/configurations.xml 2006-11-16 15:58:49 UTC (rev 3606) +++ trunk/core/antbuild/ivy/configurations.xml 2006-11-16 17:03:19 UTC (rev 3607) @@ -1,14 +1,17 @@ <!-- these are the standard configurations --> <configurations defaultconfmapping="default"> - <conf name="default" extends="master,runtime"/> + <conf name="default" extends="master,runtime" + description="default configuration contains artifacts and runtime dependencies"/> + <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="unittest" extends="compile" - description="the classpath needed to run unittests"/> - <conf name="systemtest" extends="unittest" - description="the classpath needed to run systemtests"/> - <conf name="test" extends="systemtest" + <conf name="daemon" visibility="private" + description="the classpath needed to run smartfrog daemons"/> + <conf name="test" extends="default,compile" description="the classpath needed to run tests"/> <conf name="master" description="contains the artifact but no dependencies"/> - <conf name="runtime" description="runtime but not the artifact"/> + <conf name="redist" description="redistributals excluding smartfrog artifacts"/> + <conf name="runtime" description="runtime but not the artifact" + extends="redist"/> </configurations> Modified: trunk/core/antbuild/ivy/ivyconf.xml =================================================================== --- trunk/core/antbuild/ivy/ivyconf.xml 2006-11-16 15:58:49 UTC (rev 3606) +++ trunk/core/antbuild/ivy/ivyconf.xml 2006-11-16 17:03:19 UTC (rev 3607) @@ -50,5 +50,6 @@ </resolvers> <modules> <module organisation="org.smartfrog" name=".*" resolver="internal"/> + <module organisation="org.ggf" name=".*" resolver="internal"/> </modules> </ivyconf> \ No newline at end of file Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2006-11-16 15:58:49 UTC (rev 3606) +++ trunk/core/common.xml 2006-11-16 17:03:19 UTC (rev 3607) @@ -605,6 +605,8 @@ depends="init-common-simpledefinitions"> <delete dir="${build.dir}" /> <delete dir="${dist.dir}" /> + <delete dir="releases" /> + <delete file="version.properties"/> </target> <!-- ========================================================== --> @@ -1072,6 +1074,12 @@ </target> + <!-- =================================================================== --> + <!-- a clean distribution --> + <!-- =================================================================== --> + <target name="fromclean" depends="clean,dist" + description="create a clean distribution"/> + <!-- ========================================================== --> <!-- this is an override point --> <!-- copy all dependencies --> @@ -1267,12 +1275,7 @@ <!-- ========================================================== --> <!-- init all the maven2 support --> <!-- ========================================================== --> - <target name="m2-init" depends="init,init-proxy,declare-extended-smartfrog-tasks"> - <!-- per project, SVN managed override --> - <property file="libraries.properties" /> - <!-- central SVN managed libraries list --> - <property file="${smartfrog.components.dir}/libraries.properties" /> - + <target name="m2-init" depends="init,init-proxy,declare-extended-smartfrog-tasks,load-versions"> <!-- Maven2 stuff All components build into the org.smartfrog group, unless otherwise stated, but are their own artifacts. @@ -1364,7 +1367,7 @@ </target> <!-- look for local then remote definitions of library versions --> - <target name="m2-load-versions" depends="init"> + <target name="load-versions" depends="init"> <property file="libraries.properties"/> <property file="${smartfrog.components.dir}/libraries.properties"/> </target> @@ -1413,7 +1416,46 @@ </target> - <target name="installed" depends="m2-install" + + <target name="ivy-init" depends="init-common-simpledefinitions,load-versions" + xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> + <property name="ivy.lib.dir" location="${build.dir}/lib" /> + <ivy:configure file="${core.dir}/antbuild/ivy/ivyconf.xml"/> + </target> + + <target name="ivy-resolve" depends="ivy-init" + xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> + <ivy:resolve /> + </target> + + <target name="ivy-retrieve" depends="ivy-resolve" + xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> + <ivy:retrieve pattern="${ivy.lib.dir}/[conf]/[artifact]-[revision].[ext]" sync="true" /> + </target> + + <target name="ivy-report" depends="ivy-resolve" + xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> + <ivy:report todir="${build.dir}/ivy/reports"/> + <echo> published Ivy report to + ${build.dir}/ivy/reports + </echo> + </target> + + <!--jars,--> + <target name="ready-to-publish" depends="checksum-target-jar,ivy-report"/> + + <target name="ivy-publish" depends="ready-to-publish" + xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> + <ivy:publish resolver="local" pubrevision="${Version}" + overwrite="true" + artifactspattern="${dist.lib.dir}/[artifact]-[revision].[ext]" /> + </target> + + <target name="published" depends="ivy-publish,m2-install" + description="Publish artifacts to the local repositories" + /> + + <target name="installed" depends="published" description="Place the system in a state in which the components are installed for reuse" /> Added: trunk/core/components/ant/ivy.xml =================================================================== --- trunk/core/components/ant/ivy.xml (rev 0) +++ trunk/core/components/ant/ivy.xml 2006-11-16 17:03:19 UTC (rev 3607) @@ -0,0 +1,61 @@ +<?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-ant"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description> + Component to run Ant tasks under Smartfrog + Created 16-Nov-2006 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" + description="default configuration contains artifacts and runtime dependencies"/> + <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,compile" + 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->services;runtime->services;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"/> + <dependency org="ant" + name="ant" + rev="${apache.ant.version}" + conf="compile->default;redist->default"/> +<!-- <dependency org="ant" + name="ant-optional" + rev="${ant.version}" + conf="runtime->default"/>--> + </dependencies> +</ivy-module> \ No newline at end of file Added: trunk/core/components/anubis/ivy.xml =================================================================== --- trunk/core/components/anubis/ivy.xml (rev 0) +++ trunk/core/components/anubis/ivy.xml 2006-11-16 17:03:19 UTC (rev 3607) @@ -0,0 +1,47 @@ +<?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-anubis"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description> + Anubis fault-tolerant tuple space + Created 16-Nov-2006 + </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" + description="default configuration contains artifacts and runtime dependencies"/> + <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,compile" + description="the classpath needed to run tests"/> + <conf name="master" description="contains the artifact but no dependencies"/> + <conf name="runtime" description="runtime but not the artifact"/> +</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->services;runtime->services;daemon->services"/> + <dependency org="org.smartfrog" + name="sf-tasks" + rev="latest.integration" + conf="build->default"/> + </dependencies> +</ivy-module> \ No newline at end of file Added: trunk/core/components/cargo/ivy.xml =================================================================== --- trunk/core/components/cargo/ivy.xml (rev 0) +++ trunk/core/components/cargo/ivy.xml 2006-11-16 17:03:19 UTC (rev 3607) @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?> +<ivy-module version="1.0"> + <info organisation="org.smartfrog" module="sf-cargo"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description>SmartFrog jetty component</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" + description="default configuration contains artifacts and runtime dependencies"/> + <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,compile" + 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="services->daemon"/> + <dependency org="org.smartfrog" + name="sf-www" + changing="true" + rev="latest.integration" + conf="compile->default;runtime->default;systemtest->default"/> + <dependency org="org.smartfrog" + name="sf-tasks" + changing="true" + rev="latest.integration" + conf="build->default"/> + <!--get the ant redistributables--> + <dependency org="org.smartfrog" + name="sf-ant" + changing="true" + rev="latest.integration" + conf="redist->redist"/> + <dependency org="org.codehaus.cargo" + name="cargo-core-api-generic" + rev="${cargo.version}" + conf="compile->master;redist->default"> + <exclude org="xalan" /> + <exclude org="xerces"/> + <exclude org="ant"/> + <exclude org="xml-apis"/> + </dependency> + <dependency org="org.codehaus.cargo" + name="cargo-core-container-geronimo" + rev="${cargo.version}" + conf="redist->default"/> + <dependency org="org.codehaus.cargo" + name="cargo-core-container-jboss" + rev="${cargo.version}" + conf="redist->default"/> + <dependency org="org.codehaus.cargo" + name="cargo-core-container-jetty" + rev="${cargo.version}" + conf="redist->default"/> + <dependency org="org.codehaus.cargo" + name="cargo-core-container-tomcat" + rev="${cargo.version}" + conf="redist->default"/> + <dependency org="org.codehaus.cargo" + name="cargo-core-container-weblogic" + rev="${cargo.version}" + conf="redist->default"/> + </dependencies> +</ivy-module> \ No newline at end of file Modified: trunk/core/components/database/.svnignore =================================================================== --- trunk/core/components/database/.svnignore 2006-11-16 15:58:49 UTC (rev 3606) +++ trunk/core/components/database/.svnignore 2006-11-16 17:03:19 UTC (rev 3607) @@ -1,3 +1,13 @@ build dist -*.iml \ No newline at end of file +build.properties +runtime.properties +common.properties +*.jpx +*.ipr +*.iml +*.iws +.classpath +.project +lib + Added: trunk/core/components/database/ivy.xml =================================================================== --- trunk/core/components/database/ivy.xml (rev 0) +++ trunk/core/components/database/ivy.xml 2006-11-16 17:03:19 UTC (rev 3607) @@ -0,0 +1,65 @@ +<?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-database"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description> + JDBC components for database configuration + Created 16-Nov-2006 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" + description="default configuration contains artifacts and runtime dependencies"/> + <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,compile" + 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->services;runtime->services;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"/> + <dependency org="org.smartfrog" + name="sf-testharness" + rev="latest.integration" + conf="test->default"/> + <dependency org="mysql" + name="mysql-connector-java" + rev="${mysql.version}" + conf="test->default"/> + <dependency org="hsqldb" + name="hsqldb" + rev="${hsqldb.version}" + conf="test->default"/> + </dependencies> +</ivy-module> \ No newline at end of file Modified: trunk/core/components/jetty/ivy.xml =================================================================== --- trunk/core/components/jetty/ivy.xml 2006-11-16 15:58:49 UTC (rev 3606) +++ trunk/core/components/jetty/ivy.xml 2006-11-16 17:03:19 UTC (rev 3607) @@ -12,19 +12,20 @@ </configurations> --> <configurations defaultconfmapping="default"> - <conf name="default" extends="master,runtime"/> + <conf name="default" extends="master,runtime" + description="default configuration contains artifacts and runtime dependencies"/> <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="unittest" extends="compile" - description="the classpath needed to run unittests"/> - <conf name="systemtest" extends="unittest" - description="the classpath needed to run systemtests"/> - <conf name="test" extends="systemtest" + <conf name="daemon" visibility="private" + description="the classpath needed to run smartfrog daemons"/> + <conf name="test" extends="default,compile" description="the classpath needed to run tests"/> <conf name="master" description="contains the artifact but no dependencies"/> - <conf name="runtime" description="runtime but not the artifact"/> + <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--> @@ -32,12 +33,18 @@ </publications> <dependencies> <dependency org="org.smartfrog" - name="sf-www" - changing="true" - rev="latest.integration" - conf="compile->default;runtime->default;systemtest->default"/> + name="smartfrog" + changing="true" + rev="latest.integration" + conf="services->daemon"/> <dependency org="org.smartfrog" + name="sf-www" + changing="true" + rev="latest.integration" + conf="compile->default;runtime->default;systemtest->default"/> + <dependency org="org.smartfrog" name="sf-tasks" + changing="true" rev="latest.integration" conf="build->default"/> <dependency org="javax.servlet" @@ -47,6 +54,6 @@ <dependency org="org.mortbay.jetty" name="jetty" rev="${jetty.version}" - conf="compile->default;runtime->default"/> + conf="compile->default;redist->default"/> </dependencies> </ivy-module> \ No newline at end of file Added: trunk/core/components/junit/ivy.xml =================================================================== --- trunk/core/components/junit/ivy.xml (rev 0) +++ trunk/core/components/junit/ivy.xml 2006-11-16 17:03:19 UTC (rev 3607) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?> +<ivy-module version="1.0"> + <info organisation="org.smartfrog" module="sf-junit"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description>Functional testing</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,compile" + 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->services;runtime->services;daemon->services"/> + <dependency org="org.smartfrog" + name="sf-tasks" changing="true" + rev="latest.integration" + conf="build->default"/> + <dependency org="org.smartfrog" + name="sf-xml" changing="true" + rev="latest.integration" + conf="compile->master;runtime->default"/> + <dependency org="org.smartfrog" + name="sf-testharness" changing="true" + rev="latest.integration" + conf="test->default"/> + <dependency org="junit" + 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 Modified: trunk/core/components/libraries.properties =================================================================== --- trunk/core/components/libraries.properties 2006-11-16 15:58:49 UTC (rev 3606) +++ trunk/core/components/libraries.properties 2006-11-16 17:03:19 UTC (rev 3607) @@ -1,41 +1,48 @@ #this file declares the libraries for use in #a given release of the components -#please keep in alphabetical order +#please keep in alphabetical order, after splitting to in Maven/not in maven #FOUND IN MAVEN activation.version=1.1 +apache.ant.version=1.6.5 ant.m2.version=1.6.5 -bsh.version=2.0b1 +bsh.version=2.0b4 cargo.version=0.8 commons-lang.version=2.1 commons-net.version=1.2.2 commons-logging.version=1.0.4 commons-httpclient.version=3.0 +hsqldb.version=1.8.0.7 httpunit.version=1.6 jaxen.version=1.1-beta-8 +jetty.version=4.2.9 jsch.version=0.1.17 junit.version=3.8.2 log4j.version=1.2.13 mail.version=1.4 +mysql.version=3.1.13 rhino.version=1.5R4.1 -servletapi.version=2.3 +rome.version=0.8 +servletapi.version=2.4 smack.version=2.2.1 velocity.version=1.4 + #plugins for maven itself wagon-file.version=1.0-alpha-5 wagon-ssh.version=1.0-alpha-5 wagon-ssh-external.version=1.0-alpha-5 wagon-ftp.version=1.0-alpha-5 + xalan.version=2.6.0 -#xerces.version=2.7.1 xerces.version=2.6.2 xom.version=1.1 #NOT IN MAVEN -ant-testutil.version=1.7 +ant-testutil.version=1.7.0RC1 +#jetty.version=4.2.29 axis2.version=0.95-SNAPSHOT -cddlm.version=ggf16-SNAPSHOT -jetty.version=4.2.24 +cddlm.version=latest.integration +javaee.version=1.5 nux.version=1.0rc3 Added: trunk/core/components/loggingservices/ivy.xml =================================================================== --- trunk/core/components/loggingservices/ivy.xml (rev 0) +++ trunk/core/components/loggingservices/ivy.xml 2006-11-16 17:03:19 UTC (rev 3607) @@ -0,0 +1,60 @@ +<?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-loggingservices"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description> + logging services + Created 16-Nov-2006 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" + description="default configuration contains artifacts and runtime dependencies"/> + <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,compile" + 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->services;runtime->services;daemon->services"/> + <dependency org="org.smartfrog" + name="sf-tasks" + rev="latest.integration" + conf="build->default"/> + <dependency org="log4j" + name="log4j" + rev="${log4j.version}" + conf="compile->default;redist->default" + /> + <dependency org="commons-logging" + name="commons-logging-api" + rev="${commons-logging.version}" + conf="compile->master;redist->master"/> + + + </dependencies> +</ivy-module> \ No newline at end of file Added: trunk/core/components/scripting/ivy.xml =================================================================== --- trunk/core/components/scripting/ivy.xml (rev 0) +++ trunk/core/components/scripting/ivy.xml 2006-11-16 17:03:19 UTC (rev 3607) @@ -0,0 +1,58 @@ +<?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-scripting"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description> + Beanshell Scripting Component + Created 16-Nov-2006 + </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" + description="default configuration contains artifacts and runtime dependencies"/> + <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,compile" + 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->services;runtime->services;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"/> +<!-- Getting errors here. + <dependency org="org.beanshell" + name="bsh" + rev="${bsh.version}" + conf="compile->default;redist->default"/>--> + </dependencies> +</ivy-module> \ No newline at end of file Added: trunk/core/components/tomcat/ivy.xml =================================================================== --- trunk/core/components/tomcat/ivy.xml (rev 0) +++ trunk/core/components/tomcat/ivy.xml 2006-11-16 17:03:19 UTC (rev 3607) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?> +<ivy-module version="1.0"> + <info organisation="org.smartfrog" module="sf-tomcat"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description>SmartFrog jetty component</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" + description="default configuration contains artifacts and runtime dependencies"/> + <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,compile" + 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="daemon->services"/> + <dependency org="org.smartfrog" + name="sf-www" + changing="true" + rev="latest.integration" + conf="compile->default;runtime->default"/> + <dependency org="org.smartfrog" + name="sf-tasks" + changing="true" + rev="latest.integration" + conf="build->default"/> + <dependency org="commons-logging" + name="commons-logging-api" + rev="${commons-logging.version}" + conf="compile->master;redist->master"/> + <dependency org="commons-httpclient" + name="commons-httpclient" + rev="${commons-httpclient.version}" + conf="compile->master;redist->default"> + <exclude org="commons-logging"/> + <exclude org="junit"/> + </dependency> + </dependencies> +</ivy-module> \ No newline at end of file Modified: trunk/core/components/www/ivy.xml =================================================================== --- trunk/core/components/www/ivy.xml 2006-11-16 15:58:49 UTC (rev 3606) +++ trunk/core/components/www/ivy.xml 2006-11-16 17:03:19 UTC (rev 3607) @@ -12,19 +12,20 @@ </configurations> --> <configurations defaultconfmapping="default"> - <conf name="default" extends="master,runtime"/> + <conf name="default" extends="master,runtime" + description="default configuration contains artifacts and runtime dependencies"/> <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="unittest" extends="compile" - description="the classpath needed to run unittests"/> - <conf name="systemtest" extends="unittest" - description="the classpath needed to run systemtests"/> - <conf name="test" extends="systemtest" + <conf name="daemon" visibility="private" + description="the classpath needed to run smartfrog daemons"/> + <conf name="test" extends="default,compile" description="the classpath needed to run tests"/> <conf name="master" description="contains the artifact but no dependencies"/> - <conf name="runtime" description="runtime but not the artifact"/> + <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--> @@ -35,9 +36,10 @@ name="smartfrog" changing="true" rev="latest.integration" - conf="compile->services;runtime->services;systemtest->services"/> + conf="compile->services;runtime->services;daemon->services;"/> <dependency org="org.smartfrog" name="sf-tasks" + changing="true" rev="latest.integration" conf="build->default"/> <dependency org="javax.servlet" Modified: trunk/core/components/xml/ivy.xml =================================================================== --- trunk/core/components/xml/ivy.xml 2006-11-16 15:58:49 UTC (rev 3606) +++ trunk/core/components/xml/ivy.xml 2006-11-16 17:03:19 UTC (rev 3607) @@ -15,16 +15,17 @@ <conf name="default" extends="master,runtime"/> <conf name="build" visibility="private" description="artifacts needed to build the application"/> - <conf name="compile" visibility="private" + <conf name="compile" visibility="private" extends="parser" description="artifacts needed to compile the application"/> - <conf name="unittest" extends="compile" - description="the classpath needed to run unittests"/> - <conf name="systemtest" extends="unittest" - description="the classpath needed to run systemtests"/> - <conf name="test" extends="systemtest" + <conf name="daemon" visibility="private" + description="the classpath needed to run smartfrog daemons"/> + <conf name="test" extends="default,parser" description="the classpath needed to run tests"/> <conf name="master" description="contains the artifact but no dependencies"/> - <conf name="runtime" description="runtime but not the artifact"/> + <conf name="redist" description="redistributals excluding smartfrog artifacts"/> + <conf name="runtime" description="runtime but not the artifact" + extends="redist"/> + <conf name="parser" description="Xerces xml parser for Java1.4"/> </configurations> <publications> <!--get the artifact from our module name--> @@ -35,29 +36,34 @@ name="smartfrog" changing="true" rev="latest.integration" - conf="compile->services;runtime->services;systemtest->services"/> + conf="compile->services;runtime->services;daemon->services"/> <dependency org="org.smartfrog" name="sf-tasks" + changing="true" rev="latest.integration" conf="build->default"/> + <dependency org="org.smartfrog" + name="sf-testharness" + changing="true" + rev="latest.integration" + conf="test->default"/> <dependency org="xerces" name="xercesImpl" rev="${xerces.version}" - conf="compile->master;runtime->master"/> + conf="parser->master"/> <dependency org="xerces" name="xmlParserAPIs" rev="${xerces.version}" - conf="compile->master;runtime->master"/> - + conf="parser->master"/> <!--xom depends on Jaxen, which is a mess. exclude it--> <dependency org="xom" name="xom" rev="${xom.version}" - conf="compile->master;runtime->master"/> + conf="compile->master;redist->master"/> <!-- here jaxen is included, but none of its dependencies--> <dependency org="jaxen" name="jaxen" rev="${jaxen.version}" - conf="compile->master;runtime->master"/> + conf="compile->master;redist->master"/> </dependencies> </ivy-module> \ No newline at end of file Added: trunk/core/components/xmpp/ivy.xml =================================================================== --- trunk/core/components/xmpp/ivy.xml (rev 0) +++ trunk/core/components/xmpp/ivy.xml 2006-11-16 17:03:19 UTC (rev 3607) @@ -0,0 +1,46 @@ +<?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-${ant.project.name}"/> +<!-- 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="unittest" extends="compile" + description="the classpath needed to run unittests"/> + <conf name="systemtest" extends="unittest" + description="the classpath needed to run systemtests"/> + <conf name="test" extends="systemtest" + 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 /> + </publications> + <dependencies> + <dependency org="org.smartfrog" + name="smartfrog" + rev="latest.integration" + conf="compile->master;runtime->default"/> + <dependency org="org.smartfrog" + name="sf-tasks" + rev="latest.integration" + conf="build->default"/> + <dependency org="jivesoftware" + name="smack" + rev="${smack.version}" + conf="compile->default;redist->default"/> + </dependencies> +</ivy-module> \ No newline at end of file Modified: trunk/core/extras/ant/ivy.xml =================================================================== --- trunk/core/extras/ant/ivy.xml 2006-11-16 15:58:49 UTC (rev 3606) +++ trunk/core/extras/ant/ivy.xml 2006-11-16 17:03:19 UTC (rev 3607) @@ -1,10 +1,10 @@ <?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-m32"> + <info organisation="org.smartfrog" module="sf-tasks"> <license name="LGPL"/> <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> - <description>Alpine SOAP stack, M32 prototype</description> + <description>Ant tasks for smartfrog</description> </info> <!-- FIXME: Ivy 1.4.1 buildlist bug <configurations defaultconfmapping="default"> @@ -35,9 +35,14 @@ rev="latest.integration" conf="compile->core;runtime->core;systemtest->services"/> <!--still a bit unstable--> + <dependency org="ant" + name="ant-testutil" + changing="true" + rev="${ant-testutil.version}" + conf="test->default"/> <dependency org="junit" name="junit" rev="${junit.version}" - conf="unittest->default"/> + conf="test->default"/> </dependencies> </ivy-module> \ No newline at end of file Added: trunk/core/extras/cdl/ivy.xml =================================================================== --- trunk/core/extras/cdl/ivy.xml (rev 0) +++ trunk/core/extras/cdl/ivy.xml 2006-11-16 17:03:19 UTC (rev 3607) @@ -0,0 +1,69 @@ +<?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-cdl"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description> + CDL Language Support + Created 16-Nov-2006 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" + description="default configuration contains artifacts and runtime dependencies"/> + <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,compile" + 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->services;runtime->services;daemon->services"/> + <dependency org="org.smartfrog" + name="sf-tasks" + changing="true" + rev="latest.integration" + conf="build->default"/> + <dependency org="org.smartfrog" + name="sf-testharness" + changing="true" + rev="latest.integration" + conf="test->default"/> + <dependency org="org.smartfrog" + name="sf-xml" + changing="true" + rev="latest.integration" + conf="compile->default;runtime->default;redist->redist"/> + <dependency org="org.ggf" + name="cddlm" + changing="true" + rev="latest.integration" + conf="compile->default;redist->default"/> + <dependency org="commons-logging" + name="commons-logging-api" + rev="latest.integration" + conf="${commons-logging.version}"/> + </dependencies> +</ivy-module> \ No newline at end of file Modified: trunk/core/testharness/ivy.xml =================================================================== --- trunk/core/testharness/ivy.xml 2006-11-16 15:58:49 UTC (rev 3606) +++ trunk/core/testharness/ivy.xml 2006-11-16 17:03:19 UTC (rev 3607) @@ -10,17 +10,20 @@ <include file="${basedir}/../antbuild/ivy/configurations.xml"/> </configurations>--> <configurations defaultconfmapping="default"> - <conf name="default" extends="master,runtime"/> + <conf name="default" extends="master,runtime" + description="default configuration contains artifacts and runtime dependencies"/> + <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="unittest" extends="compile" - description="the classpath needed to run unittests"/> - <conf name="systemtest" extends="unittest" - description="the classpath needed to run systemtests"/> - <conf name="test" extends="systemtest" + <conf name="daemon" visibility="private" + description="the classpath needed to run smartfrog daemons"/> + <conf name="test" extends="default,compile" description="the classpath needed to run tests"/> <conf name="master" description="contains the artifact but no dependencies"/> - <conf name="runtime" description="runtime but not the artifact"/> + <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--> @@ -32,9 +35,13 @@ changing="true" rev="latest.integration" conf="compile->examples;runtime->examples"/> + <dependency org="org.smartfrog" + name="sf-tasks" + rev="latest.integration" + conf="build->default"/> <dependency org="junit" name="junit" rev="${junit.version}" - conf="compile->default;runtime->default"/> + conf="compile->default;redist->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...> - 2006-11-22 16:42:39
|
Revision: 3635 http://svn.sourceforge.net/smartfrog/?rev=3635&view=rev Author: steve_l Date: 2006-11-22 08:42:35 -0800 (Wed, 22 Nov 2006) Log Message: ----------- more ivy enablement; javadoc upgraded to support java1.5 when appropriate. Modified Paths: -------------- trunk/core/common.xml trunk/core/extras/cdl/test/console.sf trunk/core/smartfrog/build.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2006-11-22 16:41:36 UTC (rev 3634) +++ trunk/core/common.xml 2006-11-22 16:42:35 UTC (rev 3635) @@ -454,6 +454,7 @@ <sf-javadoc sourcepath="${src.dir}" destdir="${dist.jdocs.dir}" + source="${javac.java.version}" classpathref="compile.classpath" > <group title="SmartFrog Packages" packages="org.smartfrog.*"/> Modified: trunk/core/extras/cdl/test/console.sf =================================================================== --- trunk/core/extras/cdl/test/console.sf 2006-11-22 16:41:36 UTC (rev 3634) +++ trunk/core/extras/cdl/test/console.sf 2006-11-22 16:42:35 UTC (rev 3635) @@ -36,7 +36,7 @@ #include "org/smartfrog/services/display/components.sf" #include "org/smartfrog/services/trace/components.sf" -#include "org/smartfrog/services/persistence/components.sf" +//#include "org/smartfrog/services/persistence/components.sf" #include "org/smartfrog/components.sf" // Default sfDaemon Display Modified: trunk/core/smartfrog/build.xml =================================================================== --- trunk/core/smartfrog/build.xml 2006-11-22 16:41:36 UTC (rev 3634) +++ trunk/core/smartfrog/build.xml 2006-11-22 16:42:35 UTC (rev 3635) @@ -18,7 +18,7 @@ <!DOCTYPE project [ <!ENTITY security SYSTEM "private/buildSecurity.xml"> ]> -<project name="SmartFrog" default="all" basedir="."> +<project name="SmartFrog" default="all" basedir="." xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> <description> Introduction ============ @@ -113,11 +113,12 @@ <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 all compiled artifacts should go --> + <property name="build.dir" location="build"/> + <property name="build" location="${build.dir}"/> <!-- 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="build.classes.dir" location="${build.dir}"/> + <property name="build.extra.dir" location="buildextra"/> <property name="dist.dir" location="dist"/> <!-- where the files to zip go --> <property name="releases.dir" location="releases"/> @@ -230,8 +231,9 @@ <!-- --> <!-- =================================================================== --> <target name="initbuild" depends="init"> - <mkdir dir="${build}"/> + <mkdir dir="${build.dir}"/> <mkdir dir="${build.classes.dir}"/> + <mkdir dir="${build.extra.dir}"/> </target> <!-- =================================================================== --> <!-- --> @@ -248,10 +250,6 @@ <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"> @@ -408,7 +406,18 @@ <!-- execute permissions are set on binary stuff, permissions that get --> <!-- lost --> <!-- =================================================================== --> - <target name="copybins" depends="initdist"> + <target name="init.scripts.pattern" depends="init"> + <patternset id="shellscripts"> + <include name="smartfrog"/> + <include name="sf*"/> + <include name="*.pl"/> + <include name="*.py"/> + <exclude name="*.bat"/> + <exclude name="*.cmd"/> + </patternset> + </target> + + <target name="copybins" depends="initdist,init.scripts.pattern"> <copy todir="${dist.bin.dir}"> <fileset dir="${bin}"> <include name="**/*"/> @@ -416,9 +425,24 @@ <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"/> + <!-- recursively set all batch files to DOS--> + <fixcrlf srcdir="${dist.bin.dir}" eol="dos" includes="**/*.bat,**/*.cmd" /> + <!-- set the shell scripts to unix and executable--> + <fixcrlf srcdir="${dist.bin.dir}" eol="unix" eof="remove" > + <patternset refid="shellscripts"/> + </fixcrlf> + <chmod dir="${dist.bin.dir}" perm="ugo+rx" > + <patternset refid="shellscripts"/> + </chmod> + <!-- set the security shell scripts to unix and executable--> + <fixcrlf srcdir="${dist.bin.dir}/security" eol="unix" eof="remove" > + <patternset refid="shellscripts"/> + </fixcrlf> + <chmod dir="${dist.bin.dir}/security" perm="ugo+rx" > + <patternset refid="shellscripts"/> + </chmod> </target> + <!-- =================================================================== --> <!-- Copy PDF, HTML files from docs to dist/docs --> <!-- =================================================================== --> @@ -501,18 +525,25 @@ <!-- =================================================================== --> <target name="target-names" depends="init,generateversion"> + <property name="smartfrog.title" + value="smartfrog" /> <property name="smartfrog.stub" - value="smartfrog-${Version}" /> + value="${smartfrog.title}-${Version}" /> <property name="smartfrog.jar" location="${dist.lib.dir}/${smartfrog.stub}.jar" /> + <property name="sf-services.title" + value="sfServices" /> <property name="sf-services.stub" - value="sfServices-${Version}" /> + value="${sf-services.title}-${Version}" /> <property name="sf-services.jar" location="${dist.lib.dir}/${sf-services.stub}.jar" /> + <property name="sf-examples.title" + value="sfExamples" /> + <property name="sf-examples.stub" - value="sfExamples-${Version}" /> + value="${sf-examples.title}-${Version}" /> <property name="sf-examples.jar" location="${dist.lib.dir}/${sf-examples.stub}.jar" /> @@ -559,7 +590,9 @@ <!-- =================================================================== --> <!-- DIST --> <!-- =================================================================== --> - <target name="dist" depends="build,initdist,jars,copylibs,copybins,copyPrivate,copydocs, copyexamples,copyTestCA,buildSetup,fixCRLF,srczip" description="Prepares distribution package"> + <target name="dist" + depends="build,initdist,jars,copylibs,copybins,copyPrivate,copydocs, copyexamples,copyTestCA,buildSetup,srczip" + description="Prepares distribution package"> </target> <!-- =================================================================== --> <!-- SECUREDIST --> @@ -584,7 +617,8 @@ <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="${build.dir}" failonerror="false"/> + <delete dir="${build.extra.dir}" failonerror="false"/> <delete dir="${dist.dir}" failonerror="false"/> <delete dir="${src.dir}/documentation" failonerror="false"/> </target> @@ -614,7 +648,10 @@ <!-- =================================================================== --> <!-- 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="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'"/> @@ -776,5 +813,41 @@ </target> + + <target name="ivy-init" depends="init,target-names" > + <property name="ivy.dir" location="${build.extra.dir}/ivy" /> + <property name="ivy.lib.dir" location="${ivy.dir}/lib" /> + <property name="ivy.reports.dir" location="${build.dir}/ivy/reports"/> + <ivy:configure file="ivyconf.xml"/> + </target> + + <target name="ivy-resolve" depends="ivy-init"> + <ivy:resolve /> + </target> + + <target name="ivy-retrieve" depends="ivy-resolve"> + <ivy:retrieve pattern="${ivy.lib.dir}/[conf]/[artifact]-[revision].[ext]" sync="true" /> + </target> + + <target name="ivy-report" depends="ivy-resolve"> + <ivy:report todir="${ivy.reports.dir}"/> + <echo> published Ivy report to +${ivy.reports.dir} + </echo> + </target> + + <!--jars,--> + <target name="ready-to-publish" depends="jars,ivy-report"/> + + <target name="ivy-publish" depends="ready-to-publish"> + <ivy:publish resolver="local" pubrevision="${Version}" + overwrite="true" + artifactspattern="${dist.dir}/lib/[artifact]-[revision].[ext]" /> + </target> + + <target name="published" depends="ivy-publish,m2-install" + description="Publish artifacts to the local repositories" + /> + </project> <!-- End of file --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2006-11-22 18:29:26
|
Revision: 3639 http://svn.sourceforge.net/smartfrog/?rev=3639&view=rev Author: julgui Date: 2006-11-22 10:29:24 -0800 (Wed, 22 Nov 2006) Log Message: ----------- add: sfGui auto name for deployment. Modified Paths: -------------- trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/MainFrame.java trunk/core/smartfrog/lib/SFGuiBrowser.jar Modified: trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/MainFrame.java =================================================================== --- trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/MainFrame.java 2006-11-22 17:36:56 UTC (rev 3638) +++ trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/MainFrame.java 2006-11-22 18:29:24 UTC (rev 3639) @@ -1,24 +1,24 @@ /** (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 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.tools.gui.browser; -package org.smartfrog.tools.gui.browser; import org.smartfrog.tools.gui.browser.util.GenParsePanel; //@TODO: FILTERS FOR MULTILANGUAGE DON'T WORK WHEN EXTENSION IN CAPITALS!!! Should it work with capitals? @@ -75,1186 +75,1211 @@ *@created */ -public class MainFrame extends JFrame implements ActionListener { - /** - * Description of the Field - */ - public final static String version = "v0.7 r26"; - // This has to be done properly !!!!!!!!!!!!!!! no static. Because of crap log. - static PrintStream msg = System.out; - static JLabel statusBar = new JLabel(); - private static Image imageApp; +public class MainFrame + extends JFrame implements ActionListener { + /** + * Description of the Field + */ + public final static String version = "v0.7 r28"; + // This has to be done properly !!!!!!!!!!!!!!! no static. Because of crap log. + static PrintStream msg = System.out; + static JLabel statusBar = new JLabel(); + private static Image imageApp; - private static int scrollTime = 2 * 1000; - private Timer timerScroll = new Timer(scrollTime, this); - private boolean screenScrollChanged = false; - private boolean msgScrollChanged = false; + private static int scrollTime = 2 * 1000; + private Timer timerScroll = new Timer(scrollTime, this); + private boolean screenScrollChanged = false; + private boolean msgScrollChanged = false; - private static String iniFileName = "bin/sfGuiCFG.bat"; - private static String iniKeySFFilesDir = "rem sfFilesDir"; - //cheating the bat file, used for config as well;-) - private static String iniSecRunProcess = "SFGuiConfig"; - private static String iniKeySFSystemClass = "rem SFSystemClass"; + private static String iniFileName = "bin/sfGuiCFG.bat"; + private static String iniKeySFFilesDir = "rem sfFilesDir"; + //cheating the bat file, used for config as well;-) + private static String iniSecRunProcess = "SFGuiConfig"; + private static String iniKeySFSystemClass = "rem SFSystemClass"; // private static String iniKeyClasspath = "set libs"; // Should be taken from system.property(classpath); - private static String iniKeyCmdSFDaemon = "rem cmdSFDaemon"; - private static String iniKeySFDaemonProcessName = "rem SFDaemonProcessName"; - private static String iniKeySFDaemonDefIniFile = "rem SFDaemonDefIniFile"; - private static String iniKeySFDaemonDefSFFile = "rem SFDaemonDefSFFile"; - private static String iniKeyCmdSFStart = "rem cmdSFStart"; - private static String iniKeyCmdSFStop = "rem cmdSFStop"; - private static String iniKeyCmdAddSecurity = "rem suffixSecureScrip"; - private static String iniKeyCmdBrowserURL = "rem cmdBrowserURL"; - private static String iniKeyCmdExeBrowserWindows = "rem cmdBrowserWin"; - private static String iniKeyCmdExeBrowserLinux = "rem cmdBrowserLinux"; - private static String iniKeyLookAndFeel = "rem lookAndFeel"; + private static String iniKeyCmdSFDaemon = "rem cmdSFDaemon"; + private static String iniKeySFDaemonProcessName = "rem SFDaemonProcessName"; + private static String iniKeySFDaemonDefIniFile = "rem SFDaemonDefIniFile"; + private static String iniKeySFDaemonDefSFFile = "rem SFDaemonDefSFFile"; + private static String iniKeyCmdSFStart = "rem cmdSFStart"; + private static String iniKeyCmdSFStop = "rem cmdSFStop"; + private static String iniKeyCmdAddSecurity = "rem suffixSecureScrip"; + private static String iniKeyCmdBrowserURL = "rem cmdBrowserURL"; + private static String iniKeyCmdExeBrowserWindows = "rem cmdBrowserWin"; + private static String iniKeyCmdExeBrowserLinux = "rem cmdBrowserLinux"; + private static String iniKeyLookAndFeel = "rem lookAndFeel"; - private String sfFilesDir = "./sf"; - // Default SFSystem class - private String sfSystemClass = "org.smartfrog.SFSystem"; - //Default config for Browsers - private String cmdExeBrowserLinux = "firefox"; - private String cmdExeBrowserWindows = "explorer"; - private String cmdBrowserURL = "http://127.0.0.1:4242/"; + private String sfFilesDir = "./sf"; + // Default SFSystem class + private String sfSystemClass = "org.smartfrog.SFSystem"; + //Default config for Browsers + private String cmdExeBrowserLinux = "firefox"; + private String cmdExeBrowserWindows = "explorer"; + private String cmdBrowserURL = "http://127.0.0.1:4242/"; - // Default SF Commands ... - private String cmdSFDaemon = "-Dorg.smartfrog.processcompound.sfProcessName="; - private String sfDaemonProcessName = "rootProcess"; - private String sfDaemonDefIniFileProperty = "-Dorg.smartfrog.iniFile="; - private String sfDaemonDefSFFileProperty = "-Dorg.smartfrog.sfcore.processcompound.sfDefault.sfDefault="; - private String sfDaemonDefIniFile = "./bin/default.ini"; - private String sfDaemonDefSFFile = "./bin/default.sf"; - //"sfDaemon"; - private String sfDaemonFile = "./bin/daemon.sf"; - private String cmdSFStart = "DEPLOY"; - private String cmdSFStop = "TERMINATE"; - private String cmdAddSecurity = "security"; - //lookAndFeel - private String lookAndFeel = "kunststoff"; + // Default SF Commands ... + private String cmdSFDaemon = "-Dorg.smartfrog.processcompound.sfProcessName="; + private String sfDaemonProcessName = "rootProcess"; + private String sfDaemonDefIniFileProperty = "-Dorg.smartfrog.iniFile="; + private String sfDaemonDefSFFileProperty = + "-Dorg.smartfrog.sfcore.processcompound.sfDefault.sfDefault="; + private String sfDaemonDefIniFile = "./bin/default.ini"; + private String sfDaemonDefSFFile = "./bin/default.sf"; + //"sfDaemon"; + private String sfDaemonFile = "./bin/daemon.sf"; + private String cmdSFStart = "DEPLOY"; + private String cmdSFStop = "TERMINATE"; + private String cmdAddSecurity = "security"; + //lookAndFeel + private String lookAndFeel = "kunststoff"; + String panelNameParse = "SFParse"; + String panelNameBrowseComp = "Browse SF Comp"; + String panelNameSFFile = "SF File"; + String panelNameRaw = "Raw"; + String panelNameType = "Type Reso."; + String panelNamePlace = "Placement"; + String panelNameDescription = "Description"; + String panelNameDeploy = "Deploy"; + String panelNameGenParse = "Adv.Parser"; - String panelNameParse = "SFParse"; - String panelNameBrowseComp = "Browse SF Comp"; - String panelNameSFFile = "SF File"; - String panelNameRaw = "Raw"; - String panelNameType = "Type Reso."; - String panelNamePlace = "Placement"; - String panelNameDescription = "Description"; - String panelNameDeploy = "Deploy"; - String panelNameGenParse = "Adv.Parser"; + int autoNameCounter = 0; - //Token markers - org.gjt.sp.jedit.syntax.TokenMarker sfTokenMarker =new SfTokenMarker(); - org.gjt.sp.jedit.syntax.TokenMarker sf2TokenMarker =new Sf2TokenMarker(); - org.gjt.sp.jedit.syntax.TokenMarker sfXMLTokenMarker =new SfXMLTokenMarker(); - //Default TokenMarker - org.gjt.sp.jedit.syntax.TokenMarker activeTokenMarker = sfTokenMarker; + //Token markers + org.gjt.sp.jedit.syntax.TokenMarker sfTokenMarker = new SfTokenMarker(); + org.gjt.sp.jedit.syntax.TokenMarker sf2TokenMarker = new Sf2TokenMarker(); + org.gjt.sp.jedit.syntax.TokenMarker sfXMLTokenMarker = new SfXMLTokenMarker(); + //Default TokenMarker + org.gjt.sp.jedit.syntax.TokenMarker activeTokenMarker = sfTokenMarker; - JPanel contentPane; - JMenuBar jMenuBarMain = new JMenuBar(); - JMenu jMenuFile = new JMenu(); - JMenuItem jMenuFileExit = new JMenuItem(); - /* - * Tool Bar - */ - JToolBar jToolBar = new JToolBar(); - /** - * Description of the Field - */ - public ImageIcon imageOpen; - ImageIcon imageSave; - ImageIcon imageAbout; - /** - * Description of the Field - */ - public ImageIcon imageCopy; - ImageIcon imageCut; - ImageIcon imagePaste; - ImageIcon imageUndo; - ImageIcon imageRedo; + JPanel contentPane; + JMenuBar jMenuBarMain = new JMenuBar(); + JMenu jMenuFile = new JMenu(); + JMenuItem jMenuFileExit = new JMenuItem(); + /* + * Tool Bar + */ + JToolBar jToolBar = new JToolBar(); + /** + * Description of the Field + */ + public ImageIcon imageOpen; + ImageIcon imageSave; + ImageIcon imageAbout; + /** + * Description of the Field + */ + public ImageIcon imageCopy; + ImageIcon imageCut; + ImageIcon imagePaste; + ImageIcon imageUndo; + ImageIcon imageRedo; - /** - * Description of the Field - */ - public ImageIcon imageParse; - /** - * Description of the Field - */ - public ImageIcon imageRun; - ImageIcon imageStop; - ImageIcon imagePreferences; - ImageIcon imageBrowseSF; - ImageIcon imageSFDaemon; - ImageIcon imageSFStopDaemon; - ImageIcon imageExit; - ImageIcon imageMngConsole; + /** + * Description of the Field + */ + public ImageIcon imageParse; + /** + * Description of the Field + */ + public ImageIcon imageRun; + ImageIcon imageStop; + ImageIcon imagePreferences; + ImageIcon imageBrowseSF; + ImageIcon imageSFDaemon; + ImageIcon imageSFStopDaemon; + ImageIcon imageExit; + ImageIcon imageMngConsole; - BorderLayout borderLayout1 = new BorderLayout(); - JSplitPane jSplitPane1 = new JSplitPane(); - JTabbedPane jTabbedPanelNorth = new JTabbedPane(); - JTabbedPane jTabbedPaneSouth = new JTabbedPane(); - JScrollPane jScrollPaneMsg = new JScrollPane(); + BorderLayout borderLayout1 = new BorderLayout(); + JSplitPane jSplitPane1 = new JSplitPane(); + JTabbedPane jTabbedPanelNorth = new JTabbedPane(); + JTabbedPane jTabbedPaneSouth = new JTabbedPane(); + JScrollPane jScrollPaneMsg = new JScrollPane(); // JTextArea jTextAreaSFFile = new JTextArea();// !!!!!!!!!!!!! - JMenuItem jMenuItemWin = new JMenuItem(); - JMenuItem jMenuItemMetal = new JMenuItem(); - JMenuItem jMenuItemAuto = new JMenuItem(); - JMenu jMenuLF = new JMenu(); - JMenuItem jMenuItemMotif = new JMenuItem(); - JMenuItem jMenuHelpAbout = new JMenuItem(); - JMenu jMenuHelp = new JMenu(); - JMenuItem jMenuItemOpen = new JMenuItem(); - JMenu jMenuSF = new JMenu(); - JMenuItem jMenuItemRun = new JMenuItem(); - JMenuItem jMenuItemParse = new JMenuItem(); - boolean dirty = false; - JMenuItem jMenuItemSaveAs = new JMenuItem(); - JMenuItem jMenuItemSave = new JMenuItem(); - /** - * Description of the Field - */ - public JEditTextArea jTextAreaSFFile = new JEditTextArea(); - JTabbedPane jTabbedPaneParse = new JTabbedPane(); + JMenuItem jMenuItemWin = new JMenuItem(); + JMenuItem jMenuItemMetal = new JMenuItem(); + JMenuItem jMenuItemAuto = new JMenuItem(); + JMenu jMenuLF = new JMenu(); + JMenuItem jMenuItemMotif = new JMenuItem(); + JMenuItem jMenuHelpAbout = new JMenuItem(); + JMenu jMenuHelp = new JMenu(); + JMenuItem jMenuItemOpen = new JMenuItem(); + JMenu jMenuSF = new JMenu(); + JMenuItem jMenuItemRun = new JMenuItem(); + JMenuItem jMenuItemParse = new JMenuItem(); + boolean dirty = false; + JMenuItem jMenuItemSaveAs = new JMenuItem(); + JMenuItem jMenuItemSave = new JMenuItem(); + /** + * Description of the Field + */ + public JEditTextArea jTextAreaSFFile = new JEditTextArea(); + JTabbedPane jTabbedPaneParse = new JTabbedPane(); // JTextArea jTextAreaRaw = new JTextArea(); // JTextArea jTextAreaType = new JTextArea(); // JTextArea jTextAreaPlace = new JTextArea(); // JTextArea jTextAreaDeploy = new JTextArea();// True means modified text. - JEditTextArea jTextAreaRaw = new JEditTextArea(); - JEditTextArea jTextAreaType = new JEditTextArea(); - JEditTextArea jTextAreaPlace = new JEditTextArea(); - JEditTextArea jTextAreaDeploy = new JEditTextArea(); - JEditTextArea jTextAreaDescription = new JEditTextArea(); - JTextArea screen = new JTextArea(); - JScrollPane output = new JScrollPane(); + JEditTextArea jTextAreaRaw = new JEditTextArea(); + JEditTextArea jTextAreaType = new JEditTextArea(); + JEditTextArea jTextAreaPlace = new JEditTextArea(); + JEditTextArea jTextAreaDeploy = new JEditTextArea(); + JEditTextArea jTextAreaDescription = new JEditTextArea(); + JTextArea screen = new JTextArea(); + JScrollPane output = new JScrollPane(); - // for Running externalprocess! - InfoProcess auxProcess = null; - RunProcess runCmd = null; - RunProcess runBrowser = null; - RunProcess runBrowserHelp = null; + // for Running externalprocess! + InfoProcess auxProcess = null; + RunProcess runCmd = null; + RunProcess runBrowser = null; + RunProcess runBrowserHelp = null; - String classpath = ""; + String classpath = ""; - //Files used in the application - JFileChooser jFileChooser = new JFileChooser(sfFilesDir); - /** - * Description of the Field - */ - public String currFileName = null; - // Full path with filename. null means new / untitled. - String auxCurrFileName = null; - String outputFileName = null; + //Files used in the application + JFileChooser jFileChooser = new JFileChooser(sfFilesDir); + /** + * Description of the Field + */ + public String currFileName = null; + // Full path with filename. null means new / untitled. + String auxCurrFileName = null; + String outputFileName = null; - // for redirecting standard output. - OutputStream dout = System.out; - InputStream din = System.in; - PrintStream out = System.out; - JMenu jMenuEdit = new JMenu(); - JMenuItem jMenuItemCopy = new JMenuItem(); - JMenuItem jMenuItemCut = new JMenuItem(); - JMenuItem jMenuItemPaste = new JMenuItem(); - JMenuItem jMenuItemSelectAll = new JMenuItem(); - JMenuItem jMenuItemSelectNone = new JMenuItem(); - JMenuItem jMenuItemNew = new JMenuItem(); - JMenuItem jMenuItemUndo = new JMenuItem(); - JMenuItem jMenuItemRedo = new JMenuItem(); - SyntaxDocument syntaxDocumentSFFile; - JMenuItem jMenuItemStop = new JMenuItem(); - JMenuItem jMenuItemInfo = new JMenuItem(); - JMenu jMenuTools = new JMenu(); - JMenuItem jMenuItemCleanOutput = new JMenuItem(); - JMenuItem jMenuItemCleanMsg = new JMenuItem(); - JButton jButtonStop = new JButton(); - JButton jButtonRun = new JButton(); - JButton jButtonParse = new JButton(); - JButton jButtonRedo = new JButton(); - JButton jButtonUndo = new JButton(); - JButton jButtonOpen = new JButton(); - JButton jButtonSave = new JButton(); - JButton jButtonAbout = new JButton(); - JButton jButtonPreferences = new JButton(); - JButton jButtonBrowser = new JButton(); - JMenuItem jMenuItemBrowseSF = new JMenuItem(); - JMenuItem jMenuItemSaveOutput = new JMenuItem(); - JMenuItem jMenuItemInfoProp = new JMenuItem(); - JSplitPane jSplitPane2 = new JSplitPane(); - ProcessPanel processPanel = new ProcessPanel(); - JPanel jPanel1 = new JPanel(); - JTextField processNameTextField = new JTextField(); - JTextField hostNameTextField = new JTextField(); - private boolean isWindows = false; - // True means modified text. + // for redirecting standard output. + OutputStream dout = System.out; + InputStream din = System.in; + PrintStream out = System.out; + JMenu jMenuEdit = new JMenu(); + JMenuItem jMenuItemCopy = new JMenuItem(); + JMenuItem jMenuItemCut = new JMenuItem(); + JMenuItem jMenuItemPaste = new JMenuItem(); + JMenuItem jMenuItemSelectAll = new JMenuItem(); + JMenuItem jMenuItemSelectNone = new JMenuItem(); + JMenuItem jMenuItemNew = new JMenuItem(); + JMenuItem jMenuItemUndo = new JMenuItem(); + JMenuItem jMenuItemRedo = new JMenuItem(); + SyntaxDocument syntaxDocumentSFFile; + JMenuItem jMenuItemStop = new JMenuItem(); + JMenuItem jMenuItemInfo = new JMenuItem(); + JMenu jMenuTools = new JMenu(); + JMenuItem jMenuItemCleanOutput = new JMenuItem(); + JMenuItem jMenuItemCleanMsg = new JMenuItem(); + JButton jButtonStop = new JButton(); + JButton jButtonRun = new JButton(); + JButton jButtonParse = new JButton(); + JButton jButtonRedo = new JButton(); + JButton jButtonUndo = new JButton(); + JButton jButtonOpen = new JButton(); + JButton jButtonSave = new JButton(); + JButton jButtonAbout = new JButton(); + JButton jButtonPreferences = new JButton(); + JButton jButtonBrowser = new JButton(); + JMenuItem jMenuItemBrowseSF = new JMenuItem(); + JMenuItem jMenuItemSaveOutput = new JMenuItem(); + JMenuItem jMenuItemInfoProp = new JMenuItem(); + JSplitPane jSplitPane2 = new JSplitPane(); + ProcessPanel processPanel = new ProcessPanel(); + JPanel jPanel1 = new JPanel(); + JTextField processNameTextField = new JTextField(); + JTextField hostNameTextField = new JTextField(); + private boolean isWindows = false; + // True means modified text. - /** - * Stream to get the key input from the display's screen - */ - private PipedInputStream pipeKeyIn; + /** + * Stream to get the key input from the display's screen + */ + private PipedInputStream pipeKeyIn; - /** - * Stream to write keys pressed in the display's screen - */ - private PipedOutputStream pipeKeyOut; + /** + * Stream to write keys pressed in the display's screen + */ + private PipedOutputStream pipeKeyOut; - /** - * Print Stream to write key characters to pipeKeyOut - */ - private PrintStream printKey; - // to manage Undo - private UndoManager undo = new UndoManager(); + /** + * Print Stream to write key characters to pipeKeyOut + */ + private PrintStream printKey; + // to manage Undo + private UndoManager undo = new UndoManager(); - private int tabSize = 4; + private int tabSize = 4; - // Ini File - private IniFile iniFile = null; - JButton jButtonExit = new JButton(); - JButton jButtonSFDaemon = new JButton(); - JButton jButtonSFDaemonStop = new JButton(); - JMenuItem jMenuItem1 = new JMenuItem(); - JCheckBox securityCheckBox = new JCheckBox(); - JTextArea jTextAreaMsg = new JTextArea(); - //BrowseSFFilesPanel BrowseSFComponentPanel; - BrowseSFFilesTreePanel BrowseSFComponentPanel; - GridBagLayout gridBagLayout1 = new GridBagLayout(); - Document documentTextAreaMsg; - Document documentScreen; - GenParsePanel jPanelGenParse; - JButton jButtonCopy = new JButton(); - JButton jButtonCut = new JButton(); - JButton jButtonPaste = new JButton(); - JMenuItem jMenuItemKuntstoff = new JMenuItem(); + // Ini File + private IniFile iniFile = null; + JButton jButtonExit = new JButton(); + JButton jButtonSFDaemon = new JButton(); + JButton jButtonSFDaemonStop = new JButton(); + JMenuItem jMenuItem1 = new JMenuItem(); + JCheckBox securityCheckBox = new JCheckBox(); + JTextArea jTextAreaMsg = new JTextArea(); + //BrowseSFFilesPanel BrowseSFComponentPanel; + BrowseSFFilesTreePanel BrowseSFComponentPanel; + GridBagLayout gridBagLayout1 = new GridBagLayout(); + Document documentTextAreaMsg; + Document documentScreen; + GenParsePanel jPanelGenParse; + JButton jButtonCopy = new JButton(); + JButton jButtonCut = new JButton(); + JButton jButtonPaste = new JButton(); + JMenuItem jMenuItemKuntstoff = new JMenuItem(); - /** - * Construct the frame - */ - public MainFrame() { - try { - UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel"); - SwingUtilities.updateComponentTreeUI(this); - } catch (Exception ex) { - ex.printStackTrace(); - } - enableEvents(AWTEvent.WINDOW_EVENT_MASK); - try { - showLogoSequence(); - jbInit(); - customInit(); - updateCaption(); + /** + * Construct the frame + */ + public MainFrame() { + try { + UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel"); + SwingUtilities.updateComponentTreeUI(this); + } + catch (Exception ex) { + ex.printStackTrace(); + } + enableEvents(AWTEvent.WINDOW_EVENT_MASK); + try { + showLogoSequence(); + jbInit(); + customInit(); + updateCaption(); - } catch (Exception e) { - e.printStackTrace(); - } - } + } + catch (Exception e) { + e.printStackTrace(); + } + } + /** + * Construct the frame + * + *@param fileName Description of Parameter + *@param runAllProcessAfterBoot Description of Parameter + */ + public MainFrame(String fileName, boolean runAllProcessAfterBoot, + boolean eclipseMode) { - /** - * Construct the frame - * - *@param fileName Description of Parameter - *@param runAllProcessAfterBoot Description of Parameter - */ - public MainFrame(String fileName, boolean runAllProcessAfterBoot, boolean eclipseMode) { + try { + UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel"); + SwingUtilities.updateComponentTreeUI(this); + } + catch (Exception ex) { + ex.printStackTrace(); + } - try { - UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel"); - SwingUtilities.updateComponentTreeUI(this); - } catch (Exception ex) { - ex.printStackTrace(); + enableEvents(AWTEvent.WINDOW_EVENT_MASK); + try { + showLogoSequence(); + jbInit(); + customInit(); + openFile(fileName); + updateCaption(); + if (runAllProcessAfterBoot) { + this.processPanel.runAll(); } - - enableEvents(AWTEvent.WINDOW_EVENT_MASK); - try { - showLogoSequence(); - jbInit(); - customInit(); - openFile(fileName); - updateCaption(); - if (runAllProcessAfterBoot) { - this.processPanel.runAll(); - } - if (eclipseMode){ - setEclipseMode(); - } - } catch (Exception e) { - e.printStackTrace(); + if (eclipseMode) { + setEclipseMode(); } - } - - public void setEclipseMode(){ - //int indexPanel = jTabbedPanelNorth.indexOfTab(panelNameSFFile); - jTextAreaSFFile.setEditable(false); - //jTabbedPanelNorth.remove(indexPanel); - jButtonOpen.hide(); - jButtonSave.hide(); - jMenuItemOpen.hide(); - jMenuItemSaveAs.hide(); - jMenuItemSave.hide(); - jMenuItemNew.hide(); - } + catch (Exception e) { + e.printStackTrace(); + } + } - /** - * Sets the cursorOnWait attribute of the MainFrame class - * - *@param comp The new cursorOnWait value - *@param on The new cursorOnWait value - */ - public static void setCursorOnWait(Component comp, boolean on) { - if (on) { - comp.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); - } else { - comp.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); - } - } + public void setEclipseMode() { + //int indexPanel = jTabbedPanelNorth.indexOfTab(panelNameSFFile); + jTextAreaSFFile.setEditable(false); + //jTabbedPanelNorth.remove(indexPanel); + jButtonOpen.hide(); + jButtonSave.hide(); + jMenuItemOpen.hide(); + jMenuItemSaveAs.hide(); + jMenuItemSave.hide(); + jMenuItemNew.hide(); + } - /** - * Centres a component inside a container<p> - * - * if the conatiner is null the component is centered in the screen - * - *@param parent Description of Parameter - *@param comp Description of Parameter - */ - public static void centerWindow(Container parent, Component comp) { - int x; - int y; - Rectangle parentBounds; - Dimension compSize = comp.getSize(); - // If Container is null or smaller than the component - // then our bounding rectangle is the - // whole screen - if ((parent == null) || (parent.getBounds().width < compSize.width) || - (parent.getBounds().height < compSize.height)) { - parentBounds = new Rectangle(comp.getToolkit().getScreenSize()); - parentBounds.setLocation(0, 0); - } - // Else our bounding rectangle is the Container - else { - parentBounds = parent.getBounds(); - } - // Place the component so its center is the same - // as the center of the bounding rectangle - x = parentBounds.x + ((parentBounds.width / 2) - (compSize.width / 2)); - y = parentBounds.y + ((parentBounds.height / 2) - (compSize.height / 2)); - comp.setLocation(x, y); - } + /** + * Sets the cursorOnWait attribute of the MainFrame class + * + *@param comp The new cursorOnWait value + *@param on The new cursorOnWait value + */ + public static void setCursorOnWait(Component comp, boolean on) { + if (on) { + comp.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); + } + else { + comp.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); + } + } + /** + * Centres a component inside a container<p> + * + * if the conatiner is null the component is centered in the screen + * + *@param parent Description of Parameter + *@param comp Description of Parameter + */ + public static void centerWindow(Container parent, Component comp) { + int x; + int y; + Rectangle parentBounds; + Dimension compSize = comp.getSize(); + // If Container is null or smaller than the component + // then our bounding rectangle is the + // whole screen + if ( (parent == null) || (parent.getBounds().width < compSize.width) || + (parent.getBounds().height < compSize.height)) { + parentBounds = new Rectangle(comp.getToolkit().getScreenSize()); + parentBounds.setLocation(0, 0); + } + // Else our bounding rectangle is the Container + else { + parentBounds = parent.getBounds(); + } + // Place the component so its center is the same + // as the center of the bounding rectangle + x = parentBounds.x + ( (parentBounds.width / 2) - (compSize.width / 2)); + y = parentBounds.y + ( (parentBounds.height / 2) - (compSize.height / 2)); + comp.setLocation(x, y); + } - // This has to be done properly !!!!!!!!!!!!!!! - /** - * Description of the Method - * - *@param message Description of Parameter - *@param who Description of Parameter - *@param severity Description of Parameter - *@return Description of the Returned Value - */ - public static int log(String message, String who, int severity) { - /* - * Severity Levels: Taken from Bluestone CSF r6 - * code.0=N; name.0=NONE; mask.0=0 - * code.1=F; name.1=FLOW; mask.1=63 - * code.2=D; name.2=DEBUG; mask.2=62 - * code.4=I; name.4=INFO; mask.4=60 - * code.8=W; name.8=WARNING; mask.8=56 - * code.16=E; name.16=ERROR; mask.16=48 - * code.32=C; name.32=CRITICAL; mask.32=32 - */ - String[] severityMsg = {"NONE", "FLOW", "DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"}; - StringBuffer buffer = new StringBuffer(); - int length = buffer.length(); - buffer.append(" ["); - buffer.append(new SimpleDateFormat("HH:mm:ss.SSS dd/MM/yy").format(new Date(System.currentTimeMillis()))); - buffer.append(']'); - buffer.append('['); - //buffer.append( ( Thread.currentThread().getName() + " " ).substring( 0, 10 ) ); - if (who == null) { - who = "unknown"; - } - buffer.append(who); - buffer.append(']'); - buffer.append('['); - buffer.append(severityMsg[severity]); - buffer.append("]: "); - buffer.append(message); - //System.out.println(buffer.toString()); - msg.println(buffer.toString()); - // Last message in the status bar as well - statusBar.setText(buffer.toString()); - statusBar.setToolTipText(buffer.toString()); - return (buffer.length() - length); - } + // This has to be done properly !!!!!!!!!!!!!!! + /** + * Description of the Method + * + *@param message Description of Parameter + *@param who Description of Parameter + *@param severity Description of Parameter + *@return Description of the Returned Value + */ + public static int log(String message, String who, int severity) { + /* + * Severity Levels: Taken from Bluestone CSF r6 + * code.0=N; name.0=NONE; mask.0=0 + * code.1=F; name.1=FLOW; mask.1=63 + * code.2=D; name.2=DEBUG; mask.2=62 + * code.4=I; name.4=INFO; mask.4=60 + * code.8=W; name.8=WARNING; mask.8=56 + * code.16=E; name.16=ERROR; mask.16=48 + * code.32=C; name.32=CRITICAL; mask.32=32 + */ + String[] severityMsg = { + "NONE", "FLOW", "DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"}; + StringBuffer buffer = new StringBuffer(); + int length = buffer.length(); + buffer.append(" ["); + buffer.append(new SimpleDateFormat("HH:mm:ss.SSS dd/MM/yy").format(new Date( + System.currentTimeMillis()))); + buffer.append(']'); + buffer.append('['); + //buffer.append( ( Thread.currentThread().getName() + " " ).substring( 0, 10 ) ); + if (who == null) { + who = "unknown"; + } + buffer.append(who); + buffer.append(']'); + buffer.append('['); + buffer.append(severityMsg[severity]); + buffer.append("]: "); + buffer.append(message); + //System.out.println(buffer.toString()); + msg.println(buffer.toString()); + // Last message in the status bar as well + statusBar.setText(buffer.toString()); + statusBar.setToolTipText(buffer.toString()); + return (buffer.length() - length); + } + /** + * Description of the Method + */ + public static void version() { + System.out.println("SFGui " + + org.smartfrog.tools.gui.browser.MainFrame.version); + } - /** - * Description of the Method - */ - public static void version() { - System.out.println("SFGui " + org.smartfrog.tools.gui.browser.MainFrame.version); - } + /** + * Sets the currFilePath attribute of the MainFrame object + * + *@param path The new currFilePath value + */ + public void setCurrFilePath(String path) { + if (path != null) { + this.classpath = path; + //System.out.println("Changed loded path:"+classpath); + } + } + /** + * Sets the tabSize attribute of the MainFrame object + * + *@param textArea The new tabSize value + *@param tabSize The new tabSize value + */ + public void setTabSize(JEditTextArea textArea, int tabSize) { + //int auxTabSize =((Integer) textArea .getDocument().getProperty(PlainDocument.tabSizeAttribute)).intValue(); + //auxTabSize = tabSize; + textArea.getDocument().putProperty(PlainDocument.tabSizeAttribute, + new Integer(tabSize)); + } - /** - * Sets the currFilePath attribute of the MainFrame object - * - *@param path The new currFilePath value - */ - public void setCurrFilePath(String path) { - if (path != null) { - this.classpath = path; - //System.out.println("Changed loded path:"+classpath); - } - } + /** + * Gets the currFilePath attribute of the MainFrame object + * + *@return The currFilePath value + */ + public String getCurrFilePath() { + if (classpath != null) { + return classpath; + } + else { + return ""; + } + } + /** + * Description of the Method + * + *@param message Description of Parameter + *@param severity Description of Parameter + *@return Description of the Returned Value + */ + public int log(String message, int severity) { + return log(message, null, severity); + } - /** - * Sets the tabSize attribute of the MainFrame object - * - *@param textArea The new tabSize value - *@param tabSize The new tabSize value - */ - public void setTabSize(JEditTextArea textArea, int tabSize) { - //int auxTabSize =((Integer) textArea .getDocument().getProperty(PlainDocument.tabSizeAttribute)).intValue(); - //auxTabSize = tabSize; - textArea.getDocument().putProperty(PlainDocument.tabSizeAttribute, new Integer(tabSize)); - } + /** + * File | Exit action performed + * + *@param e Description of Parameter + */ + public void jMenuFileExit_actionPerformed(ActionEvent e) { + this.Exit(); + } - - /** - * Gets the currFilePath attribute of the MainFrame object - * - *@return The currFilePath value - */ - public String getCurrFilePath() { - if (classpath != null) { - return classpath; - } else { - return ""; + /** + * Description of the Method + */ + private void Exit() { + if (okToAbandon(jTextAreaSFFile.getText(), this.currFileName)) { + this.saveIniFile(); + System.out.println("...SFGui finished."); + //this.processPanel.mngProcess.killAll(); + this.stopSFDaemon(); + if (runCmd != null) { + try { + runCmd.kill(); + } + catch (Throwable ex) { + } } - } + System.exit(0); + } + } + /** + * Help | About action performed + * + *@param e Description of Parameter + */ + public void jMenuHelpAbout_actionPerformed(ActionEvent e) { + helpAbout(); + } - /** - * Description of the Method - * - *@param message Description of Parameter - *@param severity Description of Parameter - *@return Description of the Returned Value - */ - public int log(String message, int severity) { - return log(message, null, severity); - } + /** + * Overridden so we can exit when window is closed + * + *@param e Description of Parameter + */ + protected void processWindowEvent(WindowEvent e) { + super.processWindowEvent(e); + if (e.getID() == WindowEvent.WINDOW_CLOSING) { + jMenuFileExit_actionPerformed(null); + saveIniFile(); + } + } + /** + * Sets the preferences attribute of the MainFrame object + */ + void setPreferences() { + PreferencesDialog prefDig = new PreferencesDialog(this, + "Preferences Dialog", true); + centerWindow(this, prefDig); + prefDig.show(); + saveIniFile(); - /** - * File | Exit action performed - * - *@param e Description of Parameter - */ - public void jMenuFileExit_actionPerformed(ActionEvent e) { - this.Exit(); - } + } - /** - * Description of the Method - */ - private void Exit() { - if (okToAbandon(jTextAreaSFFile.getText(), this.currFileName)) { - this.saveIniFile(); - System.out.println("...SFGui finished."); - //this.processPanel.mngProcess.killAll(); - this.stopSFDaemon(); - if (runCmd != null) { - try { - runCmd.kill(); - } catch (Throwable ex) { - } - } - System.exit(0); - } - } + /** + * Description of the Method + */ + void cleanTextAreasParse() { + jTextAreaRaw.setText("Raw"); + jTextAreaType.setText("Type Resolution"); + jTextAreaPlace.setText("Placement"); + jTextAreaDescription.setText("Description"); + jTextAreaDeploy.setText("Deploy"); + } + /** + * Description of the Method + */ + void newFile() { + // Handle the File|New menu item. + if (okToAbandon(jTextAreaSFFile.getText(), currFileName)) { + // clears the text of the TextArea + jTextAreaSFFile.setText(""); + undo.discardAllEdits(); + setTabSize(jTextAreaSFFile, tabSize); + // clear the current filename and set the file as clean: + currFileName = null; + dirty = false; + updateCaption(); + this.cleanTextAreasParse(); + this.jPanelGenParse.clean(); + } + } - /** - * Help | About action performed - * - *@param e Description of Parameter - */ - public void jMenuHelpAbout_actionPerformed(ActionEvent e) { - helpAbout(); - } + /** + * Description of the Method + */ + void fileOpen() { + if (!okToAbandon(jTextAreaSFFile.getText(), currFileName)) { + return; + } + // Use the OPEN version of the dialog, test return for Approve/Cancel + if (JFileChooser.APPROVE_OPTION == jFileChooser.showOpenDialog(this)) { + // Call openFile to attempt to load the text from file into TextArea + openFile(jFileChooser.getSelectedFile().getPath()); + } + this.repaint(); + } + private void setTokenEditMarker(String fileName) { + if (fileName.endsWith(".sf")) { + this.setTokenEditTokenMarker(sfTokenMarker); + this.jRadioButtonMenuItemSF.setSelected(true); + this.languagejLabel.setText(" SF "); + } + else if (fileName.endsWith(".sf2")) { + this.setTokenEditTokenMarker(sf2TokenMarker); + this.jRadioButtonMenuItemSF2.setSelected(true); + this.languagejLabel.setText(" SF2 "); + } + else if (fileName.endsWith(".sfxml")) { + this.setTokenEditTokenMarker(sfXMLTokenMarker); + this.jRadioButtonMenuItemSFXML.setSelected(true); + this.languagejLabel.setText(" SFXML "); + } + else { + //this.setTokenEditTokenMarker(sfTokenMarker); + //this.jRadioButtonMenuItemSF.setSelected(true); + //this.languagejLabel.setText ( " SF "); + } + } - /** - * Overridden so we can exit when window is closed - * - *@param e Description of Parameter - */ - protected void processWindowEvent(WindowEvent e) { - super.processWindowEvent(e); - if (e.getID() == WindowEvent.WINDOW_CLOSING) { - jMenuFileExit_actionPerformed(null); - saveIniFile(); + /** + * Description of the Method + * + *@param fileName Description of Parameter + */ + void openFile(String fileName) { + try { + if ( (fileName == null) || fileName.equals("")) { + return; } - } + setTokenEditMarker(fileName); + // Open a file of the given name. + File file = new File(fileName); - /** - * Sets the preferences attribute of the MainFrame object - */ - void setPreferences() { - PreferencesDialog prefDig = new PreferencesDialog(this, "Preferences Dialog", true); - centerWindow(this, prefDig); - prefDig.show(); - saveIniFile(); + // Get the size of the opened file. + int size = (int) file.length(); - } + // Set to zero a counter for counting the number of + // characters that have been read from the file. + int chars_read = 0; + // Create an input reader based on the file, so we can read its data. + // FileReader handles international character encoding conversions. + FileReader in = new FileReader(file); - /** - * Description of the Method - */ - void cleanTextAreasParse() { - jTextAreaRaw.setText("Raw"); - jTextAreaType.setText("Type Resolution"); - jTextAreaPlace.setText("Placement"); - jTextAreaDescription.setText("Description"); - jTextAreaDeploy.setText("Deploy"); - } + // Create a character array of the size of the file, + // to use as a data buffer, into which we will read + // the text data. + char[] data = new char[size]; - - /** - * Description of the Method - */ - void newFile() { - // Handle the File|New menu item. - if (okToAbandon(jTextAreaSFFile.getText(), currFileName)) { - // clears the text of the TextArea - jTextAreaSFFile.setText(""); - undo.discardAllEdits(); - setTabSize(jTextAreaSFFile, tabSize); - // clear the current filename and set the file as clean: - currFileName = null; - dirty = false; - updateCaption(); - this.cleanTextAreasParse(); - this.jPanelGenParse.clean(); + // Read all available characters into the buffer. + while (in.ready()) { + // Increment the count for each character read, + // and accumulate them in the data buffer. + chars_read += in.read(data, chars_read, size - chars_read); } - } + in.close(); + // Create a temporary string containing the data, + // and set the string into the JTextArea. + jTextAreaSFFile.setText(new String(data, 0, chars_read)); + undo.discardAllEdits(); + // Cache the currently opened filename for use at save time... + this.currFileName = fileName; + // ...and mark the edit session as being clean + this.dirty = false; - /** - * Description of the Method - */ - void fileOpen() { - if (!okToAbandon(jTextAreaSFFile.getText(), currFileName)) { - return; - } - // Use the OPEN version of the dialog, test return for Approve/Cancel - if (JFileChooser.APPROVE_OPTION == jFileChooser.showOpenDialog(this)) { - // Call openFile to attempt to load the text from file into TextArea - openFile(jFileChooser.getSelectedFile().getPath()); - } - this.repaint(); - } + // Display the name of the opened directory+file in the statusBar. + statusBar.setText("Opened " + fileName); + statusBar.setToolTipText("Opened " + fileName); + this.insertPathname(fileName); + this.cleanTextAreasParse(); + this.jPanelGenParse.clean(); + updateCaption(); + setTabSize(jTextAreaSFFile, tabSize); + } + catch (IOException e) { + statusBar.setText("Error opening " + fileName); + statusBar.setToolTipText("Error opening " + fileName); + } + } - private void setTokenEditMarker(String fileName){ - if (fileName.endsWith(".sf")){ - this.setTokenEditTokenMarker(sfTokenMarker); - this.jRadioButtonMenuItemSF.setSelected(true); - this.languagejLabel.setText ( " SF "); - } else if (fileName.endsWith(".sf2")){ - this.setTokenEditTokenMarker(sf2TokenMarker); - this.jRadioButtonMenuItemSF2.setSelected(true); - this.languagejLabel.setText(" SF2 "); - } else if (fileName.endsWith(".sfxml")){ - this.setTokenEditTokenMarker(sfXMLTokenMarker); - this.jRadioButtonMenuItemSFXML.setSelected(true); - this.languagejLabel.setText(" SFXML "); - } else { - //this.setTokenEditTokenMarker(sfTokenMarker); - //this.jRadioButtonMenuItemSF.setSelected(true); - //this.languagejLabel.setText ( " SF "); - } - } + /** + * Description of the Method + * + *@param text Description of Parameter + *@return Description of the Returned Value + */ + boolean saveFile(String text) { - /** - * Description of the Method - * - *@param fileName Description of Parameter - */ - void openFile(String fileName) { - try { - if ((fileName == null) || fileName.equals("")) { - return; - } - setTokenEditMarker (fileName); + // Handle the case where we don't have a file name yet. + if (currFileName == null) { + return saveAsFile(text); + } - // Open a file of the given name. - File file = new File(fileName); + try { + // Open a file of the current name. + File file = new File(currFileName); - // Get the size of the opened file. - int size = (int)file.length(); + // Create an output writer that will write to that file. + // FileWriter handles international characters encoding conversions. + FileWriter out = new FileWriter(file); + //String text = jTextAreaSFFile.getText() + out.write(text); + out.close(); + this.insertPathname(currFileName); + this.dirty = false; + updateCaption(); + return true; + } + catch (IOException e) { + statusBar.setText("Error saving " + currFileName); + statusBar.setToolTipText("Error saving " + currFileName); + JOptionPane.showMessageDialog(this, "Error saving " + currFileName, + "Text Save", JOptionPane.ERROR_MESSAGE); + } + return false; + } - // Set to zero a counter for counting the number of - // characters that have been read from the file. - int chars_read = 0; - - // Create an input reader based on the file, so we can read its data. - // FileReader handles international character encoding conversions. - FileReader in = new FileReader(file); - - // Create a character array of the size of the file, - // to use as a data buffer, into which we will read - // the text data. - char[] data = new char[size]; - - // Read all available characters into the buffer. - while (in.ready()) { - // Increment the count for each character read, - // and accumulate them in the data buffer. - chars_read += in.read(data, chars_read, size - chars_read); - } - in.close(); - - // Create a temporary string containing the data, - // and set the string into the JTextArea. - jTextAreaSFFile.setText(new String(data, 0, chars_read)); - undo.discardAllEdits(); - // Cache the currently opened filename for use at save time... - this.currFileName = fileName; - // ...and mark the edit session as being clean - this.dirty = false; - - // Display the name of the opened directory+file in the statusBar. - statusBar.setText("Opened " + fileName); - statusBar.setToolTipText("Opened " + fileName); - this.insertPathname(fileName); - this.cleanTextAreasParse(); - this.jPanelGenParse.clean(); - updateCaption(); - setTabSize(jTextAreaSFFile, tabSize); - } catch (IOException e) { - statusBar.setText("Error opening " + fileName); - statusBar.setToolTipText("Error opening " + fileName); - } - } - - - /** - * Description of the Method - * - *@param text Description of Parameter - *@return Description of the Returned Value - */ - boolean saveFile(String text) { - - // Handle the case where we don't have a file name yet. - if (currFileName == null) { - return saveAsFile(text); - } - - try { - // Open a file of the current name. - File file = new File(currFileName); - - // Create an output writer that will write to that file. - // FileWriter handles international characters encoding conversions. - FileWriter out = new FileWriter(file); - //String text = jTextAreaSFFile.getText() - out.write(text); - out.close(); - this.insertPathname(currFileName); - this.dirty = false; - updateCaption(); - return true; - } catch (IOException e) { - statusBar.setText("Error saving " + currFileName); - statusBar.setToolTipText("Error saving " + currFileName); - JOptionPane.showMessageDialog(this, "Error saving " + currFileName, "Text Save", JOptionPane.ERROR_MESSAGE); - } - return false; - } - -/** - * Description of the Method - * - *@param text Description of Parameter - *@return Description of the Returned Value - */ - boolean saveAsFile(String text) { - while (true) { + /** + * Description of the Method + * + *@param text Description of Parameter + *@return Description of the Returned Value + */ + boolean saveAsFile(String text) { + while (true) { // Use the SAVE version of the dialog, test return for Approve/Cancel if (JFileChooser.APPROVE_OPTION == jFileChooser.showSaveDialog(this)) { - // Set the current file name to the user's selection, - // then do a regular saveFile - this.currFileName = jFileChooser.getSelectedFile().getPath(); - //repaints menu after item is selected - this.repaint(); - //Test if the file previously existed... - File file = new File(currFileName); - if (file.exists()){ - //----------------------- - int value = JOptionPane.showConfirmDialog(this, "File already exist. Overwrite?", - "Save As... - Overwrite?", JOptionPane.YES_NO_OPTION); - switch (value) { - case JOptionPane.YES_OPTION: - // yes, please save changes - this.setTokenEditMarker(currFileName); - this.repaint(); - return saveFile(text); - case JOptionPane.NO_OPTION: - // no, abandon edits - // i.e. return true without saving - //return false; - break; - default: - // cancel - return false; - } - //----------------------- - break; - } else { - return saveFile(text); - } - } else { - this.repaint(); - return false; - } - } - return false; - } + // Set the current file name to the user's selection, + // then do a regular saveFile + this.currFileName = jFileChooser.getSelectedFile().getPath(); + //repaints menu after item is selected + this.repaint(); + //Test if the file previously existed... + File file = new File(currFileName); + if (file.exists()) { + //----------------------- + int value = JOptionPane.showConfirmDialog(this, + "File already exist. Overwrite?", + "Save As... - Overwrite?", JOptionPane.YES_NO_OPTION); + switch (value) { + case JOptionPane.YES_OPTION: + // yes, please save changes + this.setTokenEditMarker(currFileName); + this.repaint(); + return saveFile(text); + case JOptionPane.NO_OPTION: - /** - * Description of the Method - * - *@param text Description of Parameter - *@param fileName Description of Parameter - *@return Description of the Returned Value - */ - public boolean okToAbandon(String text, String fileName) { - if (!dirty) { - return true; - } + // no, abandon edits + // i.e. return true without saving + //return false; + break; + default: - int value = JOptionPane.showConfirmDialog(this, "Save changes?", - "Text Edit", JOptionPane.YES_NO_CANCEL_OPTION); - switch (value) { - case JOptionPane.YES_OPTION: - // yes, please save changes - return saveFile(text); - case JOptionPane.NO_OPTION: - // no, abandon edits - // i.e. return true without saving - return true; - case JOptionPane.CANCEL_OPTION: - default: - // cancel - return false; + // cancel + return false; + } + //----------------------- + break; + } + else { + return saveFile(text); + } } - } - - - /** - * Description of the Method - */ - void updateCaption() { - String caption; - - if (currFileName == null) { - // synthesize the "Untitled" name if no name yet. - caption = "Untitled"; - } else { - caption = currFileName; + else { + this.repaint(); + return false; } + } + return false; + } - // add a "*" in the caption if the file is dirty. - if (dirty) { - caption = "* " + caption; - } - caption = "SF Gui - " + caption; - this.setTitle(caption); - } + /** + * Description of the Method + * + *@param text Description of Parameter + *@param fileName Description of Parameter + *@return Description of the Returned Value + */ + public boolean okToAbandon(String text, String fileName) { + if (!dirty) { + return true; + } + int value = JOptionPane.showConfirmDialog(this, "Save changes?", + "Text Edit", + JOptionPane.YES_NO_CANCEL_OPTION); + switch (value) { + case JOptionPane.YES_OPTION: - /** - * Description of the Method - */ - void helpAbout() { - MainFrame_AboutBox dlg = new MainFrame_AboutBox(this); - Dimension dlgSize = dlg.getPreferredSize(); - Dimension frmSize = getSize(); - Point loc = getLocation(); - dlg.setLocation((frmSize.width - dlgSize.width) / 2 + loc.x, (frmSize.height - dlgSize.height) / 2 + loc.y); - dlg.setModal(true); - dlg.show(); - } + // yes, please save changes + return saveFile(text); + case JOptionPane.NO_OPTION: + // no, abandon edits + // i.e. return true without saving + return true; + case JOptionPane.CANCEL_OPTION: + default: - /** - * Description of the Method - * - *@param auxjTextArea Description of Parameter - */ - void scrollTextArea(JTextArea auxjTextArea) { - try { - Document d = auxjTextArea.getDocument(); - //auxjTextArea.select(d.getLength(), d.getLength()); - Rectangle r = auxjTextArea.modelToView(d.getLength()); - if (r != null) { - auxjTextArea.scrollRectToVisible(r); - } - } catch (Exception e) { - e.printStackTrace(); - } - } + // cancel + return false; + } + } + /** + * Description of the Method + */ + void updateCaption() { + String caption; - /** - * Description of the Method - * - *@param e Description of Parameter - */ - void jMenuItemAuto_actionPerformed(ActionEvent e) { - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - this.lookAndFeel = "auto"; - SwingUtilities.updateComponentTreeUI(this); - saveIniFile(); - } catch (Exception ex) { - ex.printStackTrace(); - } - } + if (currFileName == null) { + // synthesize the "Untitled" name if no name yet. + caption = "Untitled"; + } + else { + caption = currFileName; + } + // add a "*" in the caption if the file is dirty. + if (dirty) { + caption = "* " + caption; + } + caption = "SF Gui - " + caption; + this.setTitle(caption); + } - /** - * Description of the Method - * - *@param e Description of Parameter - */ - void jMenuItemKuntstoff_actionPerformed(ActionEvent e) { - try { - UIManager.setLookAndFeel(new com.incors.plaf.kunststoff.KunststoffLookAndFeel()); - SwingUtilities.updateComponentTreeUI(this); - this.lookAndFeel = "kunststoff"; - saveIniFile(); - } catch (Exception ex) { - ex.printStackTrace(); - } - } + /** + * Description of the Method + */ + void helpAbout() { + MainFrame_AboutBox dlg = new MainFrame_AboutBox(this); + Dimension dlgSize = dlg.getPreferredSize(); + Dimension frmSize = getSize(); + Point loc = getLocation(); + dlg.setLocation( (frmSize.width - dlgSize.width) / 2 + loc.x, + (frmSize.height - dlgSize.height) / 2 + loc.y); + dlg.setModal(true); + dlg.show(); + } - /** - * Description of the Method - * - *@param e Description of Parameter - */ - void jMenuItemMetal_actionPerformed(ActionEvent e) { - try { - UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel"); - //Metal - SwingUtilities.updateComponentTreeUI(this); - this.lookAndFeel = "metal"; - saveIniFile(); - //this.repaint(); - } catch (Exception ex) { - ex.printStackTrace(); + /** + * Description of the Method + * + *@param auxjTextArea Description of Parameter + */ + void scrollTextArea(JTextArea auxjTextArea) { + try { + Document d = auxjTextArea.getDocument(); + //auxjTextArea.select(d.getLength(), d.getLength()); + Rectangle r = auxjTextArea.modelToView(d.getLength()); + if (r != null) { + auxjTextArea.scrollRectToVisible(r); } - } + } + catch (Exception e) { + e.printStackTrace(); + } + } + /** + * Description of the Method + * + *@param e Description of Parameter + */ + void jMenuItemAuto_actionPerformed(ActionEvent e) { + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + this.lookAndFeel = "auto"; + SwingUtilities.updateComponentTreeUI(this); + saveIniFile(); + } + catch (Exception ex) { + ex.printStackTrace(); + } + } - /** - * Description of the Method - * - *@param e Description of Parameter - */ - void jMenuItemWin_actionPerformed(ActionEvent e) { - try { - UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel"); - //Windows - SwingUtilities.updateComponentTreeUI(this); - this.lookAndFeel = "windows"; - saveIniFile(); - } catch (Exception ex) { - ex.printStackTrace(); - } - } + /** + * Description of the Method + * + *@param e Description of Parameter + */ + void jMenuItemKuntstoff_actionPerformed(ActionEvent e) { + try { + UIManager.setLookAndFeel(new com.incors.plaf.kunststoff. + KunststoffLookAndFeel()); + SwingUtilities.updateComponentTreeUI(this); + this.lookAndFeel = "kunststoff"; + saveIniFile(); + } + catch (Exception ex) { + ex.printStackTrace(); + } + } + /** + * Description of the Method + * + *@param e Description of Parameter + */ + void jMenuItemMetal_actionPerformed(ActionEvent e) { + try { + UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel"); + //Metal + SwingUtilities.updateComponentTreeUI(this); + this.lookAndFeel = "metal"; + saveIniFile(); + //this.repaint(); + } + catch (Exception ex) { + ex.printStackTrace(); + } + } - /** - * Description of the Method - * - *@param e Description of Parameter - */ - void jMenuItemMotif_actionPerformed(ActionEvent e) { - try { - UIManager.setLookAndFeel("com.sun.java.swing.plaf.motif.MotifLookAndFeel"); - // Motif - SwingUtilitie... [truncated message content] |
From: <st...@us...> - 2006-11-23 16:55:27
|
Revision: 3646 http://svn.sourceforge.net/smartfrog/?rev=3646&view=rev Author: steve_l Date: 2006-11-23 08:55:22 -0800 (Thu, 23 Nov 2006) Log Message: ----------- -ivy files for nearly everything. -updated libraries -root build.xml builds all ivyfied projects except jmx Modified Paths: -------------- trunk/core/build.xml trunk/core/common.xml trunk/core/components/anubis/ivy.xml trunk/core/components/libraries.properties trunk/core/components/sfinstaller/ivy.xml trunk/core/extras/ant/ivy.xml trunk/core/extras/sfgui/build.xml trunk/core/smartfrog/.svnignore trunk/core/smartfrog/ivy.xml Added Paths: ----------- trunk/core/.svnignore trunk/core/components/dns/ivy.xml trunk/core/components/jmx/ivy.xml trunk/core/components/net/ivy.xml trunk/core/components/releasetest/ivy.xml trunk/core/components/slp/ivy.xml trunk/core/components/ssh/ivy.xml trunk/core/extras/sfDebugger/ivy.xml trunk/core/extras/sfgui/ivy.xml trunk/core/release/ trunk/core/release/build.xml trunk/core/release/ivy.xml Removed Paths: ------------- trunk/core/.cvsignore Deleted: trunk/core/.cvsignore =================================================================== --- trunk/core/.cvsignore 2006-11-23 16:52:48 UTC (rev 3645) +++ trunk/core/.cvsignore 2006-11-23 16:55:22 UTC (rev 3646) @@ -1,11 +0,0 @@ -build -dist -build.properties -runtime.properties -common.properties -*.jpx -*.ipr -*.iml -*.iws -.classpath -.project \ No newline at end of file Copied: trunk/core/.svnignore (from rev 3643, trunk/core/.cvsignore) =================================================================== --- trunk/core/.svnignore (rev 0) +++ trunk/core/.svnignore 2006-11-23 16:55:22 UTC (rev 3646) @@ -0,0 +1,13 @@ +build +dist +external +releases +build.properties +runtime.properties +common.properties +*.jpx +*.ipr +*.iml +*.iws +.classpath +.project \ No newline at end of file Property changes on: trunk/core/.svnignore ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2006-11-23 16:52:48 UTC (rev 3645) +++ trunk/core/build.xml 2006-11-23 16:55:22 UTC (rev 3646) @@ -350,6 +350,7 @@ <!-- =================================================================== --> <!-- Create an ordered list of all ivy-enabled projects--> <!-- Non-ivy projects are ignored--> + <!-- we also ignore the deployapi components, as their build is more complex--> <!-- =================================================================== --> <target name="ivy-init" xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> <property file="components/libraries.properties" /> @@ -358,9 +359,13 @@ <presetdef name="ivy-projects"> <ivy:buildlist skipbuildwithoutivy="true"> <fileset dir="." includes="*/build.xml"/> - <fileset dir="extras" includes="*/build.xml"/> - <fileset dir="components" includes="*/build.xml" - excludes="deployapi/build.xml"/> + <fileset dir="." includes="extras/**/build.xml"/> + <fileset dir="components" includes="**/build.xml" > + <exclude name="deployapi/build.xml"/> + <exclude name="jmx/build.xml"/> + </fileset> + + <!--place for symlinks to external projects you want included--> <fileset dir="external" includes="**/build.xml"/> </ivy:buildlist> Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2006-11-23 16:52:48 UTC (rev 3645) +++ trunk/core/common.xml 2006-11-23 16:55:22 UTC (rev 3646) @@ -1438,7 +1438,7 @@ xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> <ivy:report todir="${build.dir}/ivy/reports"/> <echo> published Ivy report to - ${build.dir}/ivy/reports +${build.dir}/ivy/reports </echo> </target> Modified: trunk/core/components/anubis/ivy.xml =================================================================== --- trunk/core/components/anubis/ivy.xml 2006-11-23 16:52:48 UTC (rev 3645) +++ trunk/core/components/anubis/ivy.xml 2006-11-23 16:55:22 UTC (rev 3646) @@ -26,7 +26,9 @@ <conf name="test" extends="default,compile" description="the classpath needed to run tests"/> <conf name="master" description="contains the artifact but no dependencies"/> - <conf name="runtime" description="runtime but not the artifact"/> + <conf name="redist" description="redistributals excluding smartfrog artifacts"/> + <conf name="runtime" description="runtime but not the artifact" + extends="redist"/> </configurations> <publications> Added: trunk/core/components/dns/ivy.xml =================================================================== --- trunk/core/components/dns/ivy.xml (rev 0) +++ trunk/core/components/dns/ivy.xml 2006-11-23 16:55:22 UTC (rev 3646) @@ -0,0 +1,53 @@ +<?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-dns"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description> + DNS + Created 23-Nov-2006 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="dnsjava" + name="dnsjava" + rev="${dnsjava.version}" + conf="compile,redist->default"/> + + </dependencies> +</ivy-module> \ No newline at end of file Added: trunk/core/components/jmx/ivy.xml =================================================================== --- trunk/core/components/jmx/ivy.xml (rev 0) +++ trunk/core/components/jmx/ivy.xml 2006-11-23 16:55:22 UTC (rev 3646) @@ -0,0 +1,60 @@ +<?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-jmx"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description> + JMX management + Created 23-Nov-2006 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="mx4j" + name="mx4j" + rev="${mx4j.version}" + conf="compile,redist->default"/> + <dependency org="mx4j" + name="mx4j-jmx" + rev="${mx4j.version}" + conf="compile,redist->default"/> + <dependency org="mx4j" + name="mx4j-remote" + 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 2006-11-23 16:52:48 UTC (rev 3645) +++ trunk/core/components/libraries.properties 2006-11-23 16:55:22 UTC (rev 3646) @@ -10,17 +10,19 @@ bsh.version=2.0b4 cargo.version=0.8 commons-lang.version=2.1 -commons-net.version=1.2.2 +commons-net.version=1.4.1 commons-logging.version=1.0.4 commons-httpclient.version=3.0 +dnsjava.version=2.0.1 hsqldb.version=1.8.0.7 httpunit.version=1.6 jaxen.version=1.1-beta-8 jetty.version=4.2.9 -jsch.version=0.1.17 +jsch.version=0.1.29 junit.version=3.8.2 log4j.version=1.2.13 mail.version=1.4 +mx4j.version=3.0.1 mysql.version=3.1.13 rhino.version=1.5R4.1 rome.version=0.8 Added: trunk/core/components/net/ivy.xml =================================================================== --- trunk/core/components/net/ivy.xml (rev 0) +++ trunk/core/components/net/ivy.xml 2006-11-23 16:55:22 UTC (rev 3646) @@ -0,0 +1,57 @@ +<?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-net"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description> + networking + Created 23-Nov-2006 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"/> + <dependency org="commons-net" + name="commons-net" + rev="${commons-net.version}" + conf="compile,runtime->default"/> + + </dependencies> +</ivy-module> \ No newline at end of file Added: trunk/core/components/releasetest/ivy.xml =================================================================== --- trunk/core/components/releasetest/ivy.xml (rev 0) +++ trunk/core/components/releasetest/ivy.xml 2006-11-23 16:55:22 UTC (rev 3646) @@ -0,0 +1,53 @@ +<?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-releasetest"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description> + Release Test components + Created 23-Nov-2006 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-ssh" + rev="latest.integration" + conf="runtime->default"/> + + </dependencies> +</ivy-module> \ No newline at end of file Modified: trunk/core/components/sfinstaller/ivy.xml =================================================================== --- trunk/core/components/sfinstaller/ivy.xml 2006-11-23 16:52:48 UTC (rev 3645) +++ trunk/core/components/sfinstaller/ivy.xml 2006-11-23 16:55:22 UTC (rev 3646) @@ -1,7 +1,7 @@ <?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-installer"> + <info organisation="org.smartfrog" module="sf-sfinstaller"> <license name="LGPL"/> <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> <description> Added: trunk/core/components/slp/ivy.xml =================================================================== --- trunk/core/components/slp/ivy.xml (rev 0) +++ trunk/core/components/slp/ivy.xml 2006-11-23 16:55:22 UTC (rev 3646) @@ -0,0 +1,53 @@ +<?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-slplib"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description> + Service Location Protocol + Created 23-Nov-2006 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 Added: trunk/core/components/ssh/ivy.xml =================================================================== --- trunk/core/components/ssh/ivy.xml (rev 0) +++ trunk/core/components/ssh/ivy.xml 2006-11-23 16:55:22 UTC (rev 3646) @@ -0,0 +1,56 @@ +<?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-ssh"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description> + SSH component + Created 23-Nov-2006 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"/> + <dependency org="com.jcraft" + name="jsch" + rev="${jsch.version}" + conf="compile,redist->default"/> + </dependencies> +</ivy-module> \ No newline at end of file Modified: trunk/core/extras/ant/ivy.xml =================================================================== --- trunk/core/extras/ant/ivy.xml 2006-11-23 16:52:48 UTC (rev 3645) +++ trunk/core/extras/ant/ivy.xml 2006-11-23 16:55:22 UTC (rev 3646) @@ -22,7 +22,9 @@ <conf name="test" extends="systemtest" description="the classpath needed to run tests"/> <conf name="master" description="contains the artifact but no dependencies"/> - <conf name="runtime" description="runtime but not the artifact"/> + <conf name="redist" description="redistributals excluding smartfrog artifacts"/> + <conf name="runtime" description="runtime but not the artifact" + extends="redist"/> </configurations> <publications> Added: trunk/core/extras/sfDebugger/ivy.xml =================================================================== --- trunk/core/extras/sfDebugger/ivy.xml (rev 0) +++ trunk/core/extras/sfDebugger/ivy.xml 2006-11-23 16:55:22 UTC (rev 3646) @@ -0,0 +1,53 @@ +<?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-debugger"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description> + debugger + Created 23-Nov-2006 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 Modified: trunk/core/extras/sfgui/build.xml =================================================================== --- trunk/core/extras/sfgui/build.xml 2006-11-23 16:52:48 UTC (rev 3645) +++ trunk/core/extras/sfgui/build.xml 2006-11-23 16:55:22 UTC (rev 3646) @@ -43,13 +43,13 @@ <target name="init"> <tstamp/> <property name="Name.System" value="sfgui"/> - <property name="Name.Company" value="(C) Copyright 1998-2004 Hewlett-Packard Development Company, LP"/> + <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"/> + <property name="year" value="2006"/> <echo message=""/> -<echo message="==================================================================="/> + <echo message="==================================================================="/> <echo message="= ${Name.System} ${version}, ${Name.Company} (${ant.version})"/> <available property="nice.task.present" classname="org.apache.tools.ant.taskdefs.Nice" /> </target> @@ -363,6 +363,7 @@ <target name="jars" depends="initdist, sfGuiJar"/> + <target name="published" depends="jars" /> <!-- =================================================================== --> <!-- DIST --> Added: trunk/core/extras/sfgui/ivy.xml =================================================================== --- trunk/core/extras/sfgui/ivy.xml (rev 0) +++ trunk/core/extras/sfgui/ivy.xml 2006-11-23 16:55:22 UTC (rev 3646) @@ -0,0 +1,50 @@ +<?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-gui"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description> + SmartFrog GUI + Created 23-Nov-2006 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> + <artifact conf="master" name="sfGuiBrowser"/> + <artifact conf="master" name="SFGuiTools"/> + </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"/> + + + </dependencies> +</ivy-module> \ No newline at end of file Added: trunk/core/release/build.xml =================================================================== --- trunk/core/release/build.xml (rev 0) +++ trunk/core/release/build.xml 2006-11-23 16:55:22 UTC (rev 3646) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<project name="release" + xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> + + <description> + This build file aggregates artifacts from other projects to cut a release + </description> + + + <target name="clean" /> + + <target name="published" depends="ivy-report"/> + + + + <target name="ivy-init" > + <property file="../components/libraries.properties"/> + <ivy:configure file="../antbuild/ivy/ivyconf.xml"/> + </target> + + <target name="ivy-resolve" depends="ivy-init" + xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> + <ivy:resolve/> + </target> + + <target name="ivy-retrieve" depends="ivy-resolve" + xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> + <ivy:retrieve pattern="${ivy.lib.dir}/[conf]/[artifact]-[revision].[ext]" sync="true"/> + </target> + + <target name="ivy-report" depends="ivy-resolve" + xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> + <ivy:report todir="${build.dir}/ivy/reports"/> + <echo>published Ivy report to +${build.dir}/ivy/reports + </echo> + </target> + +</project> \ No newline at end of file Added: trunk/core/release/ivy.xml =================================================================== --- trunk/core/release/ivy.xml (rev 0) +++ trunk/core/release/ivy.xml 2006-11-23 16:55:22 UTC (rev 3646) @@ -0,0 +1,168 @@ +<?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-release"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description> + Rerelease the artifacts + Created 23-Nov-2006 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"/> + <conf name="sfjars" description="all the smartfrog JARs" + extends="runtime"/> +</configurations> + + <publications> + <!--get the artifact from our module name--> + <artifact conf="master" name="smartfrog-packages" type="zip"/> + </publications> + <dependencies> + <dependency org="org.smartfrog" + name="smartfrog" + changing="true" + rev="latest.integration" + conf="sfjars->examples;redist->redist"/> + <dependency org="org.smartfrog" + name="sf-tasks" changing="true" + rev="latest.integration" + conf="sfjars->master;redist->redist"/> + <dependency org="org.smartfrog" + name="sf-tasks" changing="true" + rev="latest.integration" + conf="sfjars->master;redist->redist"/> + <dependency org="org.smartfrog" + name="sf-junit" + changing="true" + rev="latest.integration" + conf="test->default"/> + + <!-- ant component. do we omit the ant dist?--> + <dependency org="org.smartfrog" + name="sf-ant" + changing="true" + rev="latest.integration" + conf="sfjars->master;redist->redist"/> + + <!-- anubis --> + <dependency org="org.smartfrog" + name="sf-anubis" + changing="true" + rev="latest.integration" + conf="sfjars->master;redist->redist"/> + + <!--dns--> + <dependency org="org.smartfrog" + name="sf-dns" + changing="true" + rev="latest.integration" + conf="sfjars->master;redist->redist"/> + <!-- testing--> + <dependency org="org.smartfrog" + name="sf-junit" + changing="true" + rev="latest.integration" + conf="sfjars->master;redist->redist"/> + + + + <!--logging--> + <dependency org="org.smartfrog" + name="sf-loggingservices" + changing="true" + rev="latest.integration" + conf="sfjars->master;redist->redist"/> + + <!--scripting --> + <dependency org="org.smartfrog" + name="sf-scripting" + changing="true" + rev="latest.integration" + conf="sfjars->master;redist->redist"/> + + <!--email --> + <dependency org="org.smartfrog" + name="sf-emailer" + changing="true" + rev="latest.integration" + conf="sfjars->master;redist->redist"/> + + <!--net--> + <dependency org="org.smartfrog" + name="sf-net" + changing="true" + rev="latest.integration" + conf="sfjars->master;redist->redist"/> + + <!--SLP--> + <dependency org="org.smartfrog" + name="sf-slplib" + changing="true" + rev="latest.integration" + conf="sfjars->master;redist->redist"/> + + + <!--ssh--> + <dependency org="org.smartfrog" + name="sf-ssh" + changing="true" + rev="latest.integration" + conf="sfjars->master;redist->redist"/> + + <!-- XML --> + <dependency org="org.smartfrog" + name="sf-xml" + changing="true" + rev="latest.integration" + conf="sfjars->master;redist->redist"/> + <!--Jabber --> + <dependency org="org.smartfrog" + name="sf-xmpp" + changing="true" + rev="latest.integration" + conf="sfjars->master;redist->redist"/> + + + <!--web stuff--> + <dependency org="org.smartfrog" + name="sf-www" + changing="true" + rev="latest.integration" + conf="sfjars->master;redist->redist"/> + <dependency org="org.smartfrog" + name="sf-tomcat" + changing="true" + rev="latest.integration" + conf="sfjars->master;redist->redist"/> + <dependency org="org.smartfrog" + name="sf-jetty" + changing="true" + rev="latest.integration" + conf="sfjars->master;redist->redist"/> + <dependency org="org.smartfrog" + name="sf-cargo" + changing="true" + rev="latest.integration" + conf="sfjars->master;redist->redist"/> + + </dependencies> +</ivy-module> \ No newline at end of file Modified: trunk/core/smartfrog/.svnignore =================================================================== --- trunk/core/smartfrog/.svnignore 2006-11-23 16:52:48 UTC (rev 3645) +++ trunk/core/smartfrog/.svnignore 2006-11-23 16:55:22 UTC (rev 3646) @@ -1,4 +1,5 @@ build +buildextra dist build.properties runtime.properties Modified: trunk/core/smartfrog/ivy.xml =================================================================== --- trunk/core/smartfrog/ivy.xml 2006-11-23 16:52:48 UTC (rev 3645) +++ trunk/core/smartfrog/ivy.xml 2006-11-23 16:55:22 UTC (rev 3646) @@ -27,7 +27,9 @@ <conf name="master" description="contains the artifact but no dependencies" extends="services"/> - <conf name="runtime" description="runtime but not the artifact"/> + <conf name="redist" description="redistributals excluding smartfrog artifacts"/> + <conf name="runtime" description="runtime but not the artifact" + extends="redist"/> <!--non standard configurations--> <conf name="javacc" visibility="private"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2006-11-23 19:54:48
|
Revision: 3649 http://svn.sourceforge.net/smartfrog/?rev=3649&view=rev Author: julgui Date: 2006-11-23 11:54:46 -0800 (Thu, 23 Nov 2006) Log Message: ----------- SFGui improvements to refresh the classpath used in the files browser. Modified Paths: -------------- trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/MainFrame.java trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/util/BrowseSFFilesTreePanel.java trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/util/LoadSFFiles.java trunk/core/smartfrog/lib/SFGuiBrowser.jar trunk/core/smartfrog/sf-build-version.properties Modified: trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/MainFrame.java =================================================================== --- trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/MainFrame.java 2006-11-23 17:37:39 UTC (rev 3648) +++ trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/MainFrame.java 2006-11-23 19:54:46 UTC (rev 3649) @@ -59,9 +59,10 @@ import org.smartfrog.sfcore.parser.*; import org.smartfrog.sfcore.componentdescription.*; import org.smartfrog.tools.gui.browser.util.BrowseSFFilesTreePanel; +import org.smartfrog.tools.gui.browser.util.LoadSFFiles; /** - *@author julgui + *@created 19 September 2001 */ //to DO: @@ -71,7 +72,6 @@ // - redirected keyboard fron processes! // /** - *@author julgui *@created */ @@ -80,7 +80,7 @@ /** * Description of the Field */ - public final static String version = "v0.7 r28"; + public final static String version = "v0.8 r01"; // This has to be done properly !!!!!!!!!!!!!!! no static. Because of crap log. static PrintStream msg = System.out; static JLabel statusBar = new JLabel(); @@ -264,6 +264,7 @@ JMenuItem jMenuItemInfo = new JMenuItem(); JMenu jMenuTools = new JMenu(); JMenuItem jMenuItemCleanOutput = new JMenuItem(); + JMenuItem jMenuItemReloadDescriptions = new JMenuItem(); JMenuItem jMenuItemCleanMsg = new JMenuItem(); JButton jButtonStop = new JButton(); JButton jButtonRun = new JButton(); @@ -1606,7 +1607,7 @@ */ void runSFDaemon() { String cmd = ""; - + LoadSFFiles.refreshClassPath(); String cmdStop = "java" + " " + "-cp \"" + classpath + "\" " + this.sfSystemClass + " " @@ -2263,6 +2264,20 @@ * *@param e Description of Parameter */ + void jMenuItemReloadDescriptions_actionPerformed(ActionEvent e) { + BrowseSFFilesTreePanel old = BrowseSFComponentPanel; + LoadSFFiles.refreshClassPath(); + BrowseSFComponentPanel = new BrowseSFFilesTreePanel(this); + jTabbedPanelNorth.remove(old); + jTabbedPanelNorth.add(BrowseSFComponentPanel, panelNameBrowseComp); + old=null; + } + + /** + * Description of the Method + * + *@param e Description of Parameter + */ void jMenuItemCleanMsg_actionPerformed(ActionEvent e) { jTextAreaMsg.setText(""); } @@ -2796,10 +2811,11 @@ jMenuItemInfo.addActionListener(new MainFrame_jMenuItemInfo_actionAdapter(this)); jMenuTools.setText("Tools"); jMenuItemCleanOutput.setText("Clean Output"); - jMenuItemCleanOutput.addActionListener(new - MainFrame_jMenuItemCleanOutput_actionAdapter(this)); - jMenuItemCleanOutput.setAccelerator(javax.swing.KeyStroke.getKeyStroke(79, - java.awt.event.KeyEvent.ALT_MASK, false)); + jMenuItemCleanOutput.addActionListener(new MainFrame_jMenuItemCleanOutput_actionAdapter(this)); + jMenuItemCleanOutput.setAccelerator(javax.swing.KeyStroke.getKeyStroke(79, java.awt.event.KeyEvent.ALT_MASK, false)); + jMenuItemReloadDescriptions.setText("Reload Descriptions"); + jMenuItemReloadDescriptions.addActionListener(new MainFrame_jMenuItemReloadDescription_actionAdapter(this)); + jMenuItemCleanMsg.setText("Clean Msg"); jMenuItemCleanMsg.addActionListener(new MainFrame_jMenuItemCleanMsg_actionAdapter(this)); @@ -2885,7 +2901,7 @@ jMenuItemInfoProp.addActionListener(new MainFrame_jMenuItemInfoProp_actionAdapter(this)); jSplitPane2.setBorder(null); - jSplitPane2.setLastDividerLocation(200); + jSplitPane2.setLastDividerLocation(400); //jSplitPane2.setResizeWeight(0.3); statusBar.setBorder(BorderFactory.createLoweredBevelBorder()); statusBar.setText(" "); @@ -3069,6 +3085,7 @@ jMenuEdit.add(jMenuItemSearchNext); jMenuTools.add(jMenuItemCleanOutput); jMenuTools.add(jMenuItemCleanMsg); + jMenuTools.add(jMenuItemReloadDescriptions); jMenuTools.add(jMenuItemSaveOutput); jMenuTools.addSeparator(); jMenuTools.add(jRadioButtonMenuItemSF); @@ -3098,7 +3115,7 @@ jFileChooser.setFileFilter(sfFilter); //jFileChooser.setCurrentDirectory(new File(System.getProperty("user.dir"))); jFileChooser.setCurrentDirectory(new File("./sf/")); - jSplitPane2.setDividerLocation(350); + jSplitPane2.setDividerLocation(400); } /** @@ -4525,9 +4542,35 @@ /** * Description of the Class + + */ +class MainFrame_jMenuItemReloadDescription_actionAdapter + implements java.awt.event.ActionListener { + + MainFrame adaptee; + + /** + * Constructor for the MainFrame_jMenuItemReloadDescription_actionAdapter object + * + *@param adaptee Description of Parameter + */ + MainFrame_jMenuItemReloadDescription_actionAdapter(MainFrame adaptee) { + this.adaptee = adaptee; + } + + /** + * Description of the Method + * + *@param e Description of Parameter + */ + public void actionPerformed(ActionEvent e) { + adaptee.jMenuItemReloadDescriptions_actionPerformed(e); + } +} + +/** + * Description of the Class * - *@author julgui - *@created 19 September 2001 */ class MainFrame_jMenuItemCleanMsg_actionAdapter implements java.awt.event.ActionListener { @@ -4556,8 +4599,8 @@ /** * Description of the Class * - *@author julgui - *@created 19 September 2001 + + */ class MainFrame_output_focusAdapter extends java.awt.event.FocusAdapter { @@ -4586,8 +4629,8 @@ /** * Description of the Class * - *@author julgui - *@created 19 September 2001 + + */ class MainFrame_jButtonOpen_actionAdapter implements java.awt.event.ActionListener { @@ -4616,8 +4659,8 @@ /** * Description of the Class * - *@author julgui - *@created 19 September 2001 + + */ class MainFrame_jButtonSave_actionAdapter implements java.awt.event.ActionListener { @@ -4646,8 +4689,8 @@ /** * Description of the Class * - *@author julgui - *@created 19 September 2001 + + */ class MainFrame_jButtonAbout_actionAdapter implements java.awt.event.ActionListener { @@ -4676,8 +4719,8 @@ /** * Description of the Class * - *@author julgui - *@created 19 September 2001 + + */ class MainFrame_jButtonPreferences_actionAdapter implements java.awt.event.ActionListener { @@ -4706,8 +4749,8 @@ /** * Description of the Class * - *@author julgui - *@created 19 September 2001 + + */ class MainFrame_jButtonUndo_actionAdapter implements java.awt.event.ActionListener { @@ -4736,8 +4779,8 @@ /** * Description of the Class * - *@author julgui - *@created 19 September 2001 + + */ class MainFrame_jButtonRedo_actionAdapter implements java.awt.event.ActionListener { @@ -4766,8 +4809,8 @@ /** * Description of the Class * - *@author julgui - *@created 19 September 2001 + + */ class MainFrame_jButtonParse_actionAdapter implements java.awt.event.ActionListener { @@ -4796,8 +4839,8 @@ /** * Description of the Class * - *@author julgui - *@created 19 September 2001 + + */ class MainFrame_jButtonRun_actionAdapter implements java.awt.event.ActionListener { @@ -4826,8 +4869,8 @@ /** * Description of the Class * - *@author julgui - *@created 19 September 2001 + + */ class MainFrame_jButtonStop_actionAdapter implements java.awt.event.ActionListener { @@ -4856,8 +4899,8 @@ /** * Description of the Class * - *@author julgui - *@created 19 September 2001 + + */ class MainFrame_jButtonBrowser_actionAdapter implements java.awt.event.ActionListener { @@ -4886,8 +4929,8 @@ /** * Description of the Class * - *@author julgui - *@created 19 September 2001 + + */ class MainFrame_jMenuItemBrowseSF_actionAdapter implements java.awt.event.ActionListener { @@ -4916,8 +4959,8 @@ /** * Description of the Class * - *@author julgui - *@created 19 September 2001 + + */ class MainFrame_jMenuItemSaveOutput_actionAdapter implements java.awt.event.ActionListener { @@ -4946,8 +4989,8 @@ /** * Description of the Class * - *@author julgui - *@created 19 September 2001 + + */ class MainFrame_jMenuItemInfoProp_actionAdapter implements java.awt.event.ActionListener { @@ -4976,7 +5019,7 @@ /** * Description of the Class * - *@author julgui + *@created 05 December 2001 */ class MainFrame_jButtonExit_actionAdapter @@ -5006,7 +5049,7 @@ /** * Description of the Class * - *@author julgui + *@created 05 December 2001 */ class MainFrame_jMenuItem1_actionAdapter @@ -5036,7 +5079,7 @@ /** * Description of the Class * - *@author julgui + *@created 05 December 2001 */ class MainFrame_jButtonSFDaemon_actionAdapter @@ -5066,14 +5109,14 @@ /** * Description of the Class * - *@author julgui + *@created 05 December 2001 */ /** * Description of the Class * - *@author julgui + *@created 05 December 2001 */ class MainFrame_documentTextAreaMsg_documentAdapter @@ -5117,7 +5160,7 @@ /** * Description of the Class * - *@author julgui + *@created 05 December 2001 */ class MainFrame_documentScreen_documentAdapter @@ -5161,7 +5204,7 @@ /** * Description of the Class * - *@author julgui + *@created 05 December 2001 */ class MainFrame_jButtonCopy_actionAdapter @@ -5191,7 +5234,7 @@ /** * Description of the Class * - *@author julgui + *@created 05 December 2001 */ class MainFrame_jButtonCut_actionAdapter @@ -5221,7 +5264,7 @@ /** * Description of the Class * - *@author julgui + *@created 05 December 2001 */ class MainFrame_jButtonPaste_actionAdapter @@ -5251,7 +5294,7 @@ /** * Description of the Class * - *@author julgui + *@created 15 February 2002 */ class MainFrame_jMenuItemKuntstoff_actionAdapter Modified: trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/util/BrowseSFFilesTreePanel.java =================================================================== --- trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/util/BrowseSFFilesTreePanel.java 2006-11-23 17:37:39 UTC (rev 3648) +++ trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/util/BrowseSFFilesTreePanel.java 2006-11-23 19:54:46 UTC (rev 3649) @@ -93,7 +93,7 @@ //jSplitPane1.setPreferredSize(new Dimension(300, 300)); jSplitPane1.setLastDividerLocation(200); //40% of the space goes to left/top - jSplitPane1.setResizeWeight(0.4); + //jSplitPane1.setResizeWeight(0.4); //jSplitPane1.setDividerLocation(200); jSplitPane1.add(treeScrollPane, JSplitPane.LEFT); this.add(jSplitPane1, BorderLayout.CENTER); Modified: trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/util/LoadSFFiles.java =================================================================== --- trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/util/LoadSFFiles.java 2006-11-23 17:37:39 UTC (rev 3648) +++ trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/util/LoadSFFiles.java 2006-11-23 19:54:46 UTC (rev 3649) @@ -36,6 +36,8 @@ import java.util.Arrays; import java.util.Comparator; import java.io.Serializable; +import java.io.File; +import java.io.FilenameFilter; /** * Title: SmartFrog CVS Description: Copyright: @@ -110,7 +112,7 @@ public void getSFFiles(Vector list) { int index = list.size(); while ((index--) > 0) { - System.out.println("Jar: " + list.get(index)); + //System.out.println("Jar: " + list.get(index)); this.listJarContent((String)list.get(index), filters); } } @@ -122,6 +124,7 @@ *@return Description of the Returned Value */ public Vector init() { + refreshClassPath(getDirs()); Vector listSF = new Vector(); String classpath = System.getProperty("java.class.path"); String pathSeparator = System.getProperty("path.separator"); @@ -151,6 +154,91 @@ /** + * get a list of all JAR files in a directory + * + * Derived from Ant Diagnostics class + * + * @param libDir directory + * @return array of files (or null for no such directory) + * + */ + private static File[] listJarFiles(File libDir, List filePaths) { + FilenameFilter filter = new FilenameFilter() { + public boolean accept(File dir, String name) { + return name.endsWith(".jar"); + } + }; + + File[] files = libDir.listFiles(filter); + if (filePaths !=null){ + for (int i=0;i<files.length;i++){ + filePaths.add(files[i].getAbsolutePath()); + } + } + return files; + } + + public static void refreshClassPath (){ + refreshClassPath(getDirs()); + } + + public static void refreshClassPath (Vector listDir){ + String pathSeparator = System.getProperty("path.separator"); + String fileSeparator = System.getProperty("file.separator"); + List listJars = new Vector(); + String classPath = ""; + for (int i=0;i<listDir.size();i++){ + //System.out.println("dir: "+ listDir.get(i)); + File dir = new File (listDir.get(i).toString()); + if (dir.isDirectory()){ + listJarFiles (dir, listJars); + } + } + StringBuffer strB = new StringBuffer(); + for (int i=0;i<listJars.size();i++){ + strB.append(listJars.get(i)); + strB.append(pathSeparator); + } +// System.out.println("classPath : "+strB.toString()); +// System.setProperty("java.class.path",strB.toString()); + } + + public static Vector getDirs (){ + Hashtable listDir = new Hashtable(); + String classpath = System.getProperty("java.class.path"); + String pathSeparator = System.getProperty("path.separator"); + String fileSeparator = System.getProperty("file.separator"); + String jarFile = ""; + int index = 0; + int index2 = 0; + File testFile = null; + File parent = null; + while (true) { + index = classpath.lastIndexOf(pathSeparator); + if (index < 0) { + break; + } + jarFile = classpath.substring(index + 1); + testFile = new File(jarFile); + try { + if (testFile.isDirectory()) { + listDir.put(testFile.getCanonicalPath(), testFile.toString()); + } + else { + parent = testFile.getParentFile(); + if (parent!=null) + listDir.put(parent.getCanonicalPath(),testFile.toString()); + } + } catch (IOException ex) { + ex.printStackTrace(); + } + classpath = classpath.substring(0, index); + } + return new Vector(listDir.keySet()); + } + + + /** * Description of the Method * *@param jarFile Description of Parameter Modified: trunk/core/smartfrog/lib/SFGuiBrowser.jar =================================================================== (Binary files differ) Modified: trunk/core/smartfrog/sf-build-version.properties =================================================================== --- trunk/core/smartfrog/sf-build-version.properties 2006-11-23 17:37:39 UTC (rev 3648) +++ trunk/core/smartfrog/sf-build-version.properties 2006-11-23 19:54:46 UTC (rev 3649) @@ -1,5 +1,5 @@ # SmartFrog release properties used during build process sf.majorRelease=3 sf.minorRelease=10 -sf.build=021 +sf.build=023 sf.status=dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2006-11-24 18:10:09
|
Revision: 3653 http://svn.sourceforge.net/smartfrog/?rev=3653&view=rev Author: steve_l Date: 2006-11-24 10:10:07 -0800 (Fri, 24 Nov 2006) Log Message: ----------- More on notifications, including tests to see that our CdlCompound generates the right events in its lifecycle. Modified Paths: -------------- trunk/core/antbuild/ivy/ivyconf.xml trunk/core/components/database/ivy.xml trunk/core/components/deployapi/src/org/smartfrog/services/deployapi/components/deploymentserver.sf trunk/core/components/deployapi/src/org/smartfrog/services/deployapi/components/hosting/DeployapiCompoundImpl.java trunk/core/components/deployapi/src/org/smartfrog/services/deployapi/engine/Application.java trunk/core/components/deployapi/src/org/smartfrog/services/deployapi/notifications/EventSubscription.java trunk/core/components/deployapi/src/org/smartfrog/services/deployapi/transport/wsrf/NotificationSubscription.java trunk/core/components/deployapi/test/org/smartfrog/services/deployapi/test/system/alpine/deployapi/home/ourgrid-testplan.sf trunk/core/components/fun/build.xml trunk/core/components/libraries.properties trunk/core/components/xmpp/ivy.xml trunk/core/extras/cdl/ivy.xml trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/CdlCompound.java trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/CdlCompoundImpl.java trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/components.cdl trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/CdlComponentTest.java trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/CdlExecTest.java trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/Lazy1Test.java trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/TerminationHandler.java trunk/core/smartfrog/src/org/smartfrog/services/assertions/TestCompound.java trunk/core/smartfrog/src/org/smartfrog/services/assertions/TestCompoundImpl.java trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/eventbus/EventCompoundImpl.java Added Paths: ----------- trunk/core/components/fun/ivy.xml trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/LifecycleEvent.java trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/LifecycleLogger.java trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/LifecycleLoggerImpl.java trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/LifecycleSource.java trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/components.sf trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/components/ trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/components/LifecycleListenerTest.java trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/components/testNormalWorkflow.sf trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/CdlDeployingTestBase.java trunk/core/extras/sfgui/.svnignore Removed Paths: ------------- trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/DeployingTestBase.java Modified: trunk/core/antbuild/ivy/ivyconf.xml =================================================================== --- trunk/core/antbuild/ivy/ivyconf.xml 2006-11-24 10:21:31 UTC (rev 3652) +++ trunk/core/antbuild/ivy/ivyconf.xml 2006-11-24 18:10:07 UTC (rev 3653) @@ -51,5 +51,7 @@ <modules> <module organisation="org.smartfrog" name=".*" resolver="internal"/> <module organisation="org.ggf" name=".*" resolver="internal"/> + <!-- here so that I can build the antbook at the same time--> + <module organisation="org.antbook" name=".*" resolver="internal"/> </modules> </ivyconf> \ No newline at end of file Modified: trunk/core/components/database/ivy.xml =================================================================== --- trunk/core/components/database/ivy.xml 2006-11-24 10:21:31 UTC (rev 3652) +++ trunk/core/components/database/ivy.xml 2006-11-24 18:10:07 UTC (rev 3653) @@ -61,5 +61,10 @@ name="hsqldb" rev="${hsqldb.version}" conf="test->default"/> - </dependencies> +<!-- <dependency org="commons-dbutils" + name="commons-dbutils" + rev="${commons-dbutils.version}" + conf="redist->master"/> + --> + </dependencies> </ivy-module> \ No newline at end of file Modified: trunk/core/components/deployapi/src/org/smartfrog/services/deployapi/components/deploymentserver.sf =================================================================== --- trunk/core/components/deployapi/src/org/smartfrog/services/deployapi/components/deploymentserver.sf 2006-11-24 10:21:31 UTC (rev 3652) +++ trunk/core/components/deployapi/src/org/smartfrog/services/deployapi/components/deploymentserver.sf 2006-11-24 18:10:07 UTC (rev 3653) @@ -1,4 +1,4 @@ -/** (C) Copyright 2005 Hewlett-Packard Development Company, LP +/** (C) Copyright 2005-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 Modified: trunk/core/components/deployapi/src/org/smartfrog/services/deployapi/components/hosting/DeployapiCompoundImpl.java =================================================================== --- trunk/core/components/deployapi/src/org/smartfrog/services/deployapi/components/hosting/DeployapiCompoundImpl.java 2006-11-24 10:21:31 UTC (rev 3652) +++ trunk/core/components/deployapi/src/org/smartfrog/services/deployapi/components/hosting/DeployapiCompoundImpl.java 2006-11-24 18:10:07 UTC (rev 3653) @@ -40,65 +40,6 @@ public class DeployapiCompoundImpl extends CdlCompoundImpl implements DeployapiCompound, LifecycleListener { - private URI jobURI; - private static final Log log = LogFactory.getLog(DeployapiCompoundImpl.class); - private LifecycleListener listener; - public DeployapiCompoundImpl() throws RemoteException { } - - - /** - * bind to something listening for lifecycle events. No events are raised at this point. - * @param uri job ID - * @throws SmartFrogException - * @throws RemoteException - */ - public synchronized void subscribe(String uri, LifecycleListener target) throws SmartFrogException, - RemoteException { - try { - jobURI = new URI(uri); - } catch (URISyntaxException e) { - throw SmartFrogException.forward(e); - } - this.listener = target; - sfReplaceAttribute(ATTR_JOBURI, uri); - } - - - - - - /** - * enter a state, send notification if this is different from a state we - * were in before This method is synchronous, you cannot enter a state till - * the last one was processed. - * <p/> - * If you try and enter the current state, then nothing happens - * - * @param newState new state to enter - * @param info string to record in the stateInfo field. - * @throws java.rmi.RemoteException for network problems - */ - public void enterStateNotifying(LifecycleStateEnum newState, String info) throws RemoteException { - if (listener != null) { - listener.enterStateNotifying(newState, info); - } - } - - /** - * terminate, send a message out - * - * @param record termination record - * @throws java.rmi.RemoteException for network problems - */ - public void enterTerminatedStateNotifying(TerminationRecord record) throws RemoteException { - if(listener!=null) { - listener.enterTerminatedStateNotifying(record); - } - } - - public LifecycleListener getListener() { - return listener; - } } Modified: trunk/core/components/deployapi/src/org/smartfrog/services/deployapi/engine/Application.java =================================================================== --- trunk/core/components/deployapi/src/org/smartfrog/services/deployapi/engine/Application.java 2006-11-24 10:21:31 UTC (rev 3652) +++ trunk/core/components/deployapi/src/org/smartfrog/services/deployapi/engine/Application.java 2006-11-24 18:10:07 UTC (rev 3653) @@ -69,7 +69,7 @@ public class Application implements WSRPResourceSource, LifecycleListener { - private final static Log log = LogFactory.getLog(Application.class); + private static final Log log = LogFactory.getLog(Application.class); private String jsdlLanguage; private String extension; /** Modified: trunk/core/components/deployapi/src/org/smartfrog/services/deployapi/notifications/EventSubscription.java =================================================================== --- trunk/core/components/deployapi/src/org/smartfrog/services/deployapi/notifications/EventSubscription.java 2006-11-24 10:21:31 UTC (rev 3652) +++ trunk/core/components/deployapi/src/org/smartfrog/services/deployapi/notifications/EventSubscription.java 2006-11-24 18:10:07 UTC (rev 3653) @@ -31,6 +31,7 @@ /** * Something happened to this job * @param event the event of interest + * @return true if it was processed */ boolean event(Event event); Modified: trunk/core/components/deployapi/src/org/smartfrog/services/deployapi/transport/wsrf/NotificationSubscription.java =================================================================== --- trunk/core/components/deployapi/src/org/smartfrog/services/deployapi/transport/wsrf/NotificationSubscription.java 2006-11-24 10:21:31 UTC (rev 3652) +++ trunk/core/components/deployapi/src/org/smartfrog/services/deployapi/transport/wsrf/NotificationSubscription.java 2006-11-24 18:10:07 UTC (rev 3653) @@ -24,6 +24,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.smartfrog.projects.alpine.faults.AlpineRuntimeException; +import org.smartfrog.projects.alpine.faults.SoapException; import org.smartfrog.projects.alpine.om.base.SoapElement; import org.smartfrog.projects.alpine.om.soap11.Body; import org.smartfrog.projects.alpine.om.soap11.MessageDocument; @@ -249,17 +250,23 @@ * Something happened to this job * * @param event the event of interest + * @return true if the event is still of interest */ public boolean event(Event event) { //send the event to the callback SoapElement request = createMuwsLifecycleEvent(event); try { - log.info("Notifying "+getCallback()); + if(log.isInfoEnabled()) { + log.info("Notifying "+getCallback() + +"\n"+request.toXML()); + } MessageDocument response = session.invokeBlocking(null, request); + log.info(response.toXML()); } catch (AlpineRuntimeException e) { lastError = e; //if anything went wrong, log log.error("Failed to post the event to "+callback,e); + log.error(e.GenerateSoapFault().toXML()); //signal the failure return false; } Modified: trunk/core/components/deployapi/test/org/smartfrog/services/deployapi/test/system/alpine/deployapi/home/ourgrid-testplan.sf =================================================================== --- trunk/core/components/deployapi/test/org/smartfrog/services/deployapi/test/system/alpine/deployapi/home/ourgrid-testplan.sf 2006-11-24 10:21:31 UTC (rev 3652) +++ trunk/core/components/deployapi/test/org/smartfrog/services/deployapi/test/system/alpine/deployapi/home/ourgrid-testplan.sf 2006-11-24 18:10:07 UTC (rev 3653) @@ -27,9 +27,9 @@ } notifyCompound extends NotifyHost { + hostname "deployapi.iseran.com"; + } - } - //this has to link to a notify service in the same process //notifications TBD;; @@ -43,7 +43,7 @@ endpoint PARENT:endpoint; subdir PARENT:subdir; - singleTest "notification"; + singleTest "creation"; } } @@ -55,7 +55,7 @@ necEnabled true; ourgridEnabled true; hpEnabled true; - proxyEnabled true; + proxyEnabled false; log extends SFLog { //log against our parent @@ -72,9 +72,9 @@ } } - testLog LAZY log:logTo:logTo; + proxy extends Proxy { enabled proxyEnabled; } Modified: trunk/core/components/fun/build.xml =================================================================== --- trunk/core/components/fun/build.xml 2006-11-24 10:21:31 UTC (rev 3652) +++ trunk/core/components/fun/build.xml 2006-11-24 18:10:07 UTC (rev 3653) @@ -35,7 +35,6 @@ <property name="root.dir" location="../.."/> <!-- Import common stuff --> <import file="${root.dir}/common.xml"/> -================================= --> </project> Added: trunk/core/components/fun/ivy.xml =================================================================== --- trunk/core/components/fun/ivy.xml (rev 0) +++ trunk/core/components/fun/ivy.xml 2006-11-24 18:10:07 UTC (rev 3653) @@ -0,0 +1,48 @@ +<?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-fun"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description>Fun things for demos</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="unittest" extends="compile" + description="the classpath needed to run unittests"/> + <conf name="systemtest" extends="unittest" + description="the classpath needed to run systemtests"/> + <conf name="test" extends="systemtest" + 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/> + </publications> + <dependencies> + <dependency org="org.smartfrog" + name="smartfrog" + rev="latest.integration" + conf="compile->master;runtime->default"/> + <dependency org="org.smartfrog" + name="sf-tasks" + rev="latest.integration" + conf="build->default"/> + </dependencies> +</ivy-module> \ No newline at end of file Modified: trunk/core/components/libraries.properties =================================================================== --- trunk/core/components/libraries.properties 2006-11-24 10:21:31 UTC (rev 3652) +++ trunk/core/components/libraries.properties 2006-11-24 18:10:07 UTC (rev 3653) @@ -9,10 +9,11 @@ ant.m2.version=1.6.5 bsh.version=2.0b4 cargo.version=0.8 +commons-dbutils.version=1.0 +commons-httpclient.version=3.0 commons-lang.version=2.1 +commons-logging.version=1.0.4 commons-net.version=1.4.1 -commons-logging.version=1.0.4 -commons-httpclient.version=3.0 dnsjava.version=2.0.1 hsqldb.version=1.8.0.7 httpunit.version=1.6 Modified: trunk/core/components/xmpp/ivy.xml =================================================================== --- trunk/core/components/xmpp/ivy.xml 2006-11-24 10:21:31 UTC (rev 3652) +++ trunk/core/components/xmpp/ivy.xml 2006-11-24 18:10:07 UTC (rev 3653) @@ -1,7 +1,11 @@ <?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-xmpp"/> + <info organisation="org.smartfrog" module="sf-xmpp"> + <license name="LGPL"/> + <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> + <description>XMPP/Jabber support</description> + </info> <!-- FIXME: Ivy 1.4.1 buildlist bug <configurations defaultconfmapping="default"> <include file="../../antbuild/ivy/configurations.xml"/> Modified: trunk/core/extras/cdl/ivy.xml =================================================================== --- trunk/core/extras/cdl/ivy.xml 2006-11-24 10:21:31 UTC (rev 3652) +++ trunk/core/extras/cdl/ivy.xml 2006-11-24 18:10:07 UTC (rev 3653) @@ -52,6 +52,11 @@ rev="latest.integration" conf="test->default"/> <dependency org="org.smartfrog" + name="sf-fun" + changing="true" + rev="latest.integration" + conf="test->default"/> + <dependency org="org.smartfrog" name="sf-xml" changing="true" rev="latest.integration" Modified: trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/CdlCompound.java =================================================================== --- trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/CdlCompound.java 2006-11-24 10:21:31 UTC (rev 3652) +++ trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/CdlCompound.java 2006-11-24 18:10:07 UTC (rev 3653) @@ -31,7 +31,7 @@ */ -public interface CdlCompound extends Remote { +public interface CdlCompound extends LifecycleSource { /** * The name under which XML text gets added * {@value} @@ -50,6 +50,11 @@ String ATTR_JOBURI = "joburi"; /** + * Reference to something listening for events + */ + String ATTR_LISTENER = "listener"; + + /** * Resolve a reference * @param name qname of the reference * @param mandatory flag to indicate a mandatory reference @@ -69,15 +74,5 @@ */ String resolveText(QName name, boolean mandatory) throws SmartFrogResolutionException, RemoteException; - /** - * bind to something listening for lifecycle events. No events are raised at this point. - * - * @param uri job ID - * @throws org.smartfrog.sfcore.common.SmartFrogException - * @throws java.rmi.RemoteException - */ - void subscribe(String uri, LifecycleListener target) throws SmartFrogException, - RemoteException; - LifecycleListener getListener() throws RemoteException; } Modified: trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/CdlCompoundImpl.java =================================================================== --- trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/CdlCompoundImpl.java 2006-11-24 10:21:31 UTC (rev 3652) +++ trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/CdlCompoundImpl.java 2006-11-24 18:10:07 UTC (rev 3653) @@ -25,6 +25,7 @@ import org.smartfrog.sfcore.common.SmartFrogResolutionException; import org.smartfrog.sfcore.compound.CompoundImpl; import org.smartfrog.sfcore.prim.TerminationRecord; +import org.smartfrog.sfcore.prim.Prim; import org.smartfrog.sfcore.reference.Reference; import org.smartfrog.sfcore.reference.ReferencePart; @@ -60,7 +61,11 @@ */ public synchronized void sfDeploy() throws SmartFrogException, RemoteException { super.sfDeploy(); - enterStateNotifying(LifecycleStateEnum.instantiated, null); + Prim listenerPrim=sfResolve(ATTR_LISTENER,(Prim)null,false); + if(listenerPrim!=null) { + listener=(LifecycleListener) listenerPrim; + } + enterStateNotifying(LifecycleStateEnum.initialized, null); } /** @@ -140,7 +145,27 @@ sfReplaceAttribute(ATTR_JOBURI, uri); } + /** + * unsubscribe. This is idempotent + * @param subscriber + * @throws SmartFrogException + * @throws RemoteException + * @return true if the listener was unsubscribed + */ + public boolean unsubscribe(LifecycleListener subscriber) + throws SmartFrogException, RemoteException { + boolean match=listener==subscriber; + if(match) { + listener=null; + } + return match; + } + + public LifecycleListener getListener() { + return listener; + } + /** * enter a state, send notification if this is different from a state we * were in before This method is synchronous, you cannot enter a state till @@ -170,7 +195,4 @@ } } - public LifecycleListener getListener() { - return listener; - } } Added: trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/LifecycleEvent.java =================================================================== --- trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/LifecycleEvent.java (rev 0) +++ trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/LifecycleEvent.java 2006-11-24 18:10:07 UTC (rev 3653) @@ -0,0 +1,98 @@ +package org.smartfrog.services.cddlm.cdl.base; + +import org.smartfrog.sfcore.prim.TerminationRecord; + +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; + +/** + * A simple class used to pass events around. Extra information may be + * added to the data map. + */ +public final class LifecycleEvent implements Serializable,Cloneable { + + private Date timestamp; + + private LifecycleStateEnum state=LifecycleStateEnum.undefined; + + private String info; + + private TerminationRecord record; + + private HashMap<String, Serializable> data=new HashMap<String, Serializable>(); + + public LifecycleEvent() { + } + + public LifecycleEvent(LifecycleStateEnum state, String info) { + this.state = state; + this.info = info; + timestamp = new Date(); + } + + + public LifecycleEvent(TerminationRecord record) { + state=LifecycleStateEnum.terminated; + info=""; + timestamp = new Date(); + this.record = record; + } + + public Date getTimestamp() { + return timestamp; + } + + public void setTimestamp(Date timestamp) { + this.timestamp = timestamp; + } + + public LifecycleStateEnum getState() { + return state; + } + + public void setState(LifecycleStateEnum state) { + this.state = state; + } + + public String getInfo() { + return info; + } + + public void setInfo(String info) { + this.info = info; + } + + public TerminationRecord getRecord() { + return record; + } + + public void setRecord(TerminationRecord record) { + this.record = record; + } + + + public HashMap<String, Serializable> getData() { + return data; + } + + public void setData(HashMap<String, Serializable> data) { + this.data = data; + } + + /** + * shallow clone; the hashmap of data is not cloned + * @return a cloned object + * @throws CloneNotSupportedException + */ + protected Object clone() throws CloneNotSupportedException { + return super.clone(); + } + + + public String toString() { + return timestamp.toString()+": "+state+": " + +(info!=null?info:"")+"\n" + +(record!=null?record.toString():""); + } +} Added: trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/LifecycleLogger.java =================================================================== --- trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/LifecycleLogger.java (rev 0) +++ trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/LifecycleLogger.java 2006-11-24 18:10:07 UTC (rev 3653) @@ -0,0 +1,36 @@ +/** (C) Copyright 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 + + */ +package org.smartfrog.services.cddlm.cdl.base; + +import java.rmi.RemoteException; + + +/** + */ +public interface LifecycleLogger extends LifecycleListener { + + String ATTR_LISTEN_TO="listenTo"; + + int size() throws RemoteException; + + LifecycleEvent getEvent(int count) throws RemoteException; + + void clear() throws RemoteException; +} Added: trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/LifecycleLoggerImpl.java =================================================================== --- trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/LifecycleLoggerImpl.java (rev 0) +++ trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/LifecycleLoggerImpl.java 2006-11-24 18:10:07 UTC (rev 3653) @@ -0,0 +1,113 @@ +package org.smartfrog.services.cddlm.cdl.base; + +import org.smartfrog.sfcore.prim.TerminationRecord; +import org.smartfrog.sfcore.prim.PrimImpl; +import org.smartfrog.sfcore.prim.Prim; +import org.smartfrog.sfcore.common.SmartFrogException; +import org.smartfrog.sfcore.common.SmartFrogDeploymentException; +import org.smartfrog.sfcore.componentdescription.ComponentDescription; + +import java.rmi.RemoteException; +import java.util.List; +import java.util.ArrayList; +import java.util.ListIterator; + +/** + * This component logs events. + */ +public class LifecycleLoggerImpl extends PrimImpl + implements LifecycleLogger, Iterable { + + private List<LifecycleEvent> events = new ArrayList<LifecycleEvent>(4); + + private LifecycleSource listenTo; + + public LifecycleLoggerImpl() throws RemoteException { + } + + public int size() { + return events.size(); + } + + public LifecycleEvent getEvent(int count) { + return events.get(count); + } + + public void enterStateNotifying(LifecycleStateEnum newState, String info) { + LifecycleEvent event = new LifecycleEvent(newState, info); + events.add(event); + sfLog().info(event); + } + + public void enterTerminatedStateNotifying(TerminationRecord record) { + LifecycleEvent event = new LifecycleEvent(record); + events.add(event); + sfLog().info(event); + //if the listen to source is not null, then we assume it came from there and terminate + unsubscribe(); + } + + public void clear() { + events.clear(); + } + + + /** + * Iterate over all events. Not remotable. + * + * @return a new iterator + */ + public ListIterator<LifecycleEvent> iterator() { + return events.listIterator(); + } + + /** + * unsubscribe iff the source is not null. all exceptions thrown are ignored + * but log. + */ + private synchronized void unsubscribe() { + if (listenTo != null) { + try { + LifecycleSource source = listenTo; + listenTo = null; + source.unsubscribe(this); + } catch (SmartFrogException e) { + sfLog().ignore("Unsubscribing", e); + } catch (RemoteException e) { + sfLog().ignore("Unsubscribing", e); + } + } + } + + + public synchronized void sfDeploy() + throws SmartFrogException, RemoteException { + super.sfDeploy(); + Object listenToObject = sfResolve(ATTR_LISTEN_TO, (Object) null, false); + if (listenToObject != null) { + if (listenToObject instanceof ComponentDescription) { + throw new SmartFrogDeploymentException(ATTR_LISTEN_TO + " reference is not yet deployed"); + } + Prim listenToRef = null; + listenToRef = sfResolve(ATTR_LISTEN_TO, listenToRef, false); + if (!(listenToRef instanceof LifecycleSource)) { + throw new SmartFrogDeploymentException("Not a Lifecycle Source " + listenToRef + .sfCompleteName()); + } + listenTo = (LifecycleSource) listenToRef; + listenTo.subscribe("", this); + } + } + + public synchronized void sfStart() + throws SmartFrogException, RemoteException { + super.sfStart(); + + } + + + public void sfTerminate(TerminationRecord status) { + super.sfTerminate(status); + unsubscribe(); + } +} Added: trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/LifecycleSource.java =================================================================== --- trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/LifecycleSource.java (rev 0) +++ trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/LifecycleSource.java 2006-11-24 18:10:07 UTC (rev 3653) @@ -0,0 +1,35 @@ +package org.smartfrog.services.cddlm.cdl.base; + +import org.smartfrog.sfcore.common.SmartFrogException; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +/** + */ +public interface LifecycleSource extends Remote { + /** + * bind to something listening for lifecycle events. + * No events are raised at this point. + * + * @param uri job ID + * @param target remote interface to forward events + * @throws org.smartfrog.sfcore.common.SmartFrogException + * @throws java.rmi.RemoteException + */ + void subscribe(String uri, LifecycleListener target) throws + SmartFrogException, + RemoteException; + + /** + * unsubscribe. This is idempotent + * @param subscriber + * @throws SmartFrogException + * @throws RemoteException + * @return true if the listener was unsubscribed + */ + boolean unsubscribe(LifecycleListener subscriber) throws + SmartFrogException, + RemoteException; +} + Modified: trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/components.cdl =================================================================== --- trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/components.cdl 2006-11-24 10:21:31 UTC (rev 3652) +++ trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/components.cdl 2006-11-24 18:10:07 UTC (rev 3653) @@ -16,17 +16,17 @@ <base:Prim> <!-- - <sf:sfClass/> - <sf:sfCodeBase /> - <sf:sfDeployerClass /> - <sf:sfExport/> - <sf:sfExportPort/> - <sf:sfLivenessDelay /> - <sf:sfLivenessFactor /> - <sf:sfLog /> - <sf:sfProcessName /> - <sf:sfProcessComponentName /> - <sf:sfProcessHost/> + <sfClass/> + <sfCodeBase /> + <sfDeployerClass /> + <sfExport/> + <sfExportPort/> + <sfLivenessDelay /> + <sfLivenessFactor /> + <sfLog /> + <sfProcessName /> + <sfProcessComponentName /> + <sfProcessHost/> --> </base:Prim> @@ -41,7 +41,9 @@ <sfClass>org.smartfrog.services.cddlm.cdl.base.CdlCompoundImpl</sfClass> </base:CdlComponent> + <base:LifecycleLogger cdl:extends="base:Prim"> + <sfClass>org.smartfrog.services.cddlm.cdl.base.LifecycleLoggerImpl</sfClass> + </base:LifecycleLogger> - </cdl:configuration> </cdl:cdl> \ No newline at end of file Added: trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/components.sf =================================================================== --- trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/components.sf (rev 0) +++ trunk/core/extras/cdl/src/org/smartfrog/services/cddlm/cdl/base/components.sf 2006-11-24 18:10:07 UTC (rev 3653) @@ -0,0 +1,41 @@ +/** (C) Copyright 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 + + */ + + +#include "/org/smartfrog/components.sf" + +/** + * CDL components are inherently compounds + */ +CdlComponent extends Compound { + sfClass "org.smartfrog.services.cddlm.cdl.base.CdlCompoundImpl"; +} + +/** + * something to log lifecycle events + */ +LifecycleLogger extends Prim { + sfClass "org.smartfrog.services.cddlm.cdl.base.LifecycleLoggerImpl"; + schema extends Schema { + listenTo extends OptionalCD { + description "a component to listen to"; + } + } +} \ No newline at end of file Added: trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/components/LifecycleListenerTest.java =================================================================== --- trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/components/LifecycleListenerTest.java (rev 0) +++ trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/components/LifecycleListenerTest.java 2006-11-24 18:10:07 UTC (rev 3653) @@ -0,0 +1,24 @@ +package org.smartfrog.test.system.sfcore.languages.cdl.components; + +import org.smartfrog.test.system.sfcore.languages.cdl.execute.CdlDeployingTestBase; +import org.smartfrog.services.assertions.TestCompound; + +/** + * Test the lifecycle of an CdlCompound + */ +public class LifecycleListenerTest extends CdlDeployingTestBase { + protected static final String FILES = "/org/smartfrog/test/system/sfcore/languages/cdl/components/"; + + public LifecycleListenerTest(String name) { + super(name); + } + + + public void testNormalWorkflow() throws Throwable { + application = deployExpectingSuccess(FILES + "testNormalWorkflow.sf", + "testNormalWorkflow"); + TestCompound block = (TestCompound) application; + expectSuccessfulTermination(block); + assertAttributeEquals(application, "value", true); + } +} Added: trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/components/testNormalWorkflow.sf =================================================================== --- trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/components/testNormalWorkflow.sf (rev 0) +++ trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/components/testNormalWorkflow.sf 2006-11-24 18:10:07 UTC (rev 3653) @@ -0,0 +1,46 @@ +/** (C) Copyright 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 + + */ + + +#include "/org/smartfrog/services/assertions/components.sf" +#include "/org/smartfrog/services/cddlm/cdl/base/components.sf" +#include "/org/smartfrog/sfcore/workflow/combinators/parallel.sf" +#include "/org/smartfrog/sfcore/workflow/combinators/try.sf" +#include "/org/smartfrog/sfcore/workflow/combinators/delay.sf" + +sfConfig extends ExpectDeploy { + + undeployAfter 20000; + + action extends Compound { + logger extends LifecycleLogger { + } + + try extends Try { + action extends CdlComponent { + listener LAZY ATTRIB logger; + fail extends Fail { + delay 2000; + } + } + } + + } +} Modified: trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/CdlComponentTest.java =================================================================== --- trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/CdlComponentTest.java 2006-11-24 10:21:31 UTC (rev 3652) +++ trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/CdlComponentTest.java 2006-11-24 18:10:07 UTC (rev 3653) @@ -46,7 +46,7 @@ } } */ -public class CdlComponentTest extends DeployingTestBase { +public class CdlComponentTest extends CdlDeployingTestBase { public static final String VALID_CDL_FILES = "files/sfcdl/valid/"; Copied: trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/CdlDeployingTestBase.java (from rev 3650, trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/DeployingTestBase.java) =================================================================== --- trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/CdlDeployingTestBase.java (rev 0) +++ trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/CdlDeployingTestBase.java 2006-11-24 18:10:07 UTC (rev 3653) @@ -0,0 +1,90 @@ +/** (C) Copyright 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 + + */ +package org.smartfrog.test.system.sfcore.languages.cdl.execute; + +import org.smartfrog.test.SmartFrogTestBase; +import org.smartfrog.test.DeployingTestBase; +import org.smartfrog.test.unit.sfcore.languages.cdl.Filenames; +import org.smartfrog.sfcore.prim.Prim; + +import java.rmi.RemoteException; + +/** + * created 31-Jan-2006 13:43:11 + */ + +public abstract class CdlDeployingTestBase extends DeployingTestBase implements Filenames { + public static final int SPIN_LAG = 1000; + public static final String FILES = "files/sfcdl/"; + public static final String VALID= FILES + "valid/"; + public static final String INVALID = FILES + "invalid/"; + public static final int DEFAULT_TIMEOUT = 30; + + public CdlDeployingTestBase(String name) { + super(name); + } + + protected void deployAndTerminate(String name) throws Throwable { + Prim prim=null; + try { + prim = deployExpectingSuccess(getResourceBase() + name , name); + assertLivenessSuccess(prim); + assertLivenessSuccess(prim); + assertLivenessSuccess(prim); + assertLivenessSuccess(prim); + assertLivenessSuccess(prim); + } finally { + terminate(prim); + } + } + + protected String getResourceBase() { + return CdlComponentTest.VALID_CDL_FILES; + } + + public void terminate(Prim prim) throws RemoteException { + terminateWithSpin(prim,DEFAULT_TIMEOUT); + } + + public void terminateWithSpin(Prim prim, int timeout) throws RemoteException { + if (prim != null) { + terminateApplication(prim); + boolean ok = spinUntilTerminated(prim, timeout); + assertTrue("Failed to terminate application",ok); + } + } + + protected boolean spinUntilTerminated(Prim prim,int timeout) throws RemoteException { + try { + long timeLimit =System.currentTimeMillis()+timeout*1000; + boolean tooLong =false; + while(!prim.sfIsTerminated() && !tooLong) { + Thread.sleep(SPIN_LAG); + tooLong =System.currentTimeMillis()>timeLimit; + } + return !prim.sfIsTerminated(); + } catch (InterruptedException e) { + return false; + } catch (java.rmi.NoSuchObjectException noSuchObject) { + //hey, we are not here any more. + return true; + } + } +} Property changes on: trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/CdlDeployingTestBase.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/CdlExecTest.java =================================================================== --- trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/CdlExecTest.java 2006-11-24 10:21:31 UTC (rev 3652) +++ trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/CdlExecTest.java 2006-11-24 18:10:07 UTC (rev 3653) @@ -42,31 +42,16 @@ public void NotestDeployExec() throws Throwable { - Prim application = null; - try { - application = deployExpectingSuccess(EXEC_CDL, "testExec"); - } finally { - terminateApplication(application); - } + application = deployExpectingSuccess(EXEC_CDL, "testExec"); } public void NotestDeployJBoss() throws Throwable { - Prim application = null; - try { - application = deployExpectingSuccess(JBOSS_CDL, "testJboss"); - } finally { - terminateApplication(application); - } + application = deployExpectingSuccess(JBOSS_CDL, "testJboss"); } public void testDeploySound() throws Throwable { - Prim application = null; - try { - application = deployExpectingSuccess(SOUND_CDL, "testSound"); - Thread.sleep(15000); - } finally { - terminateApplication(application); - } + application = deployExpectingSuccess(SOUND_CDL, "testSound"); + Thread.sleep(15000); } } Deleted: trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/DeployingTestBase.java =================================================================== --- trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/DeployingTestBase.java 2006-11-24 10:21:31 UTC (rev 3652) +++ trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/DeployingTestBase.java 2006-11-24 18:10:07 UTC (rev 3653) @@ -1,89 +0,0 @@ -/** (C) Copyright 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 - - */ -package org.smartfrog.test.system.sfcore.languages.cdl.execute; - -import org.smartfrog.test.SmartFrogTestBase; -import org.smartfrog.test.unit.sfcore.languages.cdl.Filenames; -import org.smartfrog.sfcore.prim.Prim; - -import java.rmi.RemoteException; - -/** - * created 31-Jan-2006 13:43:11 - */ - -public abstract class DeployingTestBase extends SmartFrogTestBase implements Filenames { - public static final int SPIN_LAG = 1000; - public static final String FILES = "files/sfcdl/"; - public static final String VALID= Lazy1Test.FILES + "valid/"; - public static final String INVALID = Lazy1Test.FILES + "invalid/"; - public static final int DEFAULT_TIMEOUT = 30; - - public DeployingTestBase(String name) { - super(name); - } - - protected void deployAndTerminate(String name) throws Throwable { - Prim prim=null; - try { - prim = deployExpectingSuccess(getResourceBase() + name , name); - assertLivenessSuccess(prim); - assertLivenessSuccess(prim); - assertLivenessSuccess(prim); - assertLivenessSuccess(prim); - assertLivenessSuccess(prim); - } finally { - terminate(prim); - } - } - - protected String getResourceBase() { - return CdlComponentTest.VALID_CDL_FILES; - } - - public void terminate(Prim prim) throws RemoteException { - terminateWithSpin(prim,DEFAULT_TIMEOUT); - } - - public void terminateWithSpin(Prim prim, int timeout) throws RemoteException { - if (prim != null) { - terminateApplication(prim); - boolean ok = spinUntilTerminated(prim, timeout); - assertTrue("Failed to terminate application",ok); - } - } - - protected boolean spinUntilTerminated(Prim prim,int timeout) throws RemoteException { - try { - long timeLimit =System.currentTimeMillis()+timeout*1000; - boolean tooLong =false; - while(!prim.sfIsTerminated() && !tooLong) { - Thread.sleep(SPIN_LAG); - tooLong =System.currentTimeMillis()>timeLimit; - } - return !prim.sfIsTerminated(); - } catch (InterruptedException e) { - return false; - } catch (java.rmi.NoSuchObjectException noSuchObject) { - //hey, we are not here any more. - return true; - } - } -} Modified: trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/Lazy1Test.java =================================================================== --- trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/Lazy1Test.java 2006-11-24 10:21:31 UTC (rev 3652) +++ trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/Lazy1Test.java 2006-11-24 18:10:07 UTC (rev 3653) @@ -20,13 +20,12 @@ package org.smartfrog.test.system.sfcore.languages.cdl.execute; import org.smartfrog.sfcore.prim.Prim; -import org.smartfrog.services.cddlm.cdl.demo.Echo; /** * created 24-Jun-2005 15:02:17 */ -public class Lazy1Test extends DeployingTestBase { +public class Lazy1Test extends CdlDeployingTestBase { public Lazy1Test(String name) { super(name); @@ -35,20 +34,12 @@ public static final String LAZY1 = Lazy1Test.VALID + "lazy1.cdl"; - - public void testLazyReference() throws Throwable { - Prim application = null; - try { - application = deployExpectingSuccess(Lazy1Test.LAZY1, "lazy1"); - Prim app =(Prim) resolveAttribute(application,"app"); - String message=resolveStringAttribute(app, "user"); - assertTrue("Empty message attribute",message.length()>0); - assertEquals("lazy-value",message); - - } finally { - terminate(application); - } + application = deployExpectingSuccess(Lazy1Test.LAZY1, "lazy1"); + Prim app = (Prim) resolveAttribute(application, "app"); + String message = resolveStringAttribute(app, "user"); + assertTrue("Empty message attribute", message.length() > 0); + assertEquals("lazy-value", message); } Modified: trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/TerminationHandler.java =================================================================== --- trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/TerminationHandler.java 2006-11-24 10:21:31 UTC (rev 3652) +++ trunk/core/extras/cdl/test/org/smartfrog/test/system/sfcore/languages/cdl/execute/TerminationHandler.java 2006-11-24 18:10:07 UTC (rev 3653) @@ -19,7 +19,6 @@ */ package org.smartfrog.test.system.sfcore.languages.cdl.execute; -import junit.framework.Assert; import org.smartfrog.sfcore.prim.PrimHook; import org.smartfrog.sfcore.prim.Prim; import org.smartfrog.sfcore.prim.TerminationRecord; @@ -31,10 +30,10 @@ import java.rmi.RemoteException; /** - * This is a class to wait() on to wait for terminations. - * It will also signal with a timeout in case termination took longer than allowed. + * This is a class to wait() on to wait for terminations. It will also signal + * with a timeout in case termination took longer than allowed. */ -public class TerminationHandler extends Assert implements PrimHook { +public class TerminationHandler implements PrimHook { private boolean normalTerminationExpected; @@ -46,34 +45,37 @@ /** - * - * @param normalTerminationExpected (flag to say normal termination is expected) - * @param expectedMessageText text to look for in the message (can be null) + * @param normalTerminationExpected (flag to say normal termination is + * expected) + * @param expectedMessageText text to look for in the message (can be + * null) */ - public TerminationHandler(boolean normalTerminationExpected, String expectedMessageText) { + public TerminationHandler(boolean normalTerminationExpected, + String expectedMessageText) { this.normalTerminationExpected = normalTerminationExpected; } /** * sfHookAction for terminating * - * @param source prim component + * @param source prim component * @param record TerminationRecord object + * * @throws org.smartfrog.sfcore.common.SmartFrogException * in case of any error */ public void sfHookAction(Prim source, TerminationRecord record) throws SmartFrogException { - try { - Reference name = null; - name = source.sfCompleteName(); - //check for a match - if (targetName.equals(name)) { - //and if so, save the record and notify our caller - terminationRecord = record; - this.notify(); - } - } catch (RemoteException remoteTrouble) { + try { + Reference name = null; + name = source.sfCompleteName(); + //check for a match + if (targetName.equals(name)) { + //and if so, save the record and notify our caller + terminationRecord = record; + this.notify(); + } + } catch (RemoteException remoteTrouble) { throw new SmartFrogException(remoteTrouble); } } @@ -85,31 +87,35 @@ /** * wait for a node to terminate within a given time. + * * @param prim * @param timeoutSeconds */ - public void waitForTermination(Prim prim,int timeoutSeconds) { + public void waitForTermination(Prim prim, int timeoutSeconds) + throws SmartFrogException { PrimImpl.sfTerminateWithHooks.addHook(this); try { try { - this.wait(timeoutSeconds*1000); + this.wait(timeoutSeconds * 1000); } catch (InterruptedException e) { - fail("timeout interrupted"); + throw new SmartFrogException("timeout interrupted"); } //at this point we have terminated. - assertNotNull("termination record is null",terminationRecord); - boolean normalEnd=TerminationRecord.NORMAL.equals(terminationRecord.errorType); - String text=terminationRecord.toString(); - if(normalTerminationExpected) { - assertTrue("Expected normal termination, got "+text,normalEnd); - } else { - assertFalse("Expected abnormal termination, got " + text, normalEnd); + if (terminationRecord == null) { + throw new SmartFrogException("termination record is null"); } - if(expectedMessageText!=null) { - assertTrue( - "expected to find ["+expectedMessageText+"] in "+text, - text.indexOf(expectedMessageText)>0); + boolean normalEnd = TerminationRecord.NORMAL + .equals(terminationRecord.errorType); + String text = terminationRecord.toString(); + if (normalTerminationExpected!=normalEnd) { + throw new SmartFrogException("unexpected outcome:" + +terminationRecord); } + if (expectedMessageText != null + && text.indexOf(expectedMessageText) <= 0) { + throw new SmartFrogException( + "failed to find [" + expectedMessageText + "] in " + text); + } } finally { unregisterWithPrimImpl(); } @@ -128,20 +134,26 @@ /** * Wait for an application terminating * - * @param prim component to wait on. Must be local for proper waiting to work + * @param prim component to wait on. Must be local for + * proper waiting to work * @param timeoutSeconds * @param normalTerminationExpected * @param expectedText + * * @throws java.rmi.RemoteException * @throws InterruptedException */ - public static void awaitTermination(Prim prim, int timeoutSeconds, boolean normalTerminationExpected, + public static void awaitTermination(Prim prim, + int timeoutSeconds, + boolean normalTerminationExpected, String expectedText) throws - RemoteException, InterruptedException { + RemoteException, SmartFrogException { if (!(prim instanceof PrimImpl)) { - fail("Only local process components can be waited on"); + throw new SmartFrogException("Only local process components can be waited on"); } - TerminationHandler terminateHandler = new TerminationHandler(normalTerminationExpected, expectedText); + TerminationHandler terminateHandler = new TerminationHandler( + normalTerminationExpected, + expectedText); terminateHandler.waitForTermination(prim, timeoutSeconds); } } Added: trunk/core/extras/sfgui/.svnignore =================================================================== --- trunk/core/extras/sfgui/.svnignore (rev 0) +++ trunk/core/extras/sfgui/.svnignore 2006-11-24 18:10:07 UTC (rev 3653) @@ -0,0 +1,13 @@ +build +dist +build.properties +runtime.properties +common.properties +*.jpx +*.ipr +*.iml +*.iws +.classpath +.project +parsertargets_report.html +smartfrog-version.properties Modified: trunk/core/smartfrog/src/org/smartfrog/services/assertions/TestCompound.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/assertions/TestCompound.java 2006-11-24 10:21:31 UTC (rev 3652) +++ trunk/core/smartfrog/src/org/smartfrog/services/assertions/TestCompound.java 2006-11-24 18:10:07 UTC (rev 3653) @@ -26,7 +26,7 @@ */ -public interface TestCompound extends Remote { +public interface TestCompound extends TestBlock { /** Modified: trunk/core/smartfrog/src/org/smartfrog/services/assertions/TestCompoundImpl.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/assertions/TestCompoundImpl.java 2006-11-24 10:21:31 UTC (rev 3652) +++ trunk/core/smartfrog/src/org/smartfrog/services/assertions/TestCompoundImpl.java 2006-11-24 18:10:07 UTC (rev 3653) @@ -37,7 +37,7 @@ */ public class TestCompoundImpl extends EventCompoundImpl - implements TestCompound, TestBlock { + implements TestCompound { private ComponentDescription teardownCD; private Prim teardown; Modified: trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/eventbus/EventCompoundImpl.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/eventbus/EventCompoundImpl.java 2006-11-24 10:21:31 UTC (rev 3652) +++ trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/eventbus/EventCompoundImpl.java 2006-11-24 18:10:07 UTC (rev 3653) @@ -94,7 +94,7 @@ Object key = e.nextElement(); Object elem = sfContext.get(key); if ((elem instanceof ComponentDescription)&& (((ComponentDescription)elem).getEager())) { - childCtx.sfAddAttribute(key, (ComponentDescription)elem); + childCtx.sfAddAttribute(key, elem); if (action == null) { action = (ComponentDescription)elem; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2006-11-26 12:44:43
|
Revision: 3656 http://svn.sourceforge.net/smartfrog/?rev=3656&view=rev Author: julgui Date: 2006-11-26 04:44:38 -0800 (Sun, 26 Nov 2006) Log Message: ----------- Improvements in SFGui to dynamically reload and browse classpath. Modified Paths: -------------- trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/MainFrame.java trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/util/LoadSFFiles.java trunk/core/smartfrog/lib/SFGuiBrowser.jar Modified: trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/MainFrame.java =================================================================== --- trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/MainFrame.java 2006-11-25 19:58:16 UTC (rev 3655) +++ trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/MainFrame.java 2006-11-26 12:44:38 UTC (rev 3656) @@ -80,7 +80,7 @@ /** * Description of the Field */ - public final static String version = "v0.8 r01"; + public final static String version = "v0.8 r02"; // This has to be done properly !!!!!!!!!!!!!!! no static. Because of crap log. static PrintStream msg = System.out; static JLabel statusBar = new JLabel(); @@ -2109,20 +2109,19 @@ jTextAreaMsg.append("\n -OS: " + System.getProperty("os.name") + "\n"); // to standard output a more complete info ;-) System.out.println(""); - System.out.println("*****************************************************"); - System.out.println("* @ Serrano - HP Labs Bristol - 2001 *"); - System.out.println("*****************************************************"); + System.out.println("*******************************************************"); + System.out.println("* SFGui " + version ); + System.out.println("* " + org.smartfrog.Version.versionString() ); + System.out.println("* (C)Copyright Hewlett-Packard Development Company, LP "); + System.out.println("*******************************************************"); System.out.println("Java Version: " + System.getProperty("java.version")); System.out.println("Java Home: " + System.getProperty("java.home")); System.out.println("Java Ext Dir: " + System.getProperty("java.ext.dirs")); - System.out.println("Java ClassPath: " + - System.getProperty("java.class.path")); System.out.println("OS Name: " + System.getProperty("os.name")); System.out.println("OS Version: " + System.getProperty("os.version")); System.out.println("User Name: " + System.getProperty("user.name")); System.out.println("User Home: " + System.getProperty("user.home")); System.out.println("User Work Dir: " + System.getProperty("user.dir")); - System.out.println("Smart Frog: " + org.smartfrog.Version.versionString()); try { java.net.InetAddress localhost = java.net.InetAddress.getLocalHost(); out.println("LocalHost Name: " + localhost.getHostName()); @@ -2132,6 +2131,10 @@ catch (Exception ex) { System.out.println("Exception Info:" + ex.toString()); } + System.out.println("* Java ClassPath: " + "\n" + + (System.getProperty("java.class.path")).replace( + System.getProperty("path.separator").charAt(0), '\n')); + out.println("*****************************************************"); System.out.println(""); } Modified: trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/util/LoadSFFiles.java =================================================================== --- trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/util/LoadSFFiles.java 2006-11-25 19:58:16 UTC (rev 3655) +++ trunk/core/extras/sfgui/src/org/smartfrog/tools/gui/browser/util/LoadSFFiles.java 2006-11-26 12:44:38 UTC (rev 3656) @@ -199,8 +199,7 @@ strB.append(listJars.get(i)); strB.append(pathSeparator); } -// System.out.println("classPath : "+strB.toString()); -// System.setProperty("java.class.path",strB.toString()); + System.setProperty("java.class.path",strB.toString()); } public static Vector getDirs (){ @@ -323,7 +322,7 @@ * initializes internal hash tables with Jar file resources. * *@param jarFileName The feature to be added to the JarFiles attribute - *@param filter The feature to be added to the JarFiles attribute + *@param filters The feature to be added to the JarFiles attribute */ private void addJarFiles(String jarFileName, String[] filters) { try { @@ -384,16 +383,14 @@ } } //while - } catch (NullPointerException e) { - System.out.println("done."); } catch (FileNotFoundException e) { System.err.println("File : " + jarFileName + ", " + e.getMessage()); //e.printStackTrace(); } catch (IOException e) { System.err.println("Error(IO): " + jarFileName + ", " + e.getMessage()); //e.printStackTrace(); - } catch (Exception ex) { - System.out.println("File: " + jarFileName); + } catch (Throwable thr) { + System.err.println("Error when reading File: " + jarFileName + ", "+ thr.toString()); } } } Modified: trunk/core/smartfrog/lib/SFGuiBrowser.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...> - 2006-11-28 16:07:14
|
Revision: 3670 http://svn.sourceforge.net/smartfrog/?rev=3670&view=rev Author: steve_l Date: 2006-11-28 08:07:09 -0800 (Tue, 28 Nov 2006) Log Message: ----------- Making sure every sf dependency is marked as changing. Modified Paths: -------------- trunk/core/components/ant/ivy.xml trunk/core/components/anubis/ivy.xml trunk/core/components/database/ivy.xml trunk/core/components/emailer/ivy.xml trunk/core/components/loggingservices/ivy.xml trunk/core/components/scripting/ivy.xml trunk/core/components/sfinstaller/ivy.xml trunk/core/components/xmpp/ivy.xml trunk/core/extras/ant/ivy.xml trunk/core/testharness/ivy.xml Modified: trunk/core/components/ant/ivy.xml =================================================================== --- trunk/core/components/ant/ivy.xml 2006-11-27 20:32:27 UTC (rev 3669) +++ trunk/core/components/ant/ivy.xml 2006-11-28 16:07:09 UTC (rev 3670) @@ -42,15 +42,17 @@ rev="latest.integration" conf="compile->services;runtime->services;daemon->services"/> <dependency org="org.smartfrog" - name="sf-tasks" + name="sf-tasks" changing="true" rev="latest.integration" conf="build->default"/> <dependency org="org.smartfrog" name="sf-testharness" + changing="true" rev="latest.integration" conf="test->default"/> <dependency org="ant" name="ant" + changing="true" rev="${apache.ant.version}" conf="compile->default;redist->default"/> <!-- <dependency org="ant" Modified: trunk/core/components/anubis/ivy.xml =================================================================== --- trunk/core/components/anubis/ivy.xml 2006-11-27 20:32:27 UTC (rev 3669) +++ trunk/core/components/anubis/ivy.xml 2006-11-28 16:07:09 UTC (rev 3670) @@ -42,7 +42,7 @@ rev="latest.integration" conf="compile->services;runtime->services;daemon->services"/> <dependency org="org.smartfrog" - name="sf-tasks" + name="sf-tasks" changing="true" rev="latest.integration" conf="build->default"/> </dependencies> Modified: trunk/core/components/database/ivy.xml =================================================================== --- trunk/core/components/database/ivy.xml 2006-11-27 20:32:27 UTC (rev 3669) +++ trunk/core/components/database/ivy.xml 2006-11-28 16:07:09 UTC (rev 3670) @@ -43,16 +43,14 @@ conf="compile->services;runtime->services;daemon->services"/> <dependency org="org.smartfrog" name="sf-tasks" + changing="true" rev="latest.integration" conf="build->default"/> <dependency org="org.smartfrog" name="sf-testharness" + changing="true" rev="latest.integration" conf="test->default"/> - <dependency org="org.smartfrog" - name="sf-testharness" - rev="latest.integration" - conf="test->default"/> <dependency org="mysql" name="mysql-connector-java" rev="${mysql.version}" Modified: trunk/core/components/emailer/ivy.xml =================================================================== --- trunk/core/components/emailer/ivy.xml 2006-11-27 20:32:27 UTC (rev 3669) +++ trunk/core/components/emailer/ivy.xml 2006-11-28 16:07:09 UTC (rev 3670) @@ -42,10 +42,12 @@ conf="compile,runtime,daemon->services"/> <dependency org="org.smartfrog" name="sf-tasks" + changing="true" rev="latest.integration" conf="build->default"/> <dependency org="org.smartfrog" name="sf-testharness" + changing="true" rev="latest.integration" conf="test->default"/> Modified: trunk/core/components/loggingservices/ivy.xml =================================================================== --- trunk/core/components/loggingservices/ivy.xml 2006-11-27 20:32:27 UTC (rev 3669) +++ trunk/core/components/loggingservices/ivy.xml 2006-11-28 16:07:09 UTC (rev 3670) @@ -43,6 +43,7 @@ conf="compile,runtime,daemon->services"/> <dependency org="org.smartfrog" name="sf-tasks" + changing="true" rev="latest.integration" conf="build->default"/> <dependency org="log4j" Modified: trunk/core/components/scripting/ivy.xml =================================================================== --- trunk/core/components/scripting/ivy.xml 2006-11-27 20:32:27 UTC (rev 3669) +++ trunk/core/components/scripting/ivy.xml 2006-11-28 16:07:09 UTC (rev 3670) @@ -43,10 +43,12 @@ conf="compile->services;runtime->services;daemon->services"/> <dependency org="org.smartfrog" name="sf-tasks" + changing="true" rev="latest.integration" conf="build->default"/> <dependency org="org.smartfrog" name="sf-testharness" + changing="true" rev="latest.integration" conf="test->default"/> <!-- Getting errors here. Modified: trunk/core/components/sfinstaller/ivy.xml =================================================================== --- trunk/core/components/sfinstaller/ivy.xml 2006-11-27 20:32:27 UTC (rev 3669) +++ trunk/core/components/sfinstaller/ivy.xml 2006-11-28 16:07:09 UTC (rev 3670) @@ -42,6 +42,7 @@ conf="compile,runtime,daemon->services"/> <dependency org="org.smartfrog" name="sf-tasks" + changing="true" rev="latest.integration" conf="build->default"/> <dependency org="velocity" Modified: trunk/core/components/xmpp/ivy.xml =================================================================== --- trunk/core/components/xmpp/ivy.xml 2006-11-27 20:32:27 UTC (rev 3669) +++ trunk/core/components/xmpp/ivy.xml 2006-11-28 16:07:09 UTC (rev 3670) @@ -40,6 +40,7 @@ conf="compile->master;runtime->default"/> <dependency org="org.smartfrog" name="sf-tasks" + changing="true" rev="latest.integration" conf="build->default"/> <dependency org="jivesoftware" Modified: trunk/core/extras/ant/ivy.xml =================================================================== --- trunk/core/extras/ant/ivy.xml 2006-11-27 20:32:27 UTC (rev 3669) +++ trunk/core/extras/ant/ivy.xml 2006-11-28 16:07:09 UTC (rev 3670) @@ -34,6 +34,7 @@ <dependencies> <dependency org="org.smartfrog" name="smartfrog" + changing="true" rev="latest.integration" conf="compile->core;runtime->core;systemtest->services"/> <!--still a bit unstable--> Modified: trunk/core/testharness/ivy.xml =================================================================== --- trunk/core/testharness/ivy.xml 2006-11-27 20:32:27 UTC (rev 3669) +++ trunk/core/testharness/ivy.xml 2006-11-28 16:07:09 UTC (rev 3670) @@ -37,6 +37,7 @@ conf="compile->examples;runtime->examples"/> <dependency org="org.smartfrog" name="sf-tasks" + changing="true" rev="latest.integration" conf="build->default"/> <dependency org="junit" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2006-11-29 16:40:32
|
Revision: 3672 http://svn.sourceforge.net/smartfrog/?rev=3672&view=rev Author: steve_l Date: 2006-11-29 08:38:56 -0800 (Wed, 29 Nov 2006) Log Message: ----------- Delay with no action is a sleep Modified Paths: -------------- trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/combinators/Delay.java trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/combinators/delay.sf trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/eventbus/eventbus.sf trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/delay/DelayTest.java Modified: trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/combinators/Delay.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/combinators/Delay.java 2006-11-28 17:12:22 UTC (rev 3671) +++ trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/combinators/Delay.java 2006-11-29 16:38:56 UTC (rev 3672) @@ -88,7 +88,7 @@ public synchronized void sfDeploy() throws SmartFrogException, RemoteException { super.sfDeploy(); - checkActionDefined(); + //checkActionDefined(); time = ((Integer)sfResolve(timeRef)).intValue(); } @@ -153,11 +153,16 @@ } synchronized (this) { if (!terminated && !isWorkflowTerminating()) { - try { - sfCreateNewChild(name + "_actionRunning", action, null); - } catch (Exception e) { - sfTerminate(TerminationRecord.abnormal( - "error in launching delayed component", name, e)); + if(action!=null) { + try { + sfCreateNewChild(name + "_actionRunning", action, null); + } catch (Exception e) { + sfTerminate(TerminationRecord.abnormal( + "error in launching delayed component", name, e)); + } + } else { + //no work to do; terminate + sfTerminate(TerminationRecord.normal(name)); } } } Modified: trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/combinators/delay.sf =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/combinators/delay.sf 2006-11-28 17:12:22 UTC (rev 3671) +++ trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/combinators/delay.sf 2006-11-29 16:38:56 UTC (rev 3672) @@ -20,7 +20,7 @@ #include "/org/smartfrog/sfcore/workflow/eventbus/eventbus.sf" -Delay extends ActionCompound { +Delay extends OptionalActionCompound { sfClass "org.smartfrog.sfcore.workflow.combinators.Delay"; delaySchema extends Schema { //delay in milliseconds Modified: trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/eventbus/eventbus.sf =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/eventbus/eventbus.sf 2006-11-28 17:12:22 UTC (rev 3671) +++ trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/eventbus/eventbus.sf 2006-11-29 16:38:56 UTC (rev 3672) @@ -49,7 +49,6 @@ eventCompoundSchema extends EventCompoundSchema; sendTo extends LAZY {} registerWith extends LAZY {} - } /** @@ -64,6 +63,9 @@ } } +OptionalActionCompound extends ActionCompound { + actionCompoundSchema:action:optional true; +} /** * A compound that can have a child component Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/delay/DelayTest.java =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/delay/DelayTest.java 2006-11-28 17:12:22 UTC (rev 3671) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/delay/DelayTest.java 2006-11-29 16:38:56 UTC (rev 3672) @@ -49,4 +49,8 @@ expectAbnormalTermination((TestBlock) application); } + public void testDelayNoAction() throws Throwable { + application = deployExpectingSuccess(FILES + "testDelayNoAction.sf", "testDelayNoAction"); + expectSuccessfulTermination((TestBlock) application); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2006-11-29 16:41:54
|
Revision: 3675 http://svn.sourceforge.net/smartfrog/?rev=3675&view=rev Author: steve_l Date: 2006-11-29 08:41:49 -0800 (Wed, 29 Nov 2006) Log Message: ----------- The first transaction test now works! Repeatedly! without restarting the JVM! Modified Paths: -------------- trunk/core/build.xml trunk/core/components/database/build.xml trunk/core/components/database/src/org/smartfrog/services/database/core/JdbcBindingImpl.java trunk/core/components/database/src/org/smartfrog/services/database/core/JdbcOperationImpl.java trunk/core/components/database/src/org/smartfrog/services/database/core/TransactionImpl.java trunk/core/components/database/src/org/smartfrog/services/database/core/components.sf trunk/core/components/database/src/org/smartfrog/services/database/hsqldb/components.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/TableManipulationTest.sf trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/hsqldb/components.sf trunk/core/smartfrog/src/org/smartfrog/services/assertions/TestCompoundImpl.java Added Paths: ----------- trunk/core/components/database/src/org/smartfrog/services/database/core/TerminationTransactionImpl.java trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/delay/testDelayNoAction.sf Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2006-11-29 16:40:26 UTC (rev 3674) +++ trunk/core/build.xml 2006-11-29 16:41:49 UTC (rev 3675) @@ -359,7 +359,7 @@ <presetdef name="ivy-projects"> <ivy:buildlist skipbuildwithoutivy="true"> <fileset dir="." includes="*/build.xml"/> - <fileset dir="." includes="extras/**/build.xml"/> + <fileset dir="extras" includes="**/build.xml"/> <fileset dir="components" includes="**/build.xml" > <exclude name="deployapi/build.xml"/> <exclude name="jmx/build.xml"/> Modified: trunk/core/components/database/build.xml =================================================================== --- trunk/core/components/database/build.xml 2006-11-29 16:40:26 UTC (rev 3674) +++ trunk/core/components/database/build.xml 2006-11-29 16:41:49 UTC (rev 3675) @@ -44,6 +44,8 @@ <import file="${xml.dir}/dist.xml"/> <import file="${xml.dir}/state.xml"/> + <!----> + <target name="default" depends="published" /> <!-- ========================================================== --> Modified: trunk/core/components/database/src/org/smartfrog/services/database/core/JdbcBindingImpl.java =================================================================== --- trunk/core/components/database/src/org/smartfrog/services/database/core/JdbcBindingImpl.java 2006-11-29 16:40:26 UTC (rev 3674) +++ trunk/core/components/database/src/org/smartfrog/services/database/core/JdbcBindingImpl.java 2006-11-29 16:41:49 UTC (rev 3675) @@ -22,6 +22,8 @@ import org.smartfrog.sfcore.common.SmartFrogDeploymentException; import org.smartfrog.sfcore.common.SmartFrogException; +import org.smartfrog.sfcore.common.SmartFrogLogException; +import org.smartfrog.sfcore.common.SmartFrogResolutionException; import org.smartfrog.sfcore.logging.Log; import org.smartfrog.sfcore.logging.LogFactory; import org.smartfrog.sfcore.prim.PrimImpl; @@ -63,11 +65,21 @@ public synchronized void sfStart() throws SmartFrogException, RemoteException { super.sfStart(); - Log log = LogFactory.getLog(this); + bindToDatabaseProperties(); + } + + /** + * Startup time binding to the database + * @throws SmartFrogResolutionException + * @throws RemoteException + * @throws SmartFrogDeploymentException + */ + protected void bindToDatabaseProperties() + throws SmartFrogResolutionException, RemoteException, SmartFrogDeploymentException { ComponentHelper helper = new ComponentHelper(this); driver = sfResolve(ATTR_DRIVER, "", false); - url = sfResolve(ATTR_USERNAME, "", true); + url = sfResolve(ATTR_URL, "", true); user = sfResolve(ATTR_USERNAME, "", false); password = sfResolve(ATTR_PASSWORD, "", false); properties = sfResolve(ATTR_PROPERTIES, (Vector) null, false); @@ -75,6 +87,7 @@ if (driver != null) { helper.loadClass(driver); } + sfLog().info("Binding to "+url+" with driver "+driver+" as "+user); connectionProperties = new Properties(); if (user != null) { Modified: trunk/core/components/database/src/org/smartfrog/services/database/core/JdbcOperationImpl.java =================================================================== --- trunk/core/components/database/src/org/smartfrog/services/database/core/JdbcOperationImpl.java 2006-11-29 16:40:26 UTC (rev 3674) +++ trunk/core/components/database/src/org/smartfrog/services/database/core/JdbcOperationImpl.java 2006-11-29 16:41:49 UTC (rev 3675) @@ -27,6 +27,7 @@ import org.smartfrog.sfcore.logging.LogFactory; import org.smartfrog.sfcore.prim.PrimImpl; import org.smartfrog.sfcore.prim.TerminationRecord; +import org.smartfrog.sfcore.prim.Prim; import org.smartfrog.sfcore.utils.ComponentHelper; import java.rmi.RemoteException; @@ -69,7 +70,7 @@ super.sfStart(); log = LogFactory.getLog(this); helper = new ComponentHelper(this); - database = (JdbcBinding) sfResolve(ATTR_DATABASE, database, true); + database = (JdbcBinding) sfResolve(ATTR_DATABASE, (Prim)null, true); autocommit = sfResolve(ATTR_AUTOCOMMIT, autocommit, true); } @@ -79,8 +80,9 @@ * jdbc options. * * @return a new database connection - * * @throws SmartFrogDeploymentException + * @throws SmartFrogResolutionException + * @throws RemoteException */ protected Connection connect() throws SmartFrogDeploymentException, @@ -101,14 +103,14 @@ throw new SmartFrogDeploymentException("Failed to load " + dbinfo); } } catch (SQLException e) { - throw translate("Exception when load " + dbinfo, e); + throw translate("Exception when loading " + dbinfo, e); } if (autocommit) { try { connection.setAutoCommit(autocommit); } catch (SQLException e) { closeQuietly(connection); - throw translate("setting autocommit flag", e); + throw translate("setting autocommit flag on "+dbinfo, e); } } return connection; @@ -117,8 +119,8 @@ /** * any logic to convert from a SQL exception to a smartfrog one * - * @param operation - * @param fault + * @param operation what was attempted + * @param fault what went wrong * * @return a new exception to throw. */ @@ -150,8 +152,7 @@ } /** - * Gets an instance of the required driver. Uses the ant class loader and - * the optionally the provided classpath. + * Gets an instance of the required driver. * @param driver the driver classname * @return the driver instance * @throws SmartFrogDeploymentException to wrap failures to create an instance @@ -206,7 +207,7 @@ * @throws SmartFrogDeploymentException if something went wrong closing the connection * */ - protected void close(Connection connection) throws + protected synchronized void close(Connection connection) throws SmartFrogDeploymentException { try { if (connection != null) { @@ -218,23 +219,23 @@ } /** - * close a connection without throwing any exception, just log it at debug - * level + * close a connection without throwing any exception, just log it. * * @param connection */ protected void closeQuietly(Connection connection) { try { - if (connection != null) { - connection.close(); - } - } catch (SQLException e) { + close(connection); + } catch (SmartFrogDeploymentException e) { log.error("Exception when closing the connection ", e); } } /** * check the connection + * @throws SmartFrogDeploymentException if the connection wont start + * @throws SmartFrogResolutionException if there is something wrong with the settings + * @throws RemoteException on network problems */ protected void checkConnection() throws SmartFrogDeploymentException, SmartFrogResolutionException, Added: trunk/core/components/database/src/org/smartfrog/services/database/core/TerminationTransactionImpl.java =================================================================== --- trunk/core/components/database/src/org/smartfrog/services/database/core/TerminationTransactionImpl.java (rev 0) +++ trunk/core/components/database/src/org/smartfrog/services/database/core/TerminationTransactionImpl.java 2006-11-29 16:41:49 UTC (rev 3675) @@ -0,0 +1,86 @@ +/** (C) Copyright 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 + + */ +package org.smartfrog.services.database.core; + +import org.smartfrog.sfcore.common.SmartFrogDeploymentException; +import org.smartfrog.sfcore.common.SmartFrogResolutionException; +import org.smartfrog.sfcore.common.SmartFrogException; +import org.smartfrog.sfcore.prim.TerminationRecord; + +import java.rmi.RemoteException; +import java.sql.Connection; +import java.sql.SQLException; + +/** + * This component subclasses {@link #TransactionImpl()} to run the transactions + * during termination, in the main thread. It does nothing at startup. + * It can be used as a counterpoint to any components that create tables and the like + * created 28-Nov-2006 14:47:56 + */ + +public class TerminationTransactionImpl extends TransactionImpl { + + + public TerminationTransactionImpl() throws RemoteException { + } + + + /** + * do not run any commands on startup + * + * @throws org.smartfrog.sfcore.common.SmartFrogDeploymentException + * for smartfrog problems + * @throws org.smartfrog.sfcore.common.SmartFrogResolutionException + * for smartfrog problems + * @throws java.rmi.RemoteException for network problems. + */ + protected void executeStartupCommands() + throws SmartFrogDeploymentException, SmartFrogResolutionException, RemoteException { + //do nothing + } + + + /** + * shut down the component by running the operations + * + * @param status + */ + protected synchronized void sfTerminateWith(TerminationRecord status) { + super.sfTerminateWith(status); + Throwable caught = null; + Connection connection = null; + try { + connection = connect(); + performOperation(connection); + commitAndClose(connection); + } catch (SQLException e) { + caught = e; + } catch (SmartFrogException e) { + caught = e; + } catch (RemoteException e) { + caught = e; + } finally { + closeQuietly(connection); + } + if(caught!=null) { + sfLog().ignore("Caught while terminating the application",caught); + } + } +} Modified: trunk/core/components/database/src/org/smartfrog/services/database/core/TransactionImpl.java =================================================================== --- trunk/core/components/database/src/org/smartfrog/services/database/core/TransactionImpl.java 2006-11-29 16:40:26 UTC (rev 3674) +++ trunk/core/components/database/src/org/smartfrog/services/database/core/TransactionImpl.java 2006-11-29 16:41:49 UTC (rev 3675) @@ -44,6 +44,7 @@ import org.smartfrog.services.filesystem.FileSystem; import org.smartfrog.sfcore.common.SmartFrogDeploymentException; import org.smartfrog.sfcore.common.SmartFrogException; +import org.smartfrog.sfcore.common.SmartFrogResolutionException; import java.io.BufferedReader; import java.io.File; @@ -72,7 +73,6 @@ public class TransactionImpl extends JdbcOperationImpl implements Transaction { public static final String ERROR_NO_COMMANDS = "No commands declared"; public static final String ERROR_TOO_MANY_COMMANDS = "Too many command attributes"; - private List<String> commands; private boolean escapeProcessing = false; private String delimiter; @@ -87,6 +87,12 @@ public TransactionImpl() throws RemoteException { } + /** + * The startup operation is to read the commands in then execute them by way of {@link #executeStartupCommands()}. + * Subclasses may change this behaviour + * @throws SmartFrogException for smartfrog problems + * @throws RemoteException for network problems. + */ public synchronized void sfStart() throws SmartFrogException, RemoteException { super.sfStart(); @@ -100,6 +106,47 @@ true); printResults = sfResolve(ATTR_PRINTRESULTS, printResults, true); printHeaders = sfResolve(ATTR_PRINTHEADERS, printHeaders, true); + readCommands(); + executeStartupCommands(); + } + + /** + * Execute any commands to run during {@link #sfStart()}. + * This delegates to {@link #startCommandThread()} + * @throws SmartFrogDeploymentException for smartfrog problems + * @throws SmartFrogResolutionException for smartfrog problems + * @throws RemoteException for network problems. + */ + protected void executeStartupCommands() + throws SmartFrogDeploymentException, SmartFrogResolutionException, RemoteException { + startCommandThread(); + } + + /** + * Execute any commands in the {@link #commands} list by starting a separate thread + * @throws SmartFrogDeploymentException for smartfrog problems + * @throws SmartFrogResolutionException for smartfrog problems + * @throws RemoteException for network problems. + */ + protected void startCommandThread() + throws SmartFrogDeploymentException, SmartFrogResolutionException, RemoteException { + if (commands.size() > 0) { + //work to do. check the connection (synchronously), then start the worker + checkConnection(); + startWorkerThread(); + } else { + //no work to do. + getLog().debug("No SQL statements to execute; skipping"); + } + } + + /** + * Read in the commands from file, a resource, the {@link #ATTR_COMMAND} + * string or {@link #ATTR_SQL_COMMANDS} list. + * @throws SmartFrogException for smartfrog problems + * @throws RemoteException for network problems. + */ + protected void readCommands() throws RemoteException, SmartFrogException { int count = 0; String command = sfResolve(ATTR_COMMAND, (String) null, false); if (command != null) { @@ -165,7 +212,7 @@ commands.add(o.toString()); } } else { - //no commands at all. That's not really allowed. + //no commands at all. That's not really allowed. commands = new ArrayList<String>(0); command = ""; } @@ -177,14 +224,6 @@ + " statements, but after parsing, there were " + size + " from \n" + command); } - if (size > 0) { - //work to do. check the connection (synchronously), then start the worker - checkConnection(); - startWorkerThread(); - } else { - //no work to do. - getLog().debug("No SQL statements to execute; skipping"); - } } /** @@ -204,8 +243,8 @@ * Crack the command string into a list of commands (which may be zero), at * every line-ending delimiter. delimiters not at tne d * - * @param sql - * @param commandDelimiter + * @param sql SQL command + * @param commandDelimiter the delimiter for commands. * * @return a (possibly empty) list of commands. * @@ -283,6 +322,9 @@ try { Statement statement = connection.createStatement(); + if(sfLog().isInfoEnabled()) + sfLog().info(command); + statement.setEscapeProcessing(escapeProcessing); boolean hasResultSet; int updateCount; @@ -296,8 +338,9 @@ if (updateCount != -1) { updateCountTotal += updateCount; } + processNoResults(statement); } else { - processResults(resultSet); + processResults(statement, resultSet); } hasResultSet = statement.getMoreResults(); if (hasResultSet) { @@ -331,6 +374,10 @@ } } + protected void processNoResults(Statement statement) { + sfLog().info("--no results--"); + } + /** * Override point, act on the results * @@ -338,7 +385,7 @@ * * @throws SQLException */ - protected void processResults(ResultSet results) + protected void processResults(Statement statement,ResultSet results) throws SQLException { if (printResults) { printResults(results); 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 2006-11-29 16:40:26 UTC (rev 3674) +++ trunk/core/components/database/src/org/smartfrog/services/database/core/components.sf 2006-11-29 16:41:49 UTC (rev 3675) @@ -36,6 +36,9 @@ */ DatabaseBinding extends Prim { sfClass "org.smartfrog.services.database.core.JdbcBindingImpl"; + //this is not exported across processes, as it does VM-specific setup, and + //will in future export non-Remoteable methods for pooling + sfExport false; jdbcBindingSchema extends Schema { //driver classname. No extra loading stuff here other than SF codebase. driver extends OptionalString { @@ -93,6 +96,7 @@ } } autocommit true; + sfShouldTerminate true; } @@ -130,35 +134,40 @@ after the string/file/resource is parsed. If there is a mismatch, an exception is thrown. Omit or use -1 for do not care' #; } - failOnSqlError extends boolean { + failOnSqlError extends Boolean { description "should we fail on an SQL error?"; } - printResults extends boolean { + printResults extends Boolean { description "should the results be printed?"; } - printHeaders extends boolean { + printHeaders extends Boolean { description "should the column headers be printed?"; } } sfClass "org.smartfrog.services.database.core.TransactionImpl"; delimiter ";"; + escapeProcessing false; expectedStatementCount -1; failOnSqlError true; printResults true; printHeaders true; } + /** - * A transaction in a sequence/workflow + * This component runs the SQL commands synchronously during termination. + * It is where to put shutdown operations like "DROP TABLE table1" */ -TransactionWorkflow extends Transaction { - sfTerminate true; +TerminateTransaction extends Transaction { + sfClass "org.smartfrog.services.database.core.TerminationTransactionImpl"; } + /** * make a selection, results go into the results vector as a nested vector, columns becomes the vector of columns */ +/* Selection extends Transaction { selectionSchema extends Schema { minResultSize extends OptionalInteger { @@ -169,23 +178,19 @@ } } } +*/ -/** - * A Selection in a sequence - */ -SelectionWorkflow extends Selection { - sfTerminate true; -} - /** * this is an operation that should succeed * if the database is present */ +/* LivenessTransaction extends Transaction { } +*/ /** @@ -195,6 +200,8 @@ * of results. */ +/* LivenessSelection extends Selection { } +*/ Modified: trunk/core/components/database/src/org/smartfrog/services/database/hsqldb/components.sf =================================================================== --- trunk/core/components/database/src/org/smartfrog/services/database/hsqldb/components.sf 2006-11-29 16:40:26 UTC (rev 3674) +++ trunk/core/components/database/src/org/smartfrog/services/database/hsqldb/components.sf 2006-11-29 16:41:49 UTC (rev 3675) @@ -203,25 +203,35 @@ password ""; } -HsqldbInMemoryBinding extends HsqldbBinding { +HsqldbPrefixedBinding extends HsqldbBinding { + _arg TBD; + _db LAZY _arg; + binding_prefix TBD; + url (binding_prefix ++ LAZY _db); +} + +/** + * the memory binding takes a name + */ +HsqldbInMemoryBinding extends HsqldbPrefixedBinding { database TBD; - url ("jdbc:hsqldb:mem:"++database); + _arg LAZY database; + binding_prefix "jdbc:hsqldb:mem:"; } - /** * the file binding takes a directory */ HsqldbFileBinding extends HsqldbBinding { directory TBD; - file_binding_prefix "jdbc:hsqldb:file:"; - url (file_binding_prefix++directory); + _arg LAZY directory; + binding_prefix "jdbc:hsqldb:file:"; } /** * Shut down the database */ -ShutdownCommand extends TransactionWorkflow { +ShutdownCommand extends Transaction { sqlCommands [ "SHUTDOWN" ]; @@ -231,7 +241,7 @@ /** * Shut down the database and compact it */ -ShutdownAndCompactCommand extends TransactionWorkflow { +ShutdownAndCompactCommand extends Transaction { sqlCommands [ "SHUTDOWN COMPACT" ]; 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 2006-11-29 16:40:26 UTC (rev 3674) +++ trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/components.sf 2006-11-29 16:41:49 UTC (rev 3675) @@ -26,6 +26,7 @@ #include "/org/smartfrog/services/database/core/components.sf" #include "/org/smartfrog/services/assertions/components.sf" #include "/org/smartfrog/sfcore/workflow/combinators/sequence.sf" +#include "/org/smartfrog/sfcore/workflow/combinators/delay.sf" 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 2006-11-29 16:40:26 UTC (rev 3674) +++ trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/hsqldb/TableManipulationTest.sf 2006-11-29 16:41:49 UTC (rev 3675) @@ -2,43 +2,56 @@ #include "/org/smartfrog/services/database/test/system/core/hsqldb/components.sf"; -TableManipulationTest extends DeploySequence { +TableManipulationTest extends TestCompound { - action extends Compound { - db extends TestDB; + action extends TestDB { } tests extends Sequence { - -- extends CreateUser { - database LAZY action:db; - username "newuser"; - password "secret"; + delay extends Delay { + time 5000; } - -- extends CreateEventsTable { - database LAZY action:db; + dropUser1 extends DropUser { + database LAZY ATTRIB action; + username testUser; + failOnSqlError false; } -/* - -- extends TransactionWorkflow { + dropTable1 extends dropTable { + failOnSqlError false; + } + newuser extends CreateUser { + database LAZY PARENT:PARENT:action; + username testUser; + password testPass; } -*/ - -- extends SelectionWorkflow { - database LAZY action:db; + + events extends CreateEventsTable { + database LAZY ATTRIB action; + } + + select extends Transaction { + database LAZY ATTRIB action; sqlCommands [ "SELECT * from events" ]; } - -- extends DropTable { - database LAZY action:db; + dropTable extends DropTable { + database LAZY ATTRIB action; table "events"; } + + dropUser2 extends dropUser1 { + failOnSqlError true; + } + } - } + } sfConfig extends TableManipulationTest { 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 2006-11-29 16:40:26 UTC (rev 3674) +++ trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/hsqldb/components.sf 2006-11-29 16:41:49 UTC (rev 3675) @@ -30,23 +30,23 @@ testUser "testUser"; testPass "secret"; - TestDB extends HsqldbInMemoryBinding { - database "test"; + TestDB extends HsqldbBinding { + url "jdbc:hsqldb:mem:test"; } - TestUserBinding extends testDB { + TestUserBinding extends TestDB { username testUser; password testPass; } - AdminCommand extends TransactionWorkflow { + AdminCommand extends Transaction { database LAZY TestDB; } - UserCommand extends TransactionWorkflow { + UserCommand extends Transaction { database LAZY TestUserBinding; } @@ -57,14 +57,21 @@ username TBD; password TBD; sqlCommands [ - (("CREATE USER "++ username )++(" PASSWORD "++ password)) + (("CREATE USER " ++ username ) ++ (" PASSWORD " ++ password)) ]; } + DropUser extends AdminCommand { + username TBD; + sqlCommands [ + ("DROP USER " ++ username ) + ]; + } + DropTable extends AdminCommand { table TBD; sqlCommands [ - ("DROP TABLE "++ table) + ("DROP TABLE " ++ table) ]; } @@ -82,6 +89,6 @@ EVENT_LASTMODIFIED timestamp, EVENT_TEXT varchar(8192), primary key (EVENT_ID)); - #; - ] + # + ]; } \ No newline at end of file Modified: trunk/core/smartfrog/src/org/smartfrog/services/assertions/TestCompoundImpl.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/assertions/TestCompoundImpl.java 2006-11-29 16:40:26 UTC (rev 3674) +++ trunk/core/smartfrog/src/org/smartfrog/services/assertions/TestCompoundImpl.java 2006-11-29 16:41:49 UTC (rev 3675) @@ -44,7 +44,7 @@ private ComponentDescription tests; private Prim testsPrim; - protected static final String ACTION_RUNNING = "_actionRunning"; + protected static final String ACTION_RUNNING = "action"; protected static final String TESTS_RUNNING = "_testsRunning"; private long undeployAfter; private long testTimeout; @@ -67,6 +67,7 @@ */ public static final String FORCED_TERMINATION = "timed shutdown of test components"; public static final String TEST_FAILED_WRONG_STATUS = "Expected action to terminate with the status "; + protected static final String TEARDOWN_RUNNING = "_teardownRunning"; public TestCompoundImpl() throws RemoteException { } @@ -91,9 +92,9 @@ if (teardownCD != null) { throw new SmartFrogException("Not yet supported " + ATTR_TEARDOWN); } - undeployAfter = sfResolve(ATTR_UNDEPLOY_AFTER, 0L,true); - expectTerminate = sfResolve(ATTR_EXPECT_TERMINATE,false,true); - exitType = sfResolve(ATTR_EXIT_TYPE,exitType,true); + undeployAfter = sfResolve(ATTR_UNDEPLOY_AFTER, 0L, true); + expectTerminate = sfResolve(ATTR_EXPECT_TERMINATE, false, true); + exitType = sfResolve(ATTR_EXIT_TYPE, exitType, true); exitText = sfResolve(ATTR_EXIT_TEXT, exitText, true); } @@ -179,6 +180,10 @@ } } + /** + * When terminating we shutdown the action and the tests + * @param status + */ public synchronized void sfTerminateWith(TerminationRecord status) { super.sfTerminateWith(status); shutdown(actionTerminator); @@ -194,8 +199,8 @@ * @param terminator */ private void shutdown(DelayedTerminator terminator) { - if (terminator !=null) { - terminator.shutdown(false); + if (terminator != null) { + terminator.shutdown(false); } } @@ -211,15 +216,15 @@ * Always return false if you start new components from this method! * </p> * - * @param status exit record of the component - * @param comp child component that is terminating + * @param childStatus exit record of the component + * @param child child component that is terminating * @return true if the termination event is to be forwarded up the chain. */ - protected boolean onChildTerminated(TerminationRecord status, Prim comp) { + protected boolean onChildTerminated(TerminationRecord childStatus, Prim child) { boolean terminate =true; boolean tearDownTime=false; TerminationRecord error=null; - if (actionPrim == comp) { + if (actionPrim == child) { if (actionTerminator.isForcedShutdown() && expectTerminate == false) { //this is a forced shutdown, all is well sfLog().info("Graceful shutdown of test components"); @@ -227,12 +232,12 @@ //not a forced shutdown, so why did it die? boolean expected = false; //act on whether or not a fault was expected. - if (status.errorType.indexOf(exitType) >= 0) { + if (childStatus.errorType.indexOf(exitType) >= 0) { //we have a match sfLog().debug("Exit type is as expected"); expected = true; if (exitText != null) { - String description = status.description; + String description = childStatus.description; if (description == null) { description = ""; } @@ -251,20 +256,20 @@ if (!expected) { String errorText = TEST_FAILED_WRONG_STATUS + exitType + "\n" + "and error text " + exitText + "\n" - + "but got " + status; + + "but got " + childStatus; sfLog().error(errorText); - error = TerminationRecord.abnormal(errorText, status.id); + error = TerminationRecord.abnormal(errorText, childStatus.id); //propagate any exception - error.cause=status.cause; + error.cause=childStatus.cause; } } tearDownTime=true; - } else if(comp == testsPrim) { + } else if(child == testsPrim) { //tests are terminating. //it is an error if these terminated abnormally, for any reason at all. //that is: test failure triggers an undeployment. //There is no need to check this, because its implicit. - if(!status.isNormal()) { + if(!childStatus.isNormal()) { sfLog().info("Tests have failed"); } tearDownTime=true; @@ -274,7 +279,8 @@ //kicks in on normal abnormal ter if(tearDownTime && teardownCD!=null) { try { - sfCreateNewChild(name + "_teardownRunning", teardownCD, null); + sfLog().debug("Starting teardown component"); + sfCreateNewChild(TEARDOWN_RUNNING, teardownCD, null); terminate = false; } catch (Exception e) { error = TerminationRecord.abnormal("failed to start teardown", @@ -283,29 +289,29 @@ } synchronized (this) { //update internal data structures - this.finished = true; + finished = true; if (error != null) { - this.status = error; - this.failed = true; - this.succeeded = false; + status = error; + failed = true; + succeeded = false; } else { - this.status = status; - this.failed = false; - this.succeeded = true; + status = childStatus; + failed = false; + succeeded = true; } } //if the error record is non null, terminate ourselves with the new record if (error != null) { - this.status=error; - this.failed=true; + status=error; + failed=true; sfTerminate(error); //dont forward, as we are terminating with an error terminate = false; } else { - this.status = status; - this.finished=true; - this.succeeded=true; + status = childStatus; + finished=true; + succeeded=true; } //trigger termination. return terminate; Added: trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/delay/testDelayNoAction.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/delay/testDelayNoAction.sf (rev 0) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/delay/testDelayNoAction.sf 2006-11-29 16:41:49 UTC (rev 3675) @@ -0,0 +1,33 @@ +/** (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/sfcore/workflow/combinators/delay.sf" +#include "/org/smartfrog/services/assertions/components.sf" +#include "/org/smartfrog/test/system/assertions/components.sf" + +/** + * test that a delay with no action is simply a sleep + */ + +sfConfig extends TestBlock { + action extends Delay { + delay 200; + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |