From: <aft...@us...> - 2008-07-31 14:52:10
|
Revision: 6855 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=6855&view=rev Author: aftereight Date: 2008-07-31 14:52:01 +0000 (Thu, 31 Jul 2008) Log Message: ----------- SFOS-928 Test case added Modified Paths: -------------- trunk/core/smartfrog/src/org/smartfrog/services/filesystem/files/Fileset.java trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/files/FilesCompoundTest.java trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/files/components.sf Added Paths: ----------- trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/files/testRuntimeAddedAttributes.sf Modified: trunk/core/smartfrog/src/org/smartfrog/services/filesystem/files/Fileset.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/filesystem/files/Fileset.java 2008-07-30 21:42:21 UTC (rev 6854) +++ trunk/core/smartfrog/src/org/smartfrog/services/filesystem/files/Fileset.java 2008-07-31 14:52:01 UTC (rev 6855) @@ -246,7 +246,7 @@ * @return String list of files separated by the platform's path separator. */ public String toString() { - String fileSetString = java.util.Arrays.toString(listFiles()); + String fileSetString = Arrays.toString(listFiles()); fileSetString = fileSetString.substring(1,fileSetString.length()-1); fileSetString = fileSetString.replace(", ",System.getProperty("path.separator")); return (fileSetString); Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/files/FilesCompoundTest.java =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/files/FilesCompoundTest.java 2008-07-30 21:42:21 UTC (rev 6854) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/files/FilesCompoundTest.java 2008-07-31 14:52:01 UTC (rev 6855) @@ -56,4 +56,8 @@ public void testFilesDuplicatesDropped() throws Throwable { expectSuccessfulTestRun(FILES, "testFilesDuplicatesDropped"); } + + public void testRuntimeAddedAttributes() throws Throwable { + expectSuccessfulTestRun(FILES, "testRuntimeAddedAttributes"); + } } Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/files/components.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/files/components.sf 2008-07-30 21:42:21 UTC (rev 6854) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/files/components.sf 2008-07-31 14:52:01 UTC (rev 6855) @@ -146,3 +146,37 @@ fileCount 1; } } + +testRuntimeAddedAttributes extends FilesTest { + action extends Compound { + dirs extends BuildTestDirs; + + txtFiles extends Files { + dir LAZY dirs:mkdir1; + pattern ".*\\.txt"; + } + + checkFileList0 extends Assert { + reference LAZY txtFiles; + attribute "fileList"; + attributeVectorValue "1.txt"; + attributeVectorIndex 0; + } + + checkFileList1 extends Assert { + reference LAZY txtFiles; + attribute "fileList"; + attributeVectorValue "2.txt"; + attributeVectorIndex 1; + } + + checkFileSetString extends Assert { + ps PROPERTY path.separator; + + reference LAZY txtFiles; + value ("1.txt" ++ ps ++ "2.txt"); + } + + // TODO: check fileSet too + } +} Added: trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/files/testRuntimeAddedAttributes.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/files/testRuntimeAddedAttributes.sf (rev 0) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/files/testRuntimeAddedAttributes.sf 2008-07-31 14:52:01 UTC (rev 6855) @@ -0,0 +1,24 @@ +/* (C) Copyright 2008 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/filesystem/files/components.sf" + +sfConfig extends testRuntimeAddedAttributes { + +} \ 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...> - 2008-08-05 12:46:35
|
Revision: 6878 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=6878&view=rev Author: steve_l Date: 2008-08-05 12:46:30 +0000 (Tue, 05 Aug 2008) Log Message: ----------- SFOS-937 ListUtils tuple methods shoud use <?> as a type instead of <Object> Modified Paths: -------------- trunk/core/components/ec2/src/org/smartfrog/services/restlet/client/RemoteRestletResourceImpl.java trunk/core/smartfrog/src/org/smartfrog/sfcore/utils/ListUtils.java Modified: trunk/core/components/ec2/src/org/smartfrog/services/restlet/client/RemoteRestletResourceImpl.java =================================================================== --- trunk/core/components/ec2/src/org/smartfrog/services/restlet/client/RemoteRestletResourceImpl.java 2008-08-05 10:28:15 UTC (rev 6877) +++ trunk/core/components/ec2/src/org/smartfrog/services/restlet/client/RemoteRestletResourceImpl.java 2008-08-05 12:46:30 UTC (rev 6878) @@ -68,7 +68,7 @@ public static final String ATTR_DATASOURCE = "datasource"; public static final String ERROR_DIFFERENT_JVM = "Cannot access data from a data source in a different JVM"; - private Vector<Vector<Object>> startActions, terminateActions, livenessActions; + private Vector<Vector<?>> startActions, terminateActions, livenessActions; private LogSF log; private int readTimeout; @@ -443,12 +443,12 @@ * @throws SmartFrogException for anything not working * @throws RestletOperationException for an exception happening in this library */ - protected void execute(Vector<Vector<Object>> operations) + protected void execute(Vector<Vector<?>> operations) throws RemoteException, SmartFrogException { if (operations == null) { return; } - for (Vector<Object> operation : operations) { + for (Vector<?> operation : operations) { String verb = operation.get(0).toString(); int minResponse = (Integer) operation.get(1); int maxResponse = (Integer) operation.get(2); Modified: trunk/core/smartfrog/src/org/smartfrog/sfcore/utils/ListUtils.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/sfcore/utils/ListUtils.java 2008-08-05 10:28:15 UTC (rev 6877) +++ trunk/core/smartfrog/src/org/smartfrog/sfcore/utils/ListUtils.java 2008-08-05 12:46:30 UTC (rev 6878) @@ -236,7 +236,7 @@ * @throws RemoteException network problems */ @SuppressWarnings("unchecked") - public static Vector<Vector<Object>> resolveNTupleList(Prim component, Reference ref, int width, boolean required) + public static Vector<Vector<?>> resolveNTupleList(Prim component, Reference ref, int width, boolean required) throws SmartFrogResolutionException, RemoteException { Vector tupleList = null; tupleList = component.sfResolve(ref, tupleList, required); @@ -253,7 +253,7 @@ null, component); } - Vector entry = (Vector) element; + Vector<?> entry = (Vector<?>) element; if (width>=0 && entry.size() != width) { throw new SmartFrogResolutionException( ref, null, @@ -283,12 +283,12 @@ */ public static Vector<Vector<String>> resolveStringNTupleList(Prim component, Reference ref, int width, boolean required) throws SmartFrogResolutionException, RemoteException { - Vector<Vector<Object>> tupleList = resolveNTupleList(component, ref, width, required); + Vector<Vector<?>> tupleList = resolveNTupleList(component, ref, width, required); if (tupleList == null) { return null; } Vector<Vector<String>> result = new Vector<Vector<String>>(tupleList.size()); - for (Vector<Object> tuple : tupleList) { + for (Vector<?> tuple : tupleList) { Vector<String> row=new Vector<String>(tuple.size()); for(Object field:tuple) { row.add(field.toString()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-08-21 16:56:14
|
Revision: 6983 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=6983&view=rev Author: steve_l Date: 2008-08-21 16:56:10 +0000 (Thu, 21 Aug 2008) Log Message: ----------- SFOS-963 add a SecurityProperties component to set JVM security properties Modified Paths: -------------- trunk/core/smartfrog/src/org/smartfrog/services/utils/setproperty/PropertiesUtils.java trunk/core/smartfrog/src/org/smartfrog/services/utils/setproperty/SystemProperties.java trunk/core/smartfrog/src/org/smartfrog/services/utils/setproperty/SystemPropertiesImpl.java trunk/core/smartfrog/src/org/smartfrog/services/utils/setproperty/components.sf trunk/core/smartfrog/src/org/smartfrog/services/utils/setproperty/sysprops.sf trunk/core/testharness/testcases/org/smartfrog/test/system/properties/components.sf Added Paths: ----------- trunk/core/smartfrog/src/org/smartfrog/services/utils/setproperty/SecurityPropertiesImpl.java trunk/core/testharness/testcases/org/smartfrog/test/system/properties/SecurityPropertiesTest.java trunk/core/testharness/testcases/org/smartfrog/test/system/properties/testSecurityPropertiesSet.sf Modified: trunk/core/smartfrog/src/org/smartfrog/services/utils/setproperty/PropertiesUtils.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/utils/setproperty/PropertiesUtils.java 2008-08-21 16:49:34 UTC (rev 6982) +++ trunk/core/smartfrog/src/org/smartfrog/services/utils/setproperty/PropertiesUtils.java 2008-08-21 16:56:10 UTC (rev 6983) @@ -48,7 +48,7 @@ */ public static Properties build(ComponentDescription cd) throws SmartFrogResolutionException { Properties props = new Properties(); - Iterator<Object> attrs = cd.sfAttributes(); + Iterator<?> attrs = cd.sfAttributes(); while (attrs.hasNext()) { Object attr = attrs.next(); String key = attr.toString(); Added: trunk/core/smartfrog/src/org/smartfrog/services/utils/setproperty/SecurityPropertiesImpl.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/utils/setproperty/SecurityPropertiesImpl.java (rev 0) +++ trunk/core/smartfrog/src/org/smartfrog/services/utils/setproperty/SecurityPropertiesImpl.java 2008-08-21 16:56:10 UTC (rev 6983) @@ -0,0 +1,62 @@ +/* (C) Copyright 2008 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.utils.setproperty; + +import org.smartfrog.sfcore.common.SmartFrogException; + +import java.rmi.RemoteException; + +/** + * A component that sets security properties in the local JVM. + * + * Security properties are set with java.security.Security.setProperty + * and cannot be unset. + */ + +public class SecurityPropertiesImpl extends SystemPropertiesImpl implements SystemProperties { + + public SecurityPropertiesImpl() throws RemoteException { + } + + /** + * Override point, set a single property. + * + * @param name property name + * @param value value + * @throws SmartFrogException for smartfrog problems + * @throws SecurityException if need be + */ + @Override + protected void innerSetProperty(String name, String value) throws SmartFrogException { + java.security.Security.setProperty(name,value); + } + + /** + * Unset a property + * + * @param name property name + * @throws SmartFrogException for smartfrog problems + * @throws SecurityException if need be + */ + @Override + protected void innerUnsetProperty(String name) throws SmartFrogException { + //do nothing + } +} Modified: trunk/core/smartfrog/src/org/smartfrog/services/utils/setproperty/SystemProperties.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/utils/setproperty/SystemProperties.java 2008-08-21 16:49:34 UTC (rev 6982) +++ trunk/core/smartfrog/src/org/smartfrog/services/utils/setproperty/SystemProperties.java 2008-08-21 16:56:10 UTC (rev 6983) @@ -15,6 +15,7 @@ String ATTR_SETONDEPLOY = "setOnDeploy"; String ATTR_SETONEARLYDEPLOY = "setOnEarlyDeploy"; String ATTR_UNSETONTERMINATE = "unsetOnTerminate"; + String ATTR_IGNORESECURITYEXCEPTIONS = "ignoreSecurityExceptions"; /** * Set a property in this JVM Modified: trunk/core/smartfrog/src/org/smartfrog/services/utils/setproperty/SystemPropertiesImpl.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/utils/setproperty/SystemPropertiesImpl.java 2008-08-21 16:49:34 UTC (rev 6982) +++ trunk/core/smartfrog/src/org/smartfrog/services/utils/setproperty/SystemPropertiesImpl.java 2008-08-21 16:56:10 UTC (rev 6983) @@ -24,7 +24,7 @@ import org.smartfrog.sfcore.common.SmartFrogContextException; import org.smartfrog.sfcore.common.SmartFrogDeploymentException; import org.smartfrog.sfcore.common.SmartFrogException; -import org.smartfrog.sfcore.logging.Log; +import org.smartfrog.sfcore.logging.LogSF; import org.smartfrog.sfcore.prim.Prim; import org.smartfrog.sfcore.prim.PrimImpl; import org.smartfrog.sfcore.prim.TerminationRecord; @@ -35,7 +35,6 @@ import java.rmi.RemoteException; import java.util.Enumeration; import java.util.Properties; -import java.util.Vector; /** * Implement our JVM manipulator @@ -47,7 +46,8 @@ private boolean setOnDeploy = false; private boolean setOnEarlyDeploy = false; private boolean unsetOnTerminate = true; - private Log log; + private boolean ignoreSecurityExceptions = false; + private LogSF log; private static final Reference REF_PROPERTIES = new Reference(ATTR_PROPERTIES); /** @@ -72,6 +72,7 @@ sfContext = cxt; log = sfGetApplicationLog(); setOnEarlyDeploy = resolveBool(cxt, ATTR_SETONEARLYDEPLOY); + ignoreSecurityExceptions = resolveBool(cxt, ATTR_IGNORESECURITYEXCEPTIONS); if (setOnEarlyDeploy) { loadAndSetProperties(); } @@ -206,13 +207,28 @@ String action = "setting " + name + " to " + value; try { sfLog().info(action); - System.setProperty(name, value); + innerSetProperty(name, value); } catch (SecurityException e) { - throw SmartFrogException.forward(action, e); + if(!ignoreSecurityExceptions) { + throw SmartFrogException.forward(action, e); + } else { + log.ignore(action,e); + } } } /** + * Override point, set a single property. + * @param name property name + * @param value value + * @throws SmartFrogException for smartfrog problems + * @throws SecurityException if need be + */ + protected void innerSetProperty(String name, String value) throws SmartFrogException { + System.setProperty(name, value); + } + + /** * Unset a property in this JVM * * @param name name of the property @@ -220,10 +236,26 @@ */ public void unsetProperty(String name) throws SmartFrogException { + String action = "clearing " + name; + sfLog().debug(action); try { - System.clearProperty(name); + innerUnsetProperty(name); } catch (SecurityException e) { - throw SmartFrogException.forward("Failed to clear property " + name, e); + if (!ignoreSecurityExceptions) { + throw SmartFrogException.forward("Failed to clear" + name, e); + } else { + log.ignore(action, e); + } } } + + /** + * Unset a property + * @param name property name + * @throws SmartFrogException for smartfrog problems + * @throws SecurityException if need be + */ + protected void innerUnsetProperty(String name) throws SmartFrogException { + System.clearProperty(name); + } } Modified: trunk/core/smartfrog/src/org/smartfrog/services/utils/setproperty/components.sf =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/utils/setproperty/components.sf 2008-08-21 16:49:34 UTC (rev 6982) +++ trunk/core/smartfrog/src/org/smartfrog/services/utils/setproperty/components.sf 2008-08-21 16:56:10 UTC (rev 6983) @@ -31,7 +31,7 @@ SetPropertySchema extends Schema { name extends String {description "java system property name";} value extends Compulsory {description "java system property value";} - replace_old_value extends OptionalBoolean {description "Replace an exising value or append to it?";} + replace_old_value extends OptionalBoolean {description "Replace an existing value or append to it?";} } SetProperty extends WorkflowPrim { Modified: trunk/core/smartfrog/src/org/smartfrog/services/utils/setproperty/sysprops.sf =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/utils/setproperty/sysprops.sf 2008-08-21 16:49:34 UTC (rev 6982) +++ trunk/core/smartfrog/src/org/smartfrog/services/utils/setproperty/sysprops.sf 2008-08-21 16:56:10 UTC (rev 6983) @@ -47,9 +47,12 @@ } unsetOnTerminate extends Boolean { - description "should these properties be unset during termination (Java1.5 only)"; + description "should these properties be unset during termination"; } + ignoreSecurityExceptions extends Boolean { + description "should security exceptions be ignored?"; + } } @@ -61,4 +64,18 @@ setOnEarlyDeploy false; setOnDeploy true; unsetOnTerminate true; + ignoreSecurityExceptions false; +} + +/** + * A component that sets security properties in the local JVM. + * + * Security properties are set with java.security.Security.setProperty + * and cannot be unset. + */ +SecurityProperties extends SystemProperties { + + sfClass "org.smartfrog.services.utils.setproperty.SecurityPropertiesImpl"; + //this is a no-op anyway + unsetOnTerminate false; } \ No newline at end of file Copied: trunk/core/testharness/testcases/org/smartfrog/test/system/properties/SecurityPropertiesTest.java (from rev 6970, trunk/core/testharness/testcases/org/smartfrog/test/system/properties/PropertiesTest.java) =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/properties/SecurityPropertiesTest.java (rev 0) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/properties/SecurityPropertiesTest.java 2008-08-21 16:56:10 UTC (rev 6983) @@ -0,0 +1,47 @@ +/* (C) Copyright 2008 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.properties; + +import org.smartfrog.test.DeployingTestBase; + +/** + * + * Created 07-Mar-2008 15:01:47 + * + */ + +public class SecurityPropertiesTest extends DeployingTestBase { + + public static final String FILES="org/smartfrog/test/system/properties"; + + public SecurityPropertiesTest(String name) { + super(name); + } + + /** + * test case + * @throws Throwable on failure + */ + public void testSecurityPropertiesSet() throws Throwable { + expectSuccessfulTestRun(FILES,"testSecurityPropertiesSet"); + } + + +} \ No newline at end of file Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/properties/components.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/properties/components.sf 2008-08-21 16:49:34 UTC (rev 6982) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/properties/components.sf 2008-08-21 16:56:10 UTC (rev 6983) @@ -40,6 +40,17 @@ sfShouldTerminate true; } +securityprops extends SecurityProperties { + properties [ + [ key1, value1 ], + [ key2, value2 ] + ] +} + +workflowsecurityprops extends securityprops { + sfShouldTerminate true; +} + AssertPropertySet extends EvaluateCondition { sfShouldTerminate true; property TBD; @@ -159,3 +170,22 @@ } } + +testSecurityPropertiesSet extends ExpectDeploy { + description "try setting security properties"; + + action securityprops; + + tests extends Sequence{ + checkKey1 extends workflowAssert { + equalsString1 ""; + equalsString2 LAZY OPTIONAL("") PROPERTY key.1; + } + + checkKey2 extends workflowAssert { + equalsString1 ""; + equalsString2 LAZY OPTIONAL("") PROPERTY key.2; + } + + } +} \ No newline at end of file Copied: trunk/core/testharness/testcases/org/smartfrog/test/system/properties/testSecurityPropertiesSet.sf (from rev 6970, trunk/core/testharness/testcases/org/smartfrog/test/system/properties/testSetOnDeploy.sf) =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/properties/testSecurityPropertiesSet.sf (rev 0) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/properties/testSecurityPropertiesSet.sf 2008-08-21 16:56:10 UTC (rev 6983) @@ -0,0 +1,24 @@ +/* (C) Copyright 2008 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/properties/components.sf" + +sfConfig extends testSecurityPropertiesSet { + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hel...@us...> - 2008-09-03 14:07:21
|
Revision: 7017 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7017&view=rev Author: helgemahrt Date: 2008-09-03 14:07:12 +0000 (Wed, 03 Sep 2008) Log Message: ----------- SFOS-883 Modified Paths: -------------- trunk/core/components/xmpp/src/org/smartfrog/services/xmpp/MonitoringConstants.java trunk/core/extras/VAST/build.xml trunk/core/extras/VAST/setup.xml trunk/core/extras/VAST/src/org/smartfrog/vast/testing/start.sfcd trunk/core/extras/VAST/src/org/smartfrog/vast/testing/startController.sf Removed Paths: ------------- trunk/core/extras/VAST/boot/dist/bin/sfDaemon Modified: trunk/core/components/xmpp/src/org/smartfrog/services/xmpp/MonitoringConstants.java =================================================================== --- trunk/core/components/xmpp/src/org/smartfrog/services/xmpp/MonitoringConstants.java 2008-09-03 14:04:11 UTC (rev 7016) +++ trunk/core/components/xmpp/src/org/smartfrog/services/xmpp/MonitoringConstants.java 2008-09-03 14:07:12 UTC (rev 7017) @@ -28,10 +28,14 @@ public static final int MODULE_VANISH = 3; public static final int MODULE_INFO = 4; - // message types for vm events + // message type for vm events public static final int VM_MESSAGE = 10; - public static final int HOST_VANISH = 100; + // message types for vast + public static final int VAST_START = 20; + public static final int VAST_STOP = 21; + + public static final int HOST_VANISH = 100; public static final int HOST_SHUTTING_DOWN = 101; public static final int HOST_STARTED = 102; } \ No newline at end of file Deleted: trunk/core/extras/VAST/boot/dist/bin/sfDaemon =================================================================== --- trunk/core/extras/VAST/boot/dist/bin/sfDaemon 2008-09-03 14:04:11 UTC (rev 7016) +++ trunk/core/extras/VAST/boot/dist/bin/sfDaemon 2008-09-03 14:07:12 UTC (rev 7017) @@ -1,69 +0,0 @@ -#!/bin/sh -if [ -z "$SFHOME" -o ! -d "$SFHOME" ] ; then - #echo "$0" - SFHOME=`dirname "$0"`/.. - SFHOME=`cd "$SFHOME" && pwd` - export SFHOME; - echo SFHOME undefined, using $SFHOME as base directory; -fi - - -. "$SFHOME/bin/setSFProperties" - -#if test "$SFDEFAULTSF"; -#then -# export SFCMDPARAMETERS="$SFCMDPARAMETERS $SFDEFAULTSF" -#fi - - -#if test "$SFRMIHOSTNAME"; -#then -# export SFCMDPARAMETERS="$SFCMDPARAMETERS $SFRMIHOSTNAME" -#fi - - -#java -Dorg.smartfrog.sfcore.processcompound.sfProcessName=rootProcess "$SFCMDPARAMETERS" org.smartfrog.SFSystem "$@" - -#JVMARGS are passed as args to the java exec -#JVMARGS="$SFDEFAULTINI $SFDEFAULTSF" -JVMARGS="-DAVALANCHE_EVENT_SERVER=$AVALANCHE_EVENT_SERVER" - -#CLASSARGS are appended to java cmd line as class args -CLASSARGS="-f org/smartfrog/vast/testing/start.sfcd" - -#sort cmd line args into JVMARGS or CLASSARGS. -#JVMARGS are declared using -J token -#e.g. -J "-Djava.library.path=/libs -Xmx400M" -#e.g. -J -Djava.library.path=/libs -J -Xmx400M -while [ $# -ge 1 ]; do - case $1 in - -J | -j) shift - JVMARGS="$JVMARGS $1" - ;; - *) CLASSARGS="$CLASSARGS $1" - ;; - esac - shift -done - -#if test "$SFCODEBASE"; then -# JVMARGS="$JVMARGS $SFCODEBASE" -#fi -#if test "$SFSECURITY"; then -# JVMARGS="$JVMARGS $SFSECURITY" -#fi -#CMDLINE="java $JVMARGS -Dorg.smartfrog.sfcore.processcompound.sfProcessName=rootProcess org.smartfrog.SFSystem $CLASSARGS" -#echo $CMDLINE -#$CMDLINE - -# For JMX remote agent add: -Dcom.sun.management.jmxremote -if test "$SFCODEBASE" && ! test "$SFSECURITY"; then - CMDLINE="java $JVMARGS $SFDEFAULTINI $SFDEFAULTSF $SFRMIHOSTNAME $SFCODEBASE -Dorg.smartfrog.sfcore.processcompound.sfProcessName=rootProcess org.smartfrog.SFSystem $CLASSARGS" -elif test "$SFSECURITY" && ! test "$SFCODEBASE"; then - CMDLINE="java $JVMARGS $SFDEFAULTINI $SFDEFAULTSF $SFRMIHOSTNAME $SFSECURITY -Dorg.smartfrog.sfcore.processcompound.sfProcessName=rootProcess org.smartfrog.SFSystem $CLASSARGS" -elif test "$SFCODEBASE" && test "$SFSECURITY"; then - CMDLINE="java $JVMARGS $SFDEFAULTINI $SFDEFAULTSF $SFRMIHOSTNAME $SFCODEBASE $SFSECURITY -Dorg.smartfrog.sfcore.processcompound.sfProcessName=rootProcess org.smartfrog.SFSystem $CLASSARGS" -else - CMDLINE="java $JVMARGS $SFDEFAULTINI $SFDEFAULTSF $SFDEFAULTSECURITY $SFRMIHOSTNAME -Dorg.smartfrog.sfcore.processcompound.sfProcessName=rootProcess org.smartfrog.SFSystem $CLASSARGS" -fi -$CMDLINE Modified: trunk/core/extras/VAST/build.xml =================================================================== --- trunk/core/extras/VAST/build.xml 2008-09-03 14:04:11 UTC (rev 7016) +++ trunk/core/extras/VAST/build.xml 2008-09-03 14:07:12 UTC (rev 7017) @@ -52,7 +52,7 @@ </jar> </target> - <target name="allJars" depends="helperJar,controllerJar,architectureJar,runnerJar"/> + <target name="allJars" depends="setup-library,helperJar,controllerJar,architectureJar,runnerJar"/> <target name="architectureJar"> <jar jarfile="${dist.dir}/lib/vast-arch.jar" basedir="${build.classes.dir}" @@ -60,20 +60,31 @@ </target> <target name="controllerJar"> - <copy tofile="${build.classes.dir}/org/smartfrog/vast/testing/start.sf" file="${vast.code.dir}/testing/startController.sf" + <copy tofile="${build.classes.dir}/org/smartfrog/vast/testing/start.sf" + file="${vast.code.dir}/testing/startController.sf" overwrite="true"/> <jar jarfile="${dist.dir}/lib/vast-controller.jar" basedir="${build.classes.dir}" - includes="**/controller/**,**/networking/**,**/testing/start.sfcd,**/testing/start.sf" update="yes"/> + includes="**/controller/**,**/archive/**,**/networking/**,**/testing/start.sf,**/testing/VastSchema.sf,**/helper/**,**/shared/**" + update="yes"/> <delete file="${build.classes.dir}/org/smartfrog/vast/testing/start.sf"/> </target> <target name="runnerJar"> - <copy tofile="${build.classes.dir}/org/smartfrog/vast/testing/start.sf" file="${vast.code.dir}/testing/startRunner.sf" + <copy tofile="${build.classes.dir}/org/smartfrog/vast/testing/start.sf" + file="${vast.code.dir}/testing/startRunner.sf" overwrite="true"/> <jar jarfile="${dist.dir}/lib/vast-runner.jar" basedir="${build.classes.dir}" - includes="**/runner/**,**/archive/**,**/networking/**,**/testing/start.sfcd,**/testing/start.sf" + includes="**/runner/**,**/archive/**,**/networking/**,**/testing/start.sf,**/testing/VastSchema.sf,**/helper/**,**/shared/**" update="yes"/> <delete file="${build.classes.dir}/org/smartfrog/vast/testing/start.sf"/> </target> + <target name="setup-library" depends="ivy-retrieve"> + <property name="dist.dependencies.dir" location="${dist.dir}/dependencies"/> + <mkdir dir="${dist.dependencies.dir}"/> + <copy todir="${dist.dependencies.dir}"> + <fileset dir="${ivy.lib.dir}/default" includes="*.jar"/> + </copy> + </target> + </project> Modified: trunk/core/extras/VAST/setup.xml =================================================================== --- trunk/core/extras/VAST/setup.xml 2008-09-03 14:04:11 UTC (rev 7016) +++ trunk/core/extras/VAST/setup.xml 2008-09-03 14:07:12 UTC (rev 7017) @@ -10,7 +10,7 @@ <property name="smartfrog.home" location="${root.dir}/smartfrog/"/> <property name="avalanche.core.dir" value="../avalanche/AvalancheCore"/> <property name="avalanche.setup.file" value="${avalanche.core.dir}/setup.xml"/> - <property name="avalanche.home" value="../avalanche/server"/> + <property name="avalanche.home" value="C:\VAST"/> <property name="vast.home" value="${avalanche.home}/temp/vast"/> <property name="helper.jar.name" value="helper.jar"/> <property name="vast.ignition.template" value="sfinstaller.vm"/> @@ -26,7 +26,7 @@ <!-- copy the helper to the distribution package --> <copy todir="${avalanche.home}/temp/smartfrog/dist/vast" file="dist/helper/${helper.jar.name}"/> - + <!-- copy the vast library to the avalancher server sf daemon --> <copy todir="${avalanche.home}/smartfrog/dist/lib" file="dist/lib/vast-arch.jar"/> @@ -35,17 +35,24 @@ <fileset dir="${smartfrog.home}/dist" excludes="**/docs/**,**/src/**,**/testCA/**,src.zip"/> </copy> - <!-- overwrite the sfDaemon file --> - <copy todir="${vast.home}/smartfrog/dist" overwrite="true"> - <fileset dir="boot/dist" includes="**/*"/> + <!-- add additional libraries --> + <copy todir="${vast.home}/smartfrog/dist/lib"> + <fileset dir="dist/dependencies"> + <include name="ant*.jar"/> + <include name="sf-xmpp*.jar"/> + <include name="sf-avalanche-core*.jar"/> + <include name="sf-quartz*.jar"/> + <include name="sf-vmware*.jar"/> + <include name="smack*.jar"/> + </fileset> </copy> <!-- copy the ignition template file --> <copy todir="${vast.home}" file="boot/${vast.ignition.template}"/> - <!-- copy the SUT packages --> + <!-- copy the SUT folders --> <copy todir="${vast.home}/SUT"> - <fileset dir="SUT" includes="*"/> + <fileset dir="SUT" includes="**/*"/> </copy> <!-- make the SUT dir in the distribution package folder --> Modified: trunk/core/extras/VAST/src/org/smartfrog/vast/testing/start.sfcd =================================================================== --- trunk/core/extras/VAST/src/org/smartfrog/vast/testing/start.sfcd 2008-09-03 14:04:11 UTC (rev 7016) +++ trunk/core/extras/VAST/src/org/smartfrog/vast/testing/start.sfcd 2008-09-03 14:07:12 UTC (rev 7017) @@ -1 +1 @@ -"HOST localhost:rootProcess:vast":DEPLOY:org/smartfrog/vast/testing/start.sf::localhost: \ No newline at end of file +"HOST 192.168.4.2:rootProcess:vast":DEPLOY:org/smartfrog/vast/testing/start.sf::192.168.4.2: \ No newline at end of file Modified: trunk/core/extras/VAST/src/org/smartfrog/vast/testing/startController.sf =================================================================== --- trunk/core/extras/VAST/src/org/smartfrog/vast/testing/startController.sf 2008-09-03 14:04:11 UTC (rev 7016) +++ trunk/core/extras/VAST/src/org/smartfrog/vast/testing/startController.sf 2008-09-03 14:07:12 UTC (rev 7017) @@ -32,4 +32,4 @@ #include "/org/smartfrog/vast/testing/controller/TestController.sf"; -sfConfig extends TestController; \ No newline at end of file +sfConfig extends ControllerNode; \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hel...@us...> - 2008-09-10 17:03:39
|
Revision: 7036 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7036&view=rev Author: helgemahrt Date: 2008-09-10 17:03:34 +0000 (Wed, 10 Sep 2008) Log Message: ----------- SFOS-973 Modified Paths: -------------- trunk/core/components/vmware/src/org/smartfrog/services/vmware/VMWareMessageListener.java trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/BaseCommand.java trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/CommandController.java trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/CreateVirtualMachineCommand.java trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/DispatcherThread.java trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/ExecuteInGuestCommand.java trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/MessageDispatcher.java trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/TimerThread.java trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/EnvironmentConstructorImpl.java trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/VastListener.java trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/VirtualMachineConfig.java trunk/core/extras/VAST/src/org/smartfrog/vast/testing/controller/TestControllerImpl.java trunk/core/extras/VAST/src/org/smartfrog/vast/testing/shared/SUTAttribute.java trunk/core/extras/VAST/src/org/smartfrog/vast/testing/shared/SUTAttributeImpl.java trunk/core/extras/VAST/src/org/smartfrog/vast/testing/shared/statemachine.sf trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/server/ServerSetup.java trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/server/engines/sf/BootStrap.java Added Paths: ----------- trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/MessageQueueItem.java trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/StopVirtualMachineCommand.java Modified: trunk/core/components/vmware/src/org/smartfrog/services/vmware/VMWareMessageListener.java =================================================================== --- trunk/core/components/vmware/src/org/smartfrog/services/vmware/VMWareMessageListener.java 2008-09-10 14:48:19 UTC (rev 7035) +++ trunk/core/components/vmware/src/org/smartfrog/services/vmware/VMWareMessageListener.java 2008-09-10 17:03:34 UTC (rev 7036) @@ -246,8 +246,8 @@ pass = ext.getPropertyBag().get(VMWareConstants.VM_CREATE_PASS); // create a vmware from a master model - response.getPropertyBag().put(VMWareConstants.VMRESPONSE, manager.createCopyOfMaster(master, name, user, pass)); - response.getPropertyBag().put(VMWareConstants.VMNAME, name); + response.getPropertyBag().put(VMWareConstants.VMNAME, name); + response.getPropertyBag().put(VMWareConstants.VMRESPONSE, manager.createCopyOfMaster(master, name, user, pass)); } else if (command.equals(VMWareConstants.VM_CMD_DELETE)) { // delete a vmware Modified: trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/BaseCommand.java =================================================================== --- trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/BaseCommand.java 2008-09-10 14:48:19 UTC (rev 7035) +++ trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/BaseCommand.java 2008-09-10 17:03:34 UTC (rev 7036) @@ -10,11 +10,13 @@ protected MessageDispatcher refMD = null; protected String Command; protected LogSF Log; + protected int TimeOut; protected BaseCommand(MessageDispatcher refMD, String inCmd, LogSF inLog) { this.refMD = refMD; this.Command = inCmd; Log = inLog; + TimeOut = 120 * 1000; } public void handlePacket(VirtualMachineConfig inCfg, XMPPEventExtension inExt) { @@ -28,20 +30,20 @@ } public void execute(VirtualMachineConfig inCfg) { - // send the message - refMD.sendMessage(inCfg.getAffinity(), composeMessage(inCfg)); - // stop the old timer inCfg.stopTimer(); // set the timer - inCfg.setTimer(); + inCfg.setTimer(TimeOut); - // start the timer - inCfg.startTimer(); + // send the message + refMD.sendMessage(inCfg, this); } public void failure(VirtualMachineConfig inCfg) { + // stop timer + inCfg.stopTimer(); + // go to failure inCfg.setCurrentCommand(NextFailure); NextFailure.execute(inCfg); @@ -64,13 +66,21 @@ } public void success(VirtualMachineConfig inCfg) { + // stop timer + inCfg.stopTimer(); + // go to success inCfg.setCurrentCommand(NextSuccess); NextSuccess.execute(inCfg); } public void timeOut(VirtualMachineConfig inCfg) { + Log.info("timeout " + inCfg.getCurrentCommand()); + // retry - this.execute(inCfg); + //this.execute(inCfg); + + // goto failure behaviour + failure(inCfg); } } Modified: trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/CommandController.java =================================================================== --- trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/CommandController.java 2008-09-10 14:48:19 UTC (rev 7035) +++ trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/CommandController.java 2008-09-10 17:03:34 UTC (rev 7036) @@ -10,7 +10,7 @@ import java.util.ArrayList; public class CommandController { - private ArrayList<Command> Commands = new ArrayList<Command>(9); + private ArrayList<Command> Commands = new ArrayList<Command>(10); private ArrayList<VirtualMachineConfig> refVirtualMachines; MessageDispatcher msgDisp; @@ -29,6 +29,7 @@ WaitForToolsCommand wait = new WaitForToolsCommand(msgDisp, inLog); CopyFileFromHostToGuestCommand copy = new CopyFileFromHostToGuestCommand(msgDisp, inLog); ExecuteInGuestCommand exec = new ExecuteInGuestCommand(msgDisp, inLog); + StopVirtualMachineCommand stop = new StopVirtualMachineCommand(msgDisp, inLog); // concatenate them revert.setNextOnSuccess(cred); @@ -41,7 +42,7 @@ delete.setNextOnFailure(create); create.setNextOnSuccess(snapshot); - create.setNextOnFailure(create); + create.setNextOnFailure(delete); snapshot.setNextOnSuccess(start); snapshot.setNextOnFailure(delete); @@ -50,13 +51,20 @@ start.setNextOnFailure(revert); wait.setNextOnSuccess(copy); - wait.setNextOnFailure(start); + wait.setNextOnFailure(stop); copy.setNextOnSuccess(exec); copy.setNextOnFailure(copy); exec.setNextOnFailure(copy); + // sometimes virtual machines are unpingable, restart them + exec.setNextOnSuccess(stop); // this is an exploit! + + stop.setNextOnSuccess(start); + stop.setNextOnFailure(delete); + + // add them to the list Commands.add(revert); Commands.add(cred); @@ -67,6 +75,7 @@ Commands.add(wait); Commands.add(copy); Commands.add(exec); + Commands.add(stop); } public void executeCommands(ArrayList<VirtualMachineConfig> inVirtualMachines) { @@ -78,13 +87,17 @@ } } - public void handleResponse(Packet inPacket, XMPPEventExtension inExt) { + public void handleResponse(XMPPEventExtension inExt) { // get the right virtual machine for (VirtualMachineConfig virt : refVirtualMachines) { if (virt.getAffinity().equals(inExt.getHost()) && virt.getDisplayName().equals(inExt.getPropertyBag().get(VMWareConstants.VMNAME))) { + // send the next message + msgDisp.sendNext(virt.getAffinity()); + + // queue the next message virt.getCurrentCommand().handlePacket(virt, inExt); - } + } } } } Modified: trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/CreateVirtualMachineCommand.java =================================================================== --- trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/CreateVirtualMachineCommand.java 2008-09-10 14:48:19 UTC (rev 7035) +++ trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/CreateVirtualMachineCommand.java 2008-09-10 17:03:34 UTC (rev 7036) @@ -12,6 +12,7 @@ public class CreateVirtualMachineCommand extends BaseCommand { public CreateVirtualMachineCommand(MessageDispatcher refMD, LogSF inLog) { super(refMD, VMWareConstants.VM_CMD_CREATE, inLog); + TimeOut = 600 * 1000; } public XMPPEventExtension composeMessage(VirtualMachineConfig inCfg) { Modified: trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/DispatcherThread.java =================================================================== --- trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/DispatcherThread.java 2008-09-10 14:48:19 UTC (rev 7035) +++ trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/DispatcherThread.java 2008-09-10 17:03:34 UTC (rev 7036) @@ -2,14 +2,17 @@ import org.smartfrog.avalanche.server.AvalancheServer; import org.smartfrog.services.xmpp.XMPPEventExtension; +import org.smartfrog.vast.architecture.VirtualMachineConfig; import java.util.ArrayList; +import java.util.HashMap; public class DispatcherThread extends Thread { private AvalancheServer refAvl = null; private String TargetHost; - private ArrayList<XMPPEventExtension> Messages = new ArrayList<XMPPEventExtension>(10); + private ArrayList<MessageQueueItem> MessageQueue = new ArrayList<MessageQueueItem>(10); private int SendingInterval = 2000; + private boolean sendNext = true; public DispatcherThread(AvalancheServer refAvl, String inHost) { this.refAvl = refAvl; @@ -18,16 +21,27 @@ public void run() { while (true) { - while (!Messages.isEmpty()) { - // send the command + while (!MessageQueue.isEmpty() && sendNext) { try { - refAvl.sendXMPPExtension(TargetHost, Messages.get(0)); + // send the command + MessageQueueItem item = MessageQueue.get(0); + + System.out.println("Sending: " + item); + + // start the timer + item.getConfig().startTimer(); + + // send the message + refAvl.sendXMPPExtension(TargetHost, item.getCmd().composeMessage(item.getConfig())); + + // remove it from the queue + MessageQueue.remove(0); + } catch (Exception e) { e.printStackTrace(); } - // remove it from the queue - Messages.remove(0); + sendNext = false; try { Thread.sleep(SendingInterval); @@ -45,10 +59,14 @@ } } - public void queueMessage(XMPPEventExtension inMsg) { - Messages.add(inMsg); + public void sendNext() { + sendNext = true; } + public void queueMessage(VirtualMachineConfig inCfg, Command inCmd) { + MessageQueue.add(new MessageQueueItem(inCmd, inCfg)); + } + public int getSendingInterval() { return SendingInterval; } Modified: trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/ExecuteInGuestCommand.java =================================================================== --- trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/ExecuteInGuestCommand.java 2008-09-10 14:48:19 UTC (rev 7035) +++ trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/ExecuteInGuestCommand.java 2008-09-10 17:03:34 UTC (rev 7036) @@ -78,9 +78,12 @@ } public void success(VirtualMachineConfig inCfg) { + // stop timer + inCfg.stopTimer(); + try { // try to ping the machine for 5 * 22 seconds - for (int i = 0; i < 5; ++i) { + for (int i = 0; i < 2; ++i) { if (ping(inCfg.getHostAddress())) { // vast helper executed, now ignite the virtual machines // with the appropriate package (sf + test runner + SUT) @@ -90,23 +93,22 @@ return; } else Log.info("Ping to " + inCfg.getHostAddress() + " failed. Retrying."); - - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - - } } - if (inCfg.getNetworkSetupHelperTries() < 5) { + if (inCfg.getNetworkSetupHelperTries() < 1) { Log.error("Error: virtual machine " + inCfg.getDisplayName() + " not reachable. Retrying network setup helper."); inCfg.setNetworkSetupHelperTries(inCfg.getNetworkSetupHelperTries() + 1); // copy the helper into the vm again failure(inCfg); + } else { + Log.error("Error: virtual machine " + inCfg.getDisplayName() + " not reachable. Restarting virtual machine."); + + // exploit! + inCfg.setCurrentCommand(NextSuccess); + NextSuccess.execute(inCfg); } - else Log.error("Error: virtual machine " + inCfg.getDisplayName() + " not reachable. Maximum tries reached."); } catch (Exception e) { Log.error(e); } Modified: trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/MessageDispatcher.java =================================================================== --- trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/MessageDispatcher.java 2008-09-10 14:48:19 UTC (rev 7035) +++ trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/MessageDispatcher.java 2008-09-10 17:03:34 UTC (rev 7036) @@ -2,6 +2,7 @@ import org.smartfrog.avalanche.server.AvalancheServer; import org.smartfrog.services.xmpp.XMPPEventExtension; +import org.smartfrog.vast.architecture.VirtualMachineConfig; import java.util.HashMap; import java.util.LinkedHashMap; @@ -14,21 +15,19 @@ this.refAvl = refAvl; } - public synchronized void sendMessage(String inHost, XMPPEventExtension inMsg) { - if (dispatcherThreads.containsKey(inHost)) { + public synchronized void sendMessage(VirtualMachineConfig inCfg, Command inCmd) { + if (dispatcherThreads.containsKey(inCfg.getAffinity())) { // queue message - DispatcherThread dt = dispatcherThreads.get(inHost); - dt.queueMessage(inMsg); - if (!dt.isAlive()) - dt.start(); + DispatcherThread dt = dispatcherThreads.get(inCfg.getAffinity()); + dt.queueMessage(inCfg, inCmd); } else { // create new dispatcher thread - DispatcherThread dt = new DispatcherThread(refAvl, inHost); - dt.queueMessage(inMsg); + DispatcherThread dt = new DispatcherThread(refAvl, inCfg.getAffinity()); + dt.queueMessage(inCfg, inCmd); dt.start(); // add it to the hashmap - dispatcherThreads.put(inHost, dt); + dispatcherThreads.put(inCfg.getAffinity(), dt); } } @@ -36,6 +35,10 @@ return refAvl; } + public void sendNext(String inHost) { + dispatcherThreads.get(inHost).sendNext(); + } + public void setRefAvl(AvalancheServer refAvl) { this.refAvl = refAvl; } Added: trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/MessageQueueItem.java =================================================================== --- trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/MessageQueueItem.java (rev 0) +++ trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/MessageQueueItem.java 2008-09-10 17:03:34 UTC (rev 7036) @@ -0,0 +1,29 @@ +package org.smartfrog.vast.architecture.CommandDispatcher; + +import org.smartfrog.vast.architecture.VirtualMachineConfig; + +public class MessageQueueItem { + private Command Cmd; + private VirtualMachineConfig Config; + + public MessageQueueItem(Command cmd, VirtualMachineConfig config) { + Cmd = cmd; + Config = config; + } + + public Command getCmd() { + return Cmd; + } + + public void setCmd(Command cmd) { + Cmd = cmd; + } + + public VirtualMachineConfig getConfig() { + return Config; + } + + public void setConfig(VirtualMachineConfig config) { + Config = config; + } +} Added: trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/StopVirtualMachineCommand.java =================================================================== --- trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/StopVirtualMachineCommand.java (rev 0) +++ trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/StopVirtualMachineCommand.java 2008-09-10 17:03:34 UTC (rev 7036) @@ -0,0 +1,34 @@ +package org.smartfrog.vast.architecture.CommandDispatcher; + +import org.smartfrog.sfcore.logging.LogSF; +import org.smartfrog.services.vmware.VMWareConstants; +import org.smartfrog.services.xmpp.XMPPEventExtension; +import org.smartfrog.services.xmpp.MonitoringConstants; +import org.smartfrog.vast.architecture.VirtualMachineConfig; + +import java.net.InetAddress; +import java.net.UnknownHostException; + +public class StopVirtualMachineCommand extends BaseCommand { + public StopVirtualMachineCommand(MessageDispatcher refMD, LogSF inLog) { + super(refMD, VMWareConstants.VM_CMD_STOP, inLog); + } + + public XMPPEventExtension composeMessage(VirtualMachineConfig inCfg) { + XMPPEventExtension ext = new XMPPEventExtension(); + try { + ext.setHost(InetAddress.getLocalHost().toString()); + } catch (UnknownHostException e) { + ext.setHost(""); + } + ext.setMessageType(MonitoringConstants.VM_MESSAGE); + + // set the command + ext.getPropertyBag().put("vmcmd", Command); + + // set the path (used like an identifier) + ext.getPropertyBag().put("vmname", inCfg.getDisplayName()); + + return ext; + } +} Modified: trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/TimerThread.java =================================================================== --- trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/TimerThread.java 2008-09-10 14:48:19 UTC (rev 7035) +++ trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/CommandDispatcher/TimerThread.java 2008-09-10 17:03:34 UTC (rev 7036) @@ -6,19 +6,24 @@ private VirtualMachineConfig refCfg; private long Time; private Command command; - private boolean stopTimer = false; + private boolean stopTimer = false, + running = false; public TimerThread(VirtualMachineConfig refCfg) { this.refCfg = refCfg; } public void run() { + System.out.println(this + " started"); + running = true; long lastTime = System.currentTimeMillis(); long tmpTime; while (true) { if (stopTimer) { stopTimer = false; + running = false; + System.out.println(this + " stopped"); return; } @@ -35,6 +40,8 @@ try { Thread.sleep(500); } catch (InterruptedException e) { + running = false; + return; } } @@ -45,7 +52,8 @@ * Stops the timer. */ public void stopTimer() { - stopTimer = true; + if (running) + stopTimer = true; } public Command getCommand() { Modified: trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/EnvironmentConstructorImpl.java =================================================================== --- trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/EnvironmentConstructorImpl.java 2008-09-10 14:48:19 UTC (rev 7035) +++ trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/EnvironmentConstructorImpl.java 2008-09-10 17:03:34 UTC (rev 7036) @@ -625,7 +625,7 @@ * @param inPacket The packet containing the message. * @param inPacketExtension The packet extension containing the relevant data. */ - public void handleVMMessages(Packet inPacket, XMPPEventExtension inPacketExtension) { - cmdCtrl.handleResponse(inPacket, inPacketExtension); + public void handleVMMessages(XMPPEventExtension inPacketExtension) { + cmdCtrl.handleResponse(inPacketExtension); } } Modified: trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/VastListener.java =================================================================== --- trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/VastListener.java 2008-09-10 14:48:19 UTC (rev 7035) +++ trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/VastListener.java 2008-09-10 17:03:34 UTC (rev 7036) @@ -61,7 +61,7 @@ refEnvCon.hostStarted(pe.getHost()); break; case MonitoringConstants.VM_MESSAGE: - refEnvCon.handleVMMessages(p, pe); + refEnvCon.handleVMMessages(pe); break; default: refEnvCon.sfLog().info("No matching monitoring constant found."); Modified: trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/VirtualMachineConfig.java =================================================================== --- trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/VirtualMachineConfig.java 2008-09-10 14:48:19 UTC (rev 7035) +++ trunk/core/extras/VAST/src/org/smartfrog/vast/architecture/VirtualMachineConfig.java 2008-09-10 17:03:34 UTC (rev 7036) @@ -90,24 +90,27 @@ /** * Sets the timer. Also sets it to the current command. */ - public void setTimer() { + public void setTimer(long inTime) { timerThread.setCommand(currentCommand); - timerThread.setTime(1000 * 120); + timerThread.setTime(inTime); } /** * Starts the timer if not already running. */ public void startTimer() { - if (curThread != null && !curThread.isAlive()) - curThread = new Thread(timerThread); + if (curThread != null) + stopTimer(); + + curThread = new Thread(timerThread); + curThread.start(); } /** * Stops the timer if running. */ public void stopTimer() { - if (curThread != null && curThread.isAlive()) + if (curThread != null) timerThread.stopTimer(); } Modified: trunk/core/extras/VAST/src/org/smartfrog/vast/testing/controller/TestControllerImpl.java =================================================================== --- trunk/core/extras/VAST/src/org/smartfrog/vast/testing/controller/TestControllerImpl.java 2008-09-10 14:48:19 UTC (rev 7035) +++ trunk/core/extras/VAST/src/org/smartfrog/vast/testing/controller/TestControllerImpl.java 2008-09-10 17:03:34 UTC (rev 7036) @@ -148,9 +148,25 @@ } // check the result + boolean failure = false; for (SUTAttribute attr : seq.getResult().getAttributes()) { - ProcessCompound pc = SFProcess.sfSelectTargetProcess(attr.getHost(), null); + // get the process + ProcessCompound pc = SFProcess.sfSelectTargetProcess(attr.getHost(), attr.getProcess()); + + // resolve the attribute + String value = (String) pc.sfResolve(attr.getName(), false); + + // check the result + if (value != null) { + failure = (!attr.getValue().equals(value)); + } } + if (failure && !seq.getExpectFailure()) + throw new SmartFrogException("Unexpected failure in sequence " + seq.getName()); + else { + // sequence passed, TODO: log + sfLog().info("Sequence passed: " + seq.getName()); + } } } catch (Exception e) { sfLog().error(e); @@ -161,7 +177,7 @@ * Stop the tests. */ private void stopTests() { - + } public PacketFilter getFilter() { Modified: trunk/core/extras/VAST/src/org/smartfrog/vast/testing/shared/SUTAttribute.java =================================================================== --- trunk/core/extras/VAST/src/org/smartfrog/vast/testing/shared/SUTAttribute.java 2008-09-10 14:48:19 UTC (rev 7035) +++ trunk/core/extras/VAST/src/org/smartfrog/vast/testing/shared/SUTAttribute.java 2008-09-10 17:03:34 UTC (rev 7036) @@ -27,10 +27,13 @@ public static final String ATTR_NAME = "Name"; public static final String ATTR_HOST = "Host"; public static final String ATTR_VALUE = "Value"; + public static final String ATTR_PROCESS = "Process"; public String getHost() throws RemoteException; public String getName() throws RemoteException; public String getValue() throws RemoteException; + + public String getProcess() throws RemoteException; } Modified: trunk/core/extras/VAST/src/org/smartfrog/vast/testing/shared/SUTAttributeImpl.java =================================================================== --- trunk/core/extras/VAST/src/org/smartfrog/vast/testing/shared/SUTAttributeImpl.java 2008-09-10 14:48:19 UTC (rev 7035) +++ trunk/core/extras/VAST/src/org/smartfrog/vast/testing/shared/SUTAttributeImpl.java 2008-09-10 17:03:34 UTC (rev 7036) @@ -31,6 +31,7 @@ private String Name; private String Host; private String Value; + private String Process; public SUTAttributeImpl() throws RemoteException { } @@ -44,6 +45,7 @@ Name = (String) sfResolve(ATTR_NAME, true); Host = (String) sfResolve(ATTR_HOST, true); Value = (String) sfResolve(ATTR_VALUE, true); + Process = (String) sfResolve(ATTR_PROCESS, false); } public String getHost() throws RemoteException { @@ -57,4 +59,8 @@ public String getValue() throws RemoteException { return Value; } + + public String getProcess() throws RemoteException { + return Process; + } } Modified: trunk/core/extras/VAST/src/org/smartfrog/vast/testing/shared/statemachine.sf =================================================================== --- trunk/core/extras/VAST/src/org/smartfrog/vast/testing/shared/statemachine.sf 2008-09-10 14:48:19 UTC (rev 7035) +++ trunk/core/extras/VAST/src/org/smartfrog/vast/testing/shared/statemachine.sf 2008-09-10 17:03:34 UTC (rev 7036) @@ -44,6 +44,9 @@ // host where this attribute can be found Host extends String; + + // process on the host where this attribute can be found + Process extends OptionalString; } } Modified: trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/server/ServerSetup.java =================================================================== --- trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/server/ServerSetup.java 2008-09-10 14:48:19 UTC (rev 7035) +++ trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/server/ServerSetup.java 2008-09-10 17:03:34 UTC (rev 7036) @@ -185,10 +185,9 @@ // set the command ext.getPropertyBag().put("vmcmd", inCmd); if (inVMName != null) + // set the path (used like an identifier) + ext.getPropertyBag().put("vmname", inVMName); - // set the path (used like an identifier) - ext.getPropertyBag().put("vmname", inVMName); - // add the additional parameters if (inAdditionalProperties != null) { for (String key : inAdditionalProperties.keySet()) { Modified: trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/server/engines/sf/BootStrap.java =================================================================== --- trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/server/engines/sf/BootStrap.java 2008-09-10 14:48:19 UTC (rev 7035) +++ trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/server/engines/sf/BootStrap.java 2008-09-10 17:03:34 UTC (rev 7036) @@ -292,9 +292,9 @@ if (!of.exists()) { throw new HostIgnitionException("Template creation failed! File does not exist: " + outputFile); } - log.info("SF : " + outputFile); + // log.info("SF : " + outputFile); - SmartfrogAdapter adapter = null; + SmartfrogAdapter adapter; adapter = new SmartFrogAdapterImpl(sfDirectory + File.separator + this.strOptSeparator + "dist", securityOn.equals("true")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-09-23 15:04:10
|
Revision: 7083 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7083&view=rev Author: steve_l Date: 2008-09-23 15:03:10 +0000 (Tue, 23 Sep 2008) Log Message: ----------- SFOS-985 Add an inline CSV/tuple source Modified Paths: -------------- trunk/core/components/csvfiles/src/org/smartfrog/services/filesystem/csvfiles/CSVFileReadImpl.java trunk/core/components/csvfiles/src/org/smartfrog/services/filesystem/csvfiles/components.sf trunk/core/smartfrog/src/org/smartfrog/services/filesystem/TupleReaderThread.java Added Paths: ----------- trunk/core/components/csvfiles/src/org/smartfrog/services/filesystem/csvfiles/InlineTupleSourceImpl.java Modified: trunk/core/components/csvfiles/src/org/smartfrog/services/filesystem/csvfiles/CSVFileReadImpl.java =================================================================== --- trunk/core/components/csvfiles/src/org/smartfrog/services/filesystem/csvfiles/CSVFileReadImpl.java 2008-09-22 12:50:17 UTC (rev 7082) +++ trunk/core/components/csvfiles/src/org/smartfrog/services/filesystem/csvfiles/CSVFileReadImpl.java 2008-09-23 15:03:10 UTC (rev 7083) @@ -202,7 +202,7 @@ sfLog().info("Reading CSV file " + csvfile); reader = new CSVReader(new FileReader(csvfile), separator, quote, headerLines); count = 0; - } catch (FileNotFoundException e) { + } catch (FileNotFoundException ignored) { throw new SmartFrogDeploymentException(ERROR_NO_FILE + csvfile.getAbsolutePath()); } Added: trunk/core/components/csvfiles/src/org/smartfrog/services/filesystem/csvfiles/InlineTupleSourceImpl.java =================================================================== --- trunk/core/components/csvfiles/src/org/smartfrog/services/filesystem/csvfiles/InlineTupleSourceImpl.java (rev 0) +++ trunk/core/components/csvfiles/src/org/smartfrog/services/filesystem/csvfiles/InlineTupleSourceImpl.java 2008-09-23 15:03:10 UTC (rev 7083) @@ -0,0 +1,82 @@ +/* (C) Copyright 2008 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.filesystem.csvfiles; + +import org.smartfrog.sfcore.prim.PrimImpl; +import org.smartfrog.sfcore.common.SmartFrogException; +import org.smartfrog.sfcore.utils.ListUtils; +import org.smartfrog.sfcore.reference.Reference; +import org.smartfrog.services.filesystem.TupleDataSource; + +import java.rmi.RemoteException; +import java.util.Vector; +import java.util.Iterator; + +/** + * Created 22-Sep-2008 17:11:19 + */ + +public class InlineTupleSourceImpl extends PrimImpl implements TupleDataSource { + + Vector<Vector<String>> data; + private static final Reference refData = new Reference("data"); + private Iterator<Vector<String>> iterator; + + public InlineTupleSourceImpl() throws RemoteException { + + } + + /** + * Get the next line + * + * @return the next line, all broken up, or null for no new lines. + * @throws RemoteException network problems + * @throws SmartFrogException parsing/file IO problems + */ + public String[] getNextTuple() throws RemoteException, SmartFrogException { + if(iterator==null || !iterator.hasNext()) { + return null; + } + Vector<String> row = iterator.next(); + return row.toArray(new String[row.size()]); + } + + /** + * Go back to the start of the file + * + * @throws RemoteException network problems + * @throws SmartFrogException parsing/file IO problems + */ + public void start() throws RemoteException, SmartFrogException { + data = ListUtils.resolveStringNTupleList(this, refData, -1, true); + iterator = data.iterator(); + } + + /** + * Close the reader. harmless if we are already closed + * + * @throws RemoteException network problems + * @throws SmartFrogException parsing/file IO problems + */ + public void close() throws RemoteException, SmartFrogException { + data = null; + iterator = null; + } +} Modified: trunk/core/components/csvfiles/src/org/smartfrog/services/filesystem/csvfiles/components.sf =================================================================== --- trunk/core/components/csvfiles/src/org/smartfrog/services/filesystem/csvfiles/components.sf 2008-09-22 12:50:17 UTC (rev 7082) +++ trunk/core/components/csvfiles/src/org/smartfrog/services/filesystem/csvfiles/components.sf 2008-09-23 15:03:10 UTC (rev 7083) @@ -78,3 +78,7 @@ } +InlineTupleSource extends Prim { + sfClass "org.smartfrog.services.filesystem.csvfiles.InlineTupleSourceImpl" + data TBD; +} Modified: trunk/core/smartfrog/src/org/smartfrog/services/filesystem/TupleReaderThread.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/filesystem/TupleReaderThread.java 2008-09-22 12:50:17 UTC (rev 7082) +++ trunk/core/smartfrog/src/org/smartfrog/services/filesystem/TupleReaderThread.java 2008-09-23 15:03:10 UTC (rev 7083) @@ -113,7 +113,7 @@ } /** - * Handle termination requested; after this call + * Handle termination requested; after this call * the component will return * * @throws SmartFrogException SmartFrog problems This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-09-29 15:30:38
|
Revision: 7091 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7091&view=rev Author: steve_l Date: 2008-09-29 15:29:40 +0000 (Mon, 29 Sep 2008) Log Message: ----------- SFOS-88 security exception when starting RPM installation with security turned on Modified Paths: -------------- trunk/core/release/build.xml trunk/core/release/metadata/rpm/rpm.properties trunk/core/release/metadata/rpm/smartfrog.spec trunk/core/release/src/ant/build.xml trunk/core/smartfrog/docs/sfReference.sxw trunk/core/smartfrog/docs/sfUserManual.sxw trunk/core/smartfrog/private/buildSecurity.xml trunk/core/smartfrog/src/org/smartfrog/sfcore/security/SFSecurity.java Modified: trunk/core/release/build.xml =================================================================== --- trunk/core/release/build.xml 2008-09-26 16:00:37 UTC (rev 7090) +++ trunk/core/release/build.xml 2008-09-29 15:29:40 UTC (rev 7091) @@ -1087,8 +1087,13 @@ value="/home/${rpm.ssh.user}/${rpm.ssh.dir}"/> <!--list of rpms--> + <property name="rpms.core.list" + value="smartfrog smartfrog-daemon smartfrog-demo smartfrog-javadocs smartfrog-ant smartfrog-anubis smartfrog-csvfiles smartfrog-database smartfrog-jmx smartfrog-junit smartfrog-logging smartfrog-networking smartfrog-quartz smartfrog-scripting smartfrog-www smartfrog-xml smartfrog-xmpp smartfrog-xunit smartfrog-velocity"/> + <property name="rpms.private.list" + value=" smartfrog-private-security-keys"/> <property name="rpms.list" - value="smartfrog smartfrog-daemon smartfrog-demo smartfrog-javadocs smartfrog-ant smartfrog-anubis smartfrog-csvfiles smartfrog-database smartfrog-jmx smartfrog-junit smartfrog-logging smartfrog-networking smartfrog-quartz smartfrog-scripting smartfrog-www smartfrog-xml smartfrog-xmpp smartfrog-xunit smartfrog-velocity smartfrog-private-keys"/> + value="${rpms.core.list} ${smartfrog-private-keys}"/> + <!--here are all the signed RPMs that are generated--> @@ -1170,8 +1175,11 @@ <target name="rpm-remote-uninstall" depends="rpm-upload-init" description="A forced uninstall of the RPMs, no dependency checking"> <rootssh - command="rpm --erase --nodeps ${rpm.verbosity} ${rpms.list} ${rpms.dependent.list}" + command="rpm --erase --nodeps --allmatches ${rpm.verbosity} ${rpms.private.list} ${rpms.dependent.list}" failonerror="false"/> + <rootssh + command="rpm --erase --nodeps --allmatches ${rpm.verbosity} ${rpms.core.list}" + failonerror="false"/> </target> <target name="rpm-remote-test" Modified: trunk/core/release/metadata/rpm/rpm.properties =================================================================== --- trunk/core/release/metadata/rpm/rpm.properties 2008-09-26 16:00:37 UTC (rev 7090) +++ trunk/core/release/metadata/rpm/rpm.properties 2008-09-29 15:29:40 UTC (rev 7091) @@ -42,6 +42,11 @@ rpm.vendor=Hewlett-Packard Company rpm.packager=${user.name} +#what is the start/stop value for the daemon in init.d scripts rpm.daemon.start.number=80 rpm.daemon.stop.number=20 +#What permissions to use for all /opt/smartfrog/private/hosts permissions in secure builds +#Ths +rpm.private.hosts.permissions=0555 + Modified: trunk/core/release/metadata/rpm/smartfrog.spec =================================================================== --- trunk/core/release/metadata/rpm/smartfrog.spec 2008-09-26 16:00:37 UTC (rev 7090) +++ trunk/core/release/metadata/rpm/smartfrog.spec 2008-09-29 15:29:40 UTC (rev 7091) @@ -589,28 +589,20 @@ # the security keys file only has content in it when the build property says so %files private-security-keys %{?_private_rpm:%{privatedir}} +#uncomment this to force in a host. It is here more as a development utility than +#anything anyone should need +#%{?_private_rpm:%{privatedir}/host1} -# ----------------------------------------------------------------------------- -# After installing, set up a symlink from signedLib to lib. This is -# done as a script to deal with upgrade problems. Any existing directory -# is blown away by this operation, as is a symlink. -%post -#if [ -x %{signedlib} ] ; then -#rm -rf %{signedlib} -#fi -#ln -s %{libdir} %{signedlib} -# the symlink is only deleted if there is none left; this avoids -# stamping on any newly created links. -%postun -#if [ "$1" = "0" ] ; then -# if [ -x %{signedlib} ] ; then -# rm -rf %{signedlib} -# fi -#fi +%post private-security-keys +#on a private installation, we crank back the security rights to be restricted to the user for which the RPM +#is targeted, with permissions as set at built time, ideally to something restrictive +%{?_private_rpm:chmod ${rpm.private.hosts.permissions} %{privatedir}/host*} +%{?_private_rpm:chown ${rpm.username} %{privatedir}/host*} + %files demo %defattr(0644,${rpm.username},${rpm.username},0755) %{srcdir} Modified: trunk/core/release/src/ant/build.xml =================================================================== --- trunk/core/release/src/ant/build.xml 2008-09-26 16:00:37 UTC (rev 7090) +++ trunk/core/release/src/ant/build.xml 2008-09-29 15:29:40 UTC (rev 7091) @@ -102,11 +102,15 @@ location="${core.install.dir}/lib"/> <property name="rpm.signed.lib.dir" location="${core.install.dir}/signedLib"/> + <property name="rpm.private.dir" + location="${core.install.dir}/private"/> <!--and now some file names--> <property name="smartfrog.rpmfiles.tar" location="${rpm.SOURCES}/smartfrog-${smartfrog.version}.tar"/> + <property name="smartfrog.rpmfiles.tar.gz" + location="${smartfrog.rpmfiles.tar}.gz"/> <property name="rpm.suffix" value="${smartfrog.version}-${rpm.release.version}.noarch.rpm"/> <property name="target.rpm.shortname" @@ -142,7 +146,7 @@ <target name="ready-to-prepare-binary-rpm" - depends="rpmmacros,signjars,symlink-signed-lib"/> + depends="rpmmacros,signjars,symlink-signed-lib,copy-host-directories"/> <target name="build-rpm" depends="ready-to-rpm" description="create an RPM file of the core smartfrog libraries"> @@ -168,16 +172,13 @@ <arg value="var"/> <arg value="usr"/> </exec> - <!-- - <sf-tar destfile="${smartfrog.rpmfiles.tar}" > - <fileset dir="${build.rpm.dir}/root/" includes="**/*" /> - </sf-tar> - --> <!-- now we have a sanity check --> <loadresource property="homepage"> <tarentry archive="${smartfrog.rpmfiles.tar}" name="etc/sysconfig/smartfrog"/> </loadresource> + <gzip src="${smartfrog.rpmfiles.tar}" + destfile="${smartfrog.rpmfiles.tar.gz}"/> </target> @@ -290,7 +291,7 @@ description="Create a new set of daemon host keys "> <dist target="newDaemon"> <property name="host.dir.suffix" value="" /> - <property name="CA.dir" location="security.ca.dir" /> + <property name="CA.dir" location="${security.ca.dir}" /> </dist> </target> @@ -324,5 +325,22 @@ <arg value="${rpm.signed.lib.dir}"/> </exec> </target> - + + + <!-- + This target copies the host key information from the CA dir; all hosts get copied over + The source directory is defined as host.directories.basedir (defaults to ${security.private.dir}) + And the pattern, host*, is set in host.dir.pattern. Accordingly, this target can + be set to copy over directories from a different location than that of the CA + --> + <target name="copy-host-directories" depends="ready-to-sign" + unless="copy.host.directories.disabled"> + <property name="host.directories.basedir" location="${security.private.dir}" /> + <property name="host.dir.pattern" value="host*/*" /> + <copy todir="${rpm.private.dir}"> + <fileset dir="${host.directories.basedir}" includes="${host.dir.pattern}" /> + </copy> + </target> + + </project> \ No newline at end of file Modified: trunk/core/smartfrog/private/buildSecurity.xml =================================================================== --- trunk/core/smartfrog/private/buildSecurity.xml 2008-09-26 16:00:37 UTC (rev 7090) +++ trunk/core/smartfrog/private/buildSecurity.xml 2008-09-29 15:29:40 UTC (rev 7091) @@ -108,6 +108,15 @@ </fail> </target> + <target name="echo-CA-setup" depends="ready-to-create-CA"> + <echo> + host.dir.suffix = "${host.dir.suffix}" + host.subdir = "${host.subdir}" + CA.dir = "${CA.dir}" + CAsubdir = "${CAsubdir}" + </echo> + </target> + <!-- Override point: do everything needed to create a CA --> Modified: trunk/core/smartfrog/src/org/smartfrog/sfcore/security/SFSecurity.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/sfcore/security/SFSecurity.java 2008-09-26 16:00:37 UTC (rev 7090) +++ trunk/core/smartfrog/src/org/smartfrog/sfcore/security/SFSecurity.java 2008-09-29 15:29:40 UTC (rev 7091) @@ -26,6 +26,8 @@ import java.rmi.registry.Registry; import java.rmi.server.RMISocketFactory; import java.net.InetAddress; +import java.security.AccessControlException; + import org.smartfrog.sfcore.processcompound.SFServerSocketFactory; @@ -65,8 +67,19 @@ try { if (!alreadyInit) { // Add the new RMIClassLoaderSpi - System.setProperty("java.rmi.server.RMIClassLoaderSpi", "org.smartfrog.sfcore.security." + "SFRMIClassLoaderSpi"); + try { + System.setProperty("java.rmi.server.RMIClassLoaderSpi", + "org.smartfrog.sfcore.security." + "SFRMIClassLoaderSpi"); + } catch (AccessControlException e) { + throw (SFGeneralSecurityException) new SFGeneralSecurityException( + ("Java Security Access control exception - " + + "SmartFrog is configured to run with security on, but the smartfrog JAR is not " + + "signed by a trusted CA: " + + e.getMessage())) + .initCause(e); + } + SFSecurityProperties.readSecurityProperties(); if (Boolean.getBoolean(SFSecurityProperties.propSecurityOn)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-10-28 17:13:57
|
Revision: 7140 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7140&view=rev Author: steve_l Date: 2008-10-28 17:13:51 +0000 (Tue, 28 Oct 2008) Log Message: ----------- SFOS-1016 Catch System.exit() calls in third party libraries through a new SecurityManager Modified Paths: -------------- trunk/core/smartfrog/src/org/smartfrog/sfcore/common/ExitCodes.java trunk/core/smartfrog/src/org/smartfrog/sfcore/security/SFSecurity.java Added Paths: ----------- trunk/core/smartfrog/src/org/smartfrog/sfcore/security/ExitTrappingSecurityManager.java trunk/core/testharness/testcases/org/smartfrog/test/unit/sfcore/security/ trunk/core/testharness/testcases/org/smartfrog/test/unit/sfcore/security/ExitTrappingTest.java Modified: trunk/core/smartfrog/src/org/smartfrog/sfcore/common/ExitCodes.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/sfcore/common/ExitCodes.java 2008-10-28 17:13:02 UTC (rev 7139) +++ trunk/core/smartfrog/src/org/smartfrog/sfcore/common/ExitCodes.java 2008-10-28 17:13:51 UTC (rev 7140) @@ -24,15 +24,15 @@ import org.smartfrog.Version; import org.smartfrog.sfcore.logging.LogFactory; import org.smartfrog.sfcore.logging.LogSF; +import org.smartfrog.sfcore.security.ExitTrappingSecurityManager; /** - * Exit error codes. - * + * Exit error codes. * */ public final class ExitCodes { /** Core Log */ - private LogSF sflog = null; + private static LogSF sflog = null; /** Utility class */ private ExitCodes() { @@ -78,14 +78,16 @@ /** * Exits from the system. * This is the only place in the framework where System.exit() should be used. - * That way a subjclass can change exit behaviour (within limits) + * That way behaviour can be altered. * @param code int */ public static void exit(int code) { try { - if (LogFactory.sfGetProcessLog().isDebugEnabled()) { LogFactory.sfGetProcessLog().debug ("SmartFrog System.Exit code: "+ code +", v"+ Version.versionStringforrelease()); } - } catch (Throwable thr) { /* ignore */ } - + if (LogFactory.sfGetProcessLog().isDebugEnabled()) { + LogFactory.sfGetProcessLog().debug ("SmartFrog System.Exit code: "+ code + + ", v" + Version.versionStringforrelease()); } + } catch (Throwable ignored) { /* ignore */ } + ExitTrappingSecurityManager.setSystemExitPermitted(true); System.exit(code); } @@ -93,9 +95,9 @@ * * @return LogSF */ - public LogSF sfLog(){ + public static LogSF sfLog() { if (sflog==null) { - sflog= LogFactory.sfGetProcessLog(); + sflog = LogFactory.sfGetProcessLog(); } return sflog; } Added: trunk/core/smartfrog/src/org/smartfrog/sfcore/security/ExitTrappingSecurityManager.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/sfcore/security/ExitTrappingSecurityManager.java (rev 0) +++ trunk/core/smartfrog/src/org/smartfrog/sfcore/security/ExitTrappingSecurityManager.java 2008-10-28 17:13:51 UTC (rev 7140) @@ -0,0 +1,84 @@ +/* (C) Copyright 2008 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.sfcore.security; + +import java.security.Permission; + +/** + * Created 28-Oct-2008 13:52:18 + */ + +public class ExitTrappingSecurityManager extends DummySecurityManager { + + private static volatile boolean systemExitPermitted = false; + + public static boolean isSystemExitPermitted() { + return systemExitPermitted; + } + + public static void setSystemExitPermitted(boolean systemExitPermitted) { + ExitTrappingSecurityManager.systemExitPermitted = systemExitPermitted; + } + + /** + * Blocks exits if the shared enable exits {@inheritDoc} + * + * @param status the exit status. + * @throws SecurityException if the calling thread does not have permission to halt the Java Virtual Machine with + * the specified status. + * @see Runtime#exit(int) exit + * @see #checkPermission(Permission) checkPermission + */ + @Override + public void checkExit(int status) { + if (systemExitPermitted) { + super.checkExit(status); + } else { + throw new SystemExitException(status); + } + } + + /** + * An exception that gets returned when someone called system.exit but the exit was blocked. + */ + public static class SystemExitException extends RuntimeException { + private int status; + + /** + * Constructs a new runtime exception with <code>null</code> as its detail message. The cause is not + * initialized, and may subsequently be initialized by a call to {@link #initCause}. + * + * @param status exit code that was used for this exit request + */ + private SystemExitException(int status) { + super("SystemExit with status code " + status + " blocked"); + this.status = status; + } + + /** + * The status code that was used with this exception + * + * @return the status code. + */ + public int getStatus() { + return status; + } + } +} Modified: trunk/core/smartfrog/src/org/smartfrog/sfcore/security/SFSecurity.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/sfcore/security/SFSecurity.java 2008-10-28 17:13:02 UTC (rev 7139) +++ trunk/core/smartfrog/src/org/smartfrog/sfcore/security/SFSecurity.java 2008-10-28 17:13:51 UTC (rev 7140) @@ -131,16 +131,16 @@ // This is necessary for dynamic classloading to work. String secPro = System.getProperty("java.security.policy"); if (secPro != null) { - System.setSecurityManager(new SecurityManager()); + System.setSecurityManager(new ExitTrappingSecurityManager()); } securityOn = false; - //Notification moved to SFSyten after the ini file is read. + //Notification moved to SFSystem after the ini file is read. } } } catch (IOException e) { // Problems setting up RMI. - throw (SFGeneralSecurityException)new SFGeneralSecurityException(e.getMessage()).initCause(e); + throw (SFGeneralSecurityException)new SFGeneralSecurityException(e.toString()).initCause(e); } } Added: trunk/core/testharness/testcases/org/smartfrog/test/unit/sfcore/security/ExitTrappingTest.java =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/unit/sfcore/security/ExitTrappingTest.java (rev 0) +++ trunk/core/testharness/testcases/org/smartfrog/test/unit/sfcore/security/ExitTrappingTest.java 2008-10-28 17:13:51 UTC (rev 7140) @@ -0,0 +1,87 @@ +/* (C) Copyright 2008 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.unit.sfcore.security; + +import junit.framework.TestCase; +import org.smartfrog.sfcore.security.ExitTrappingSecurityManager; + +/** + * Created 28-Oct-2008 15:17:11 + */ + +public class ExitTrappingTest extends TestCase { + private ExitTrappingSecurityManager manager; + + /** + * Constructs a test case with the given name. + */ + public ExitTrappingTest(String name) { + super(name); + } + + /** + * Sets up the fixture, for example, open a network connection. This method is called before a test is executed. + */ + @Override + protected void setUp() throws Exception { + super.setUp(); + manager = new ExitTrappingSecurityManager(); + } + + public void testManagerConstruct() throws Throwable { + ExitTrappingSecurityManager.setSystemExitPermitted(true); + assertTrue(ExitTrappingSecurityManager.isSystemExitPermitted()); + ExitTrappingSecurityManager.setSystemExitPermitted(false); + assertFalse(ExitTrappingSecurityManager.isSystemExitPermitted()); + } + + public void testManagerCheckEnabled() throws Throwable { + ExitTrappingSecurityManager.setSystemExitPermitted(true); + manager.checkExit(1); + //we should get here OK + } + + public void testManagerCheckThrowsExceptionWhenBlocking() throws Throwable { + ExitTrappingSecurityManager.setSystemExitPermitted(false); + try { + manager.checkExit(1); + fail("expected failure"); + } catch (ExitTrappingSecurityManager.SystemExitException expected) { + //all is well + assertEquals(1, expected.getStatus()); + } + } + + public void testSettingSecurityManager() throws Throwable { + if (System.getSecurityManager() != null) { + fail("There is a security manager already"); + } + try { + System.setSecurityManager(manager); + System.exit(1); + } catch (ExitTrappingSecurityManager.SystemExitException expected) { + //all is well + assertEquals(1, expected.getStatus()); + } finally { + System.setSecurityManager(null); + } + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-11-03 19:26:08
|
Revision: 7147 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7147&view=rev Author: steve_l Date: 2008-11-03 16:40:54 +0000 (Mon, 03 Nov 2008) Log Message: ----------- SFOS-1019 Add smartfrog-hadoop RPM that contains all the artifacts needed to bring up Hadoop under SmartFrog. Modified Paths: -------------- trunk/core/components/hadoop/libraries.properties trunk/core/release/build.xml trunk/core/release/ivy.xml trunk/core/release/metadata/rpm/smartfrog.spec trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/conditional/components.sf Modified: trunk/core/components/hadoop/libraries.properties =================================================================== --- trunk/core/components/hadoop/libraries.properties 2008-11-03 16:24:34 UTC (rev 7146) +++ trunk/core/components/hadoop/libraries.properties 2008-11-03 16:40:54 UTC (rev 7147) @@ -5,7 +5,7 @@ hadoop.version=latest.integration jasper.version=5.5.12 jsp-api.version=${jasper.version} -jets3t.version=0.5.0 +jets3t.version=0.6.0 jetty5.version=5.1.4 kfs.version=0.1 servletapi.version=2.4 Modified: trunk/core/release/build.xml =================================================================== --- trunk/core/release/build.xml 2008-11-03 16:24:34 UTC (rev 7146) +++ trunk/core/release/build.xml 2008-11-03 16:40:54 UTC (rev 7147) @@ -474,6 +474,20 @@ <rpmpackage package="database"/> <ln artifact="sf-database" version="${smartfrog.version}"/> + <!-- hadoop --> + <rpmpackage package="hadoop"/> + <ln artifact="sf-hadoop" version="${smartfrog.version}"/> + <ln artifact="hadoop-core" version="${hadoop.version}"/> + <ln artifact="commons-cli" version="${commons-cli.version}"/> + <ln artifact="commons-el" version="${commons-el.version}"/> + <ln artifact="jets3t" version="${jets3t.version}"/> + <ln artifact="jsp-api" version="${hadoop.tomcat.version}"/> + <ln artifact="jasper-compiler" version="${hadoop.tomcat.version}"/> + <ln artifact="jasper-runtime" version="${hadoop.tomcat.version}"/> + <ln artifact="xmlenc" version="${xmlenc.version}"/> + <ln artifact="org.mortbay.jetty" version="${hadoop.jetty.version}"/> + <!--<ln artifact="servlet-api" version="${hadoop.servletapi.version}"/>--> + <!-- jmx --> <rpmpackage package="jmx"/> <ln artifact="sf-jmx" version="${smartfrog.version}"/> @@ -530,12 +544,17 @@ <!-- WWW --> <rpmpackage package="www"/> <ln artifact="sf-www" version="${smartfrog.version}"/> + <ln artifact="commons-httpclient" version="${commons-httpclient.version}"/> + <ln artifact="commons-codec" version="${commons-codec.version}"/> + + + + <!--Jetty--> + <!--comes in after the www package--> <ln artifact="sf-jetty" version="${smartfrog.version}"/> <ln artifact="jetty" version="${jetty.version}"/> <ln artifact="jetty-util" version="${jetty.version}"/> <ln artifact="servlet-api" version="${servletapi.version}"/> - <ln artifact="commons-httpclient" version="${commons-httpclient.version}"/> - <ln artifact="commons-codec" version="${commons-codec.version}"/> <!-- xml--> <rpmpackage package="xml"/> @@ -1089,10 +1108,14 @@ <property name="rpms.core.list" value="smartfrog smartfrog-daemon smartfrog-demo smartfrog-javadocs smartfrog-ant smartfrog-anubis smartfrog-csvfiles smartfrog-database smartfrog-jmx smartfrog-junit smartfrog-logging smartfrog-networking smartfrog-quartz smartfrog-scripting smartfrog-www smartfrog-xml smartfrog-xmpp smartfrog-xunit smartfrog-velocity"/> + <property name="rpms.jetty.list" + value="smartfrog-jetty"/> + <property name="rpms.hadoop.list" + value="smartfrog-hadoop"/> <property name="rpms.private.list" value=" smartfrog-private-security-keys"/> <property name="rpms.list" - value="${rpms.core.list} ${rpms.private.list}"/> + value="${rpms.core.list} ${rpms.private.list} ${rpms.jetty.list} ${rpms.hadoop.list}"/> <!--here are all the signed RPMs that are generated--> Modified: trunk/core/release/ivy.xml =================================================================== --- trunk/core/release/ivy.xml 2008-11-03 16:24:34 UTC (rev 7146) +++ trunk/core/release/ivy.xml 2008-11-03 16:40:54 UTC (rev 7147) @@ -54,6 +54,8 @@ description="database components"/> <conf name="package-jmx" description="jmx components"/> + <conf name="package-hadoop" + description="hadoop components"/> <conf name="package-logging" description="logging components"/> <conf name="package-networking" @@ -162,6 +164,22 @@ rev="${ivy.smartfrog.version}" conf="package-networking->master,redist,documentation"/> + + <!--JMX --> + <dependency org="org.smartfrog" + name="sf-jmx" + changing="true" + rev="${ivy.smartfrog.version}" + conf="package-jmx->master,redist,documentation"/> + + <!--hadoop--> + <dependency org="org.smartfrog" + name="sf-hadoop" + changing="true" + rev="${ivy.smartfrog.version}" + conf="package-hadoop->master,redist,documentation"/> + + <!--logging--> <dependency org="org.smartfrog" name="sf-loggingservices" @@ -176,12 +194,6 @@ rev="${ivy.smartfrog.version}" conf="package-scripting->master,redist,documentation"/> -<!--JMX --> - <dependency org="org.smartfrog" - name="sf-jmx" - changing="true" - rev="${ivy.smartfrog.version}" - conf="package-jmx->master,redist,documentation"/> <!--scheduling--> <dependency org="org.smartfrog" Modified: trunk/core/release/metadata/rpm/smartfrog.spec =================================================================== --- trunk/core/release/metadata/rpm/smartfrog.spec 2008-11-03 16:24:34 UTC (rev 7146) +++ trunk/core/release/metadata/rpm/smartfrog.spec 2008-11-03 16:40:54 UTC (rev 7147) @@ -231,8 +231,47 @@ target system must be installed/added to the sfCodeBase attribute of the components, in order for JDBC connectivity to work. + # ----------------------------------------------------------------------------- +%package hadoop +Group: ${rpm.framework} +Summary: Hadoop integration +Requires: %{name} = %{version}-%{release} , %{name}-logging , %{name}-www, %{name}-jasper +Conflicts: %{name}-jetty + +%description hadoop +This includes all the artifacts needed for Apache Hadoop. +DO NOT INSTALL THIS WITH smartfrog-jetty. Until Hadoop uses +Jetty 6, this RPM includes jetty-5 JAR files which are incompatible. + +# ----------------------------------------------------------------------------- + +%package jasper +Group: ${rpm.framework} +Summary: Jasper JSP runtime +Requires: %{name} = %{version}-%{release} , %{name}-logging , %{name}-www + +%description jasper +This includes all the artifacts needed to host JSP pages under a SmartFrog-hosted +application server, such as Jetty. + + +# ----------------------------------------------------------------------------- + +%package jetty +Group: ${rpm.framework} +Summary: Jetty integration +Requires: %{name} = %{version}-%{release} , %{name}-logging , %{name}-www +Conflicts: %{name}-hadoop + +%description jetty +This includes all the artifacts needed to deploy Jetty ${jetty.version} inside +SmartFrog. It is incompatble with the Hadoop RPM. + +# ----------------------------------------------------------------------------- + + %package jmx Group: ${rpm.framework} Summary: JMX integration with SmartFrog @@ -248,6 +287,8 @@ mx4j-jmx-${mx4j.version}.jar mx4j-tools-${mx4j.version}.jar + + # ----------------------------------------------------------------------------- %package logging @@ -282,7 +323,8 @@ %package quartz Group: ${rpm.framework} Summary: Work scheduling with Quartz -Requires: %{name} = %{version}-%{release} , %{name}-logging +Requires: %{name} = %{version}-%{release} , %{name}-logging, + # %description quartz Work scheduling. These components can be used to schedule work to a pool of machines, @@ -685,6 +727,45 @@ %{libdir}/sf-database-${smartfrog.version}.jar %{linkdir}/sf-database.jar +%files hadoop +%{linkdir}/sf-hadoop.jar +%{libdir}/sf-hadoop-${smartfrog.version}.jar +%{libdir}/hadoop-core-${hadoop.version}.jar +%{linkdir}/hadoop-core.jar + +#Jetty, tomcat and servlet artifacts which can cause trouble +%{libdir}/jsp-api-${hadoop.tomcat.version}.jar +%{libdir}/jasper-compiler-${hadoop.tomcat.version}.jar +%{libdir}/jasper-runtime-${hadoop.tomcat.version}.jar +%{linkdir}/jsp-api.jar +%{linkdir}/jasper-compiler.jar +%{linkdir}/jasper-runtime.jar +%{libdir}/org.mortbay.jetty-${hadoop.jetty.version}.jar +%{linkdir}/org.mortbay.jetty.jar +%{libdir}/servlet-api-${hadoop.servlet-api.version}.jar +#%{linkdir}/servlet-api.jar + +%{libdir}/commons-cli-${commons-cli.version}.jar +%{linkdir}/commons-cli.jar +%{libdir}/commons-el-${commons-el.version}.jar +%{linkdir}/commons-el.jar +%{libdir}/jets3t-${jets3t.version}.jar +%{linkdir}/jets3t.jar +%{libdir}/xmlenc-${xmlenc.version}.jar +%{linkdir}/xmlenc.jar + +%files jetty + +%{libdir}/sf-jetty-${smartfrog.version}.jar +%{libdir}/jetty-${jetty.version}.jar +%{libdir}/jetty-util-${jetty.version}.jar +%{libdir}/servlet-api-${servletapi.version}.jar +%{linkdir}/sf-jetty.jar +%{linkdir}/servlet-api.jar +%{linkdir}/jetty.jar +%{linkdir}/jetty-util.jar + + %files jmx %{libdir}/sf-jmx-${smartfrog.version}.jar @@ -779,21 +860,14 @@ %files www %{libdir}/sf-www-${smartfrog.version}.jar -%{libdir}/sf-jetty-${smartfrog.version}.jar -%{libdir}/jetty-${jetty.version}.jar -%{libdir}/jetty-util-${jetty.version}.jar -%{libdir}/servlet-api-${servletapi.version}.jar %{libdir}/commons-codec-${commons-codec.version}.jar %{libdir}/commons-httpclient-${commons-httpclient.version}.jar %{linkdir}/sf-www.jar -%{linkdir}/sf-jetty.jar -%{linkdir}/servlet-api.jar -%{linkdir}/jetty.jar -%{linkdir}/jetty-util.jar %{linkdir}/commons-codec.jar %{linkdir}/commons-httpclient.jar + %files xml %{libdir}/sf-xml-${smartfrog.version}.jar %{libdir}/jdom-${jdom.version}.jar Modified: trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/conditional/components.sf =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/conditional/components.sf 2008-11-03 16:24:34 UTC (rev 7146) +++ trunk/core/smartfrog/src/org/smartfrog/sfcore/workflow/conditional/components.sf 2008-11-03 16:40:54 UTC (rev 7147) @@ -113,6 +113,41 @@ sfShouldTerminate false; } +/** + * After the action terminates successfully, the condition is evaluated + * and the then/else operations applied as appropriate. + * The EventCompound will only terminate after whichever of those children was deployed has terminated + */ +PostCondition extends If { + action TBD; + sfClass "org.smartfrog.sfcore.workflow.conditional.PostConditionImpl"; +} +/** + * This component asserts that after the operation, the condition is met; + * the action put the state of the system into the desired form + */ +AssertPostConditionMet extends PostCondition { + message "Condition not met after action terminated"; + else extends Terminator { + description PARENT:message; + selftype Terminator:ABNORMAL; + } +} + +/** + * This component asserts that after the operation, the condition is not met. + */ +AssertPostConditionFailed extends PostCondition { + message "Condition should not be not met after action terminated"; + + then extends Terminator { + description PARENT:message; + selftype Terminator:ABNORMAL; + } + +} + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-11-05 12:22:29
|
Revision: 7151 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7151&view=rev Author: steve_l Date: 2008-11-05 11:30:39 +0000 (Wed, 05 Nov 2008) Log Message: ----------- SFOS-1017 Move to Log4J 1.12.15 -patch testharness to remove transient Log4J dependencies Modified Paths: -------------- trunk/core/components/libraries.properties trunk/core/testharness/ivy.xml Modified: trunk/core/components/libraries.properties =================================================================== --- trunk/core/components/libraries.properties 2008-11-05 10:23:39 UTC (rev 7150) +++ trunk/core/components/libraries.properties 2008-11-05 11:30:39 UTC (rev 7151) @@ -47,7 +47,7 @@ junit.version=${junit3.version} jsr173.version=1.0 jsr173-ri.version=1.0 -log4j.version=1.2.14 +log4j.version=1.2.15 mail.version=1.4 mx4j.version=3.0.1 mysql.version=3.1.13 Modified: trunk/core/testharness/ivy.xml =================================================================== --- trunk/core/testharness/ivy.xml 2008-11-05 10:23:39 UTC (rev 7150) +++ trunk/core/testharness/ivy.xml 2008-11-05 11:30:39 UTC (rev 7151) @@ -59,7 +59,7 @@ <dependency org="log4j" name="log4j" rev="${log4j.version}" - conf="test-helpers->default" + conf="test-helpers->master" /> <!--it is essential that only the master JAR of commons logging is pulled in, as its dependencies are usually a mess, including things This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-11-05 15:05:10
|
Revision: 7155 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7155&view=rev Author: steve_l Date: 2008-11-05 15:04:57 +0000 (Wed, 05 Nov 2008) Log Message: ----------- SFOS-1021 Bring Hadoop into the main build Modified Paths: -------------- trunk/core/components/hadoop/ivy.xml trunk/core/components/libraries.properties trunk/core/release/build.xml trunk/core/release/metadata/rpm/smartfrog.spec Modified: trunk/core/components/hadoop/ivy.xml =================================================================== --- trunk/core/components/hadoop/ivy.xml 2008-11-05 12:57:09 UTC (rev 7154) +++ trunk/core/components/hadoop/ivy.xml 2008-11-05 15:04:57 UTC (rev 7155) @@ -121,25 +121,25 @@ <dependency org="javax.servlet" name="servlet-api" - rev="${servletapi.version}" + rev="${hadoop.servlet-api.version}" conf="server->master"/> <!--pulls in servlet API 2.4--> <dependency org="jetty" name="org.mortbay.jetty" - rev="${jetty5.version}" + rev="${hadoop.jetty.version}" conf="server->master"/> <dependency org="tomcat" name="jasper-runtime" - rev="${jasper.version}" + rev="${hadoop.jasper.version}" conf="server->master"/> <dependency org="tomcat" name="jasper-compiler" - rev="${jasper.version}" + rev="${hadoop.jasper.version}" conf="server->master"/> <dependency org="tomcat" name="jsp-api" - rev="${jsp-api.version}" + rev="${hadoop.jsp-api.version}" conf="server->master"/> <dependency org="commons-el" name="commons-el" Modified: trunk/core/components/libraries.properties =================================================================== --- trunk/core/components/libraries.properties 2008-11-05 12:57:09 UTC (rev 7154) +++ trunk/core/components/libraries.properties 2008-11-05 15:04:57 UTC (rev 7155) @@ -103,4 +103,6 @@ hadoop.version=0.20.0-dev hadoop.jetty.version=5.1.4 hadoop.servlet-api.version=2.4 -hadoop.tomcat.version=5.5.12 \ No newline at end of file +hadoop.tomcat.version=5.5.12 +hadoop.jasper.version=${hadoop.tomcat.version} +hadoop.jsp-api.version=${hadoop.tomcat.version} Modified: trunk/core/release/build.xml =================================================================== --- trunk/core/release/build.xml 2008-11-05 12:57:09 UTC (rev 7154) +++ trunk/core/release/build.xml 2008-11-05 15:04:57 UTC (rev 7155) @@ -481,9 +481,9 @@ <ln artifact="commons-cli" version="${commons-cli.version}"/> <ln artifact="commons-el" version="${commons-el.version}"/> <ln artifact="jets3t" version="${jets3t.version}"/> - <ln artifact="jsp-api" version="${hadoop.tomcat.version}"/> - <ln artifact="jasper-compiler" version="${hadoop.tomcat.version}"/> - <ln artifact="jasper-runtime" version="${hadoop.tomcat.version}"/> + <ln artifact="jsp-api" version="${hadoop.jsp-api.version}"/> + <ln artifact="jasper-compiler" version="${hadoop.jasper.version}"/> + <ln artifact="jasper-runtime" version="${hadoop.jasper.version}"/> <ln artifact="xmlenc" version="${xmlenc.version}"/> <ln artifact="org.mortbay.jetty" version="${hadoop.jetty.version}"/> <!--<ln artifact="servlet-api" version="${hadoop.servletapi.version}"/>--> Modified: trunk/core/release/metadata/rpm/smartfrog.spec =================================================================== --- trunk/core/release/metadata/rpm/smartfrog.spec 2008-11-05 12:57:09 UTC (rev 7154) +++ trunk/core/release/metadata/rpm/smartfrog.spec 2008-11-05 15:04:57 UTC (rev 7155) @@ -734,9 +734,9 @@ %{linkdir}/hadoop-core.jar #Jetty, tomcat and servlet artifacts which can cause trouble -%{libdir}/jsp-api-${hadoop.tomcat.version}.jar -%{libdir}/jasper-compiler-${hadoop.tomcat.version}.jar -%{libdir}/jasper-runtime-${hadoop.tomcat.version}.jar +%{libdir}/jsp-api-${hadoop.jsp-api.version}.jar +%{libdir}/jasper-compiler-${hadoop.jasper.version}.jar +%{libdir}/jasper-runtime-${hadoop.jasper.version}.jar %{linkdir}/jsp-api.jar %{linkdir}/jasper-compiler.jar %{linkdir}/jasper-runtime.jar This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-11-05 17:35:40
|
Revision: 7158 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7158&view=rev Author: steve_l Date: 2008-11-05 17:35:30 +0000 (Wed, 05 Nov 2008) Log Message: ----------- SFOS-1021 Bring Hadoop into the main build -fixing ivy XML files for all hadoop's dependencies Modified Paths: -------------- trunk/core/components/hadoop/ivy.xml trunk/core/release/ivy.xml Modified: trunk/core/components/hadoop/ivy.xml =================================================================== --- trunk/core/components/hadoop/ivy.xml 2008-11-05 17:17:12 UTC (rev 7157) +++ trunk/core/components/hadoop/ivy.xml 2008-11-05 17:35:30 UTC (rev 7158) @@ -5,7 +5,7 @@ <license name="LGPL"/> <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> <description> - Hadoop support + Hadoop support </description> </info> <!-- FIXME: Ivy 1.4.1 buildlist bug @@ -14,87 +14,88 @@ </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" - extends="redist" - description="artifacts needed to compile the application"/> - <conf name="daemon" visibility="private" extends="redist,default" - description="the classpath needed to run smartfrog daemons"/> - <conf name="test" extends="compile,default" - description="the classpath needed to run tests"/> - <conf name="testwar" - description="the test WAR File" visibility="private"/> - <conf name="master" description="contains the artifact but no dependencies"/> - <conf name="hadoop-core" description="contains the hadoop-core dependencies"/> - <conf name="redist" description="redistributals excluding smartfrog artifacts" - extends="hadoop-core,client,server"/> - <conf name="client" description="client-side dependencies" - extends="hadoop-core"/> - <conf name="server" description="server-side dependencies" - extends="hadoop-core"/> - <conf name="runtime" description="runtime but not the artifact" - extends="redist"/> -</configurations> + <conf name="default" extends="master,runtime"/> + <conf name="build" visibility="private" + description="artifacts needed to build the application"/> + <conf name="compile" visibility="private" + extends="redist" + description="artifacts needed to compile the application"/> + <conf name="daemon" visibility="private" extends="redist,default" + description="the classpath needed to run smartfrog daemons"/> + <conf name="test" extends="compile,default" + description="the classpath needed to run tests"/> + <conf name="testwar" + description="the test WAR File" visibility="private"/> + <conf name="master" + description="contains the artifact but no dependencies"/> + <conf name="hadoop-core" + description="contains the hadoop-core dependencies"/> + <conf name="redist" + description="redistributals excluding smartfrog artifacts" + extends="hadoop-core,client,server"/> + <conf name="client" description="client-side dependencies" + extends="hadoop-core"/> + <conf name="server" description="server-side dependencies" + extends="hadoop-core"/> + <conf name="runtime" description="runtime but not the artifact" + extends="redist"/> + <conf name="s3-client" + description="dependencies for working with S3/EC2 infrastructure" + extends="client"/> + <conf name="s3-server" + description="dependencies for running on S3/EC2 infrastructure" + extends="s3-client,server"/> + <conf name="kfs" + description="dependencies for KFS file system support"/> + <conf name="ftp" + description="dependencies for working with FTP file systems"/> + + </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"/> + name="smartfrog" + changing="true" + rev="latest.integration" + conf="compile,runtime,daemon->services"/> <!--we pull in www stuff --> <dependency org="org.smartfrog" - name="sf-www" - changing="true" - rev="latest.integration" - conf="client,server->httpclient"/> - - <!--Jetty 6 cannot be used until Hadoop users it--> - <!--<dependency org="org.smartfrog" - name="sf-jetty" + name="sf-www" changing="true" rev="latest.integration" - conf="runtime->default"/>--> - <!-- + conf="client,server->httpclient"/> - <dependency org="org.smartfrog" - name="sf-xml" - changing="true" - rev="latest.integration" - conf="runtime->default"/> - --> <dependency org="org.smartfrog" - name="sf-loggingservices" - changing="true" - rev="latest.integration" - conf="compile,runtime->default;redist->redist"/> + name="sf-loggingservices" + changing="true" + rev="latest.integration" + conf="compile,runtime->default;redist->redist"/> <dependency org="org.smartfrog" - name="sf-testharness" - changing="true" - rev="latest.integration" - conf="test->default"/> + name="sf-testharness" + changing="true" + rev="latest.integration" + conf="test->default"/> <dependency org="org.smartfrog" - name="sf-tasks" - rev="latest.integration" - changing="true" - conf="build->default"/> + name="sf-tasks" + rev="latest.integration" + changing="true" + conf="build->default"/> <dependency org="org.smartfrog" - name="sf-xunit" - changing="true" - rev="latest.integration" - conf="test->default"/> + name="sf-xunit" + changing="true" + rev="latest.integration" + conf="test->default"/> <dependency org="org.smartfrog" @@ -104,47 +105,82 @@ conf="test->default"/> <dependency org="org.apache.hadoop" - name="hadoop-core" - rev="${hadoop.version}" - changing="true" - conf="redist->default"/> + name="hadoop-core" + rev="${hadoop.version}" + changing="true" + conf="redist->default"/> <dependency org="commons-cli" - name="commons-cli" - rev="${commons-cli.version}" - conf="redist->default"/> + name="commons-cli" + rev="${commons-cli.version}" + conf="redist->default"/> <dependency org="xmlenc" - name="xmlenc" - rev="${xmlenc.version}" - conf="server->default"/> + name="xmlenc" + rev="${xmlenc.version}" + conf="server->default"/> + <!--Jetty 6 cannot be used until Hadoop users it--> + <!--<dependency org="org.smartfrog" + name="sf-jetty" + changing="true" + rev="latest.integration" + conf="runtime->default"/>--> + + <!--Jetty and Servlet dependencies --> <dependency org="javax.servlet" - name="servlet-api" - rev="${hadoop.servlet-api.version}" - conf="server->master"/> + name="servlet-api" + rev="${hadoop.servlet-api.version}" + conf="server->master"/> - <!--pulls in servlet API 2.4--> <dependency org="jetty" - name="org.mortbay.jetty" - rev="${hadoop.jetty.version}" - conf="server->master"/> + name="org.mortbay.jetty" + rev="${hadoop.jetty.version}" + conf="server->master"/> <dependency org="tomcat" - name="jasper-runtime" - rev="${hadoop.jasper.version}" - conf="server->master"/> + name="jasper-runtime" + rev="${hadoop.jasper.version}" + conf="server->master"/> <dependency org="tomcat" - name="jasper-compiler" - rev="${hadoop.jasper.version}" - conf="server->master"/> + name="jasper-compiler" + rev="${hadoop.jasper.version}" + conf="server->master"/> <dependency org="tomcat" - name="jsp-api" - rev="${hadoop.jsp-api.version}" - conf="server->master"/> + name="jsp-api" + rev="${hadoop.jsp-api.version}" + conf="server->master"/> <dependency org="commons-el" - name="commons-el" - rev="${commons-el.version}" - conf="server->master"/> + name="commons-el" + rev="${commons-el.version}" + conf="server->master"/> + <!--Configuration: s3-client --> + <!--there are two jets3t projects in the repository; this one goes up to 0.6 and + is assumed to be the live one--> + <dependency org="net.java.dev.jets3t" + name="jets3t" + rev="${jets3t.version}" + conf="s3-client->master"/> + <dependency org="net.java.dev.jets3t" + name="jets3t" + rev="${jets3t.version}" + conf="s3-client->master"/> + + <!--Configuration: kfs --> + + <!-- This is not in the repository + <dependency org="org.kosmix" + name="kfs" + rev="${kfs.version}" + conf="kfs->default"/>--> + + + <!--to work with ftp:// fileystems, commons-net is needed --> + <dependency org="commons-net" + name="commons-net" + rev="${commons-net.version}" + conf="ftp->default"/> + + </dependencies> </ivy-module> \ No newline at end of file Modified: trunk/core/release/ivy.xml =================================================================== --- trunk/core/release/ivy.xml 2008-11-05 17:17:12 UTC (rev 7157) +++ trunk/core/release/ivy.xml 2008-11-05 17:35:30 UTC (rev 7158) @@ -177,7 +177,7 @@ name="sf-hadoop" changing="true" rev="${ivy.smartfrog.version}" - conf="package-hadoop->master,redist,documentation"/> + conf="package-hadoop->master,redist,documentation,s3-server"/> <!--logging--> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-11-26 16:49:17
|
Revision: 7184 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7184&view=rev Author: steve_l Date: 2008-11-26 16:48:29 +0000 (Wed, 26 Nov 2008) Log Message: ----------- SFOS-1034 Move to Ivy 2.0.0rc2 Modified Paths: -------------- trunk/core/antbuild/xml/ivy-mixin.xml trunk/core/build.xml trunk/core/common.xml Modified: trunk/core/antbuild/xml/ivy-mixin.xml =================================================================== --- trunk/core/antbuild/xml/ivy-mixin.xml 2008-11-26 16:48:04 UTC (rev 7183) +++ trunk/core/antbuild/xml/ivy-mixin.xml 2008-11-26 16:48:29 UTC (rev 7184) @@ -44,7 +44,9 @@ <target name="ivy-init" depends="ivy-init-antlib" > <!--copy ivy artifacts --> <property name="ivy.lib.dir" location="${build.dir}/ivy/lib" /> - <ivy:settings file="${ivy.dir}/ivyconf.xml" override="false"/> + <property name="ivysettings.xml" location="${ivy.dir}/ivysettings.xml"/> + <ivy:configure file="${ivysettings.xml}" override="false"/> + <property name="ivy.artifact.retrieve.pattern" value="[conf]/[artifact]-[revision].[ext]"/> <property name="ivy.publish.pattern" Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2008-11-26 16:48:04 UTC (rev 7183) +++ trunk/core/build.xml 2008-11-26 16:48:29 UTC (rev 7184) @@ -466,7 +466,9 @@ </typedef> <!--create the external dir if it is missing--> <mkdir dir="external" /> - <ivy:settings file="antbuild/ivy/ivyconf.xml" override="true"/> + <property name="ivysettings.xml" location="antbuild/ivy/ivysettings.xml" /> + <property name="root.dir" location="." /> + <ivy:configure file="${ivysettings.xml}" override="true"/> </target> <!-- =================================================================== --> @@ -478,7 +480,7 @@ <target name="ivy-init" depends="ivy-init-antlib" xmlns:ivy="antlib:org.apache.ivy.ant"> <presetdef name="ivy-projects"> - <ivy:buildlist skipbuildwithoutivy="true"> + <ivy:buildlist onMissingDescriptor="skip"> <fileset file="smartfrog/build.xml" /> <fileset file="testharness/build.xml" /> <fileset file="antbuild/build.xml" /> Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2008-11-26 16:48:04 UTC (rev 7183) +++ trunk/core/common.xml 2008-11-26 16:48:29 UTC (rev 7184) @@ -1977,8 +1977,8 @@ <mkdir dir="${ivy.cache.smartfrog.dir}" /> <mkdir dir="${ivy.cache.project.dir}" /> + <property name="ivysettings.xml" location="${core.dir}/antbuild/ivy/ivysettings.xml" /> - <!--first check for ivy being loaded--> <condition property="ivy.tasks.loaded"> <typefound name="retrieve" uri="antlib:org.apache.ivy.ant"/> @@ -2030,7 +2030,7 @@ <target name="maybe-ivy-init" depends="declare-ivy" if="ivy.enabled" > - <ivy:settings file="${core.dir}/antbuild/ivy/ivyconf.xml" override="false"/> + <ivy:configure file="${ivysettings.xml}" override="false"/> </target> <target name="maybe-ivy-resolve" depends="maybe-ivy-init" @@ -2087,7 +2087,7 @@ <target name="ivy-init" depends="maybe-ivy-init" unless="ivy.enabled"> - <ivy:settings file="${core.dir}/antbuild/ivy/ivyconf.xml" override="false"/> + <ivy:configure file="${ivysettings.xml}" override="false"/> </target> <target name="ivy-resolve" depends="maybe-ivy-resolve,ivy-init" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-11-27 17:54:58
|
Revision: 7195 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7195&view=rev Author: steve_l Date: 2008-11-27 17:54:07 +0000 (Thu, 27 Nov 2008) Log Message: ----------- SFOS-1033 Move to Jetty 6.1.14 -and deal with a hadoop that has done so Modified Paths: -------------- trunk/core/components/hadoop/build.xml trunk/core/components/hadoop/ivy.xml trunk/core/components/jetty/ivy.xml trunk/core/components/jetty/project-template.pom trunk/core/components/libraries.properties trunk/core/components/loggingservices/project-template.pom trunk/core/release/build.xml trunk/core/release/ivy.xml trunk/core/release/izpack/smartfrog-install.xml trunk/core/release/metadata/rpm/smartfrog.spec Modified: trunk/core/components/hadoop/build.xml =================================================================== --- trunk/core/components/hadoop/build.xml 2008-11-27 14:31:32 UTC (rev 7194) +++ trunk/core/components/hadoop/build.xml 2008-11-27 17:54:07 UTC (rev 7195) @@ -45,9 +45,11 @@ <property file="build.properties"/> <!--this lets us pick up hadoop version markers from hadoop, overriding anything in components/libraries.properties--> - <property name="hadoop.ivy.dir" location="" /> - <property file="${hadoop.ivy.dir}/libraries.properties" /> + <property name="hadoop.dir" location="" /> + <property file="${hadoop.dir}/build.properties" /> + <property file="${hadoop.dir}/ivy/libraries.properties" /> + <!--system test switch--> <property name="system.tests" value="false"/> Modified: trunk/core/components/hadoop/ivy.xml =================================================================== --- trunk/core/components/hadoop/ivy.xml 2008-11-27 14:31:32 UTC (rev 7194) +++ trunk/core/components/hadoop/ivy.xml 2008-11-27 17:54:07 UTC (rev 7195) @@ -110,7 +110,7 @@ name="hadoop-core" rev="${hadoop.version}" changing="true" - conf="redist->default"/> + conf="redist->master"/> <dependency org="commons-cli" name="commons-cli" @@ -131,33 +131,7 @@ rev="latest.integration" conf="server->default,jsp"/> - <!--Jetty and Servlet dependencies --> -<!-- <dependency org="javax.servlet" - name="servlet-api" - rev="${hadoop.servlet-api.version}" - conf="server->master"/> - <dependency org="jetty" - name="org.mortbay.jetty" - rev="${hadoop.jetty.version}" - conf="server->master"/> - <dependency org="tomcat" - name="jasper-runtime" - rev="${hadoop.jasper.version}" - conf="server->master"/> - <dependency org="tomcat" - name="jasper-compiler" - rev="${hadoop.jasper.version}" - conf="server->master"/> - <dependency org="tomcat" - name="jsp-api" - rev="${hadoop.jsp-api.version}" - conf="server->master"/> - <dependency org="commons-el" - name="commons-el" - rev="${commons-el.version}" - conf="server->master"/>--> - <!--Configuration: s3-client --> <!--there are two jets3t projects in the repository; this one goes up to 0.6 and is assumed to be the live one--> Modified: trunk/core/components/jetty/ivy.xml =================================================================== --- trunk/core/components/jetty/ivy.xml 2008-11-27 14:31:32 UTC (rev 7194) +++ trunk/core/components/jetty/ivy.xml 2008-11-27 17:54:07 UTC (rev 7195) @@ -108,17 +108,5 @@ rev="${org.eclipse.jdt.core.version}" conf="jsp->master"/> - <!--extra Jetty libraries--> - -<!-- - //doesn't parse in Ivy 2.0.0-alpha-2; incompatible pom. - <dependency org="org.slf4j" - name="slf4j-jcl" - rev="${slf4j.version}" - conf="redist->default"/> ---> - - - </dependencies> </ivy-module> \ No newline at end of file Modified: trunk/core/components/jetty/project-template.pom =================================================================== --- trunk/core/components/jetty/project-template.pom 2008-11-27 14:31:32 UTC (rev 7194) +++ trunk/core/components/jetty/project-template.pom 2008-11-27 17:54:07 UTC (rev 7195) @@ -70,5 +70,45 @@ <version>${org.eclipse.jdt.core.version}</version> <optional>true</optional> </dependency> + + + <!-- Jetty is used to serve up the application. It is marked as optional because +clients do not need it. All server-side deployments will need + all of these files.--> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${servletapi.version}</version> + <scope>optional</scope> + </dependency> + <dependency> + <groupId>jetty</groupId> + <artifactId>org.mortbay.jetty</artifactId> + <version>${jetty.version}</version> + <scope>optional</scope> + </dependency> + + + <!--JSP support --> + + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jsp-2.1</artifactId> + <version>${jetty.version}</version> + <scope>optional</scope> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jsp-api-2.1</artifactId> + <version>${jetty.version}</version> + <scope>optional</scope> + </dependency> + <dependency> + <groupId>commons-el</groupId> + <artifactId>commons-el</artifactId> + <version>${commons-el.version}</version> + <scope>optional</scope> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: trunk/core/components/libraries.properties =================================================================== --- trunk/core/components/libraries.properties 2008-11-27 14:31:32 UTC (rev 7194) +++ trunk/core/components/libraries.properties 2008-11-27 17:54:07 UTC (rev 7195) @@ -35,7 +35,7 @@ jetty.version=6.1.14 jetty.jsp.version=2.1 jetty.servlet.version=2.5 -jets3t.version=0.6.0 +jets3t.version=0.6.1 jsch.version=0.1.31 jsp-api.version=2.0 junit3.version=3.8.2 Modified: trunk/core/components/loggingservices/project-template.pom =================================================================== --- trunk/core/components/loggingservices/project-template.pom 2008-11-27 14:31:32 UTC (rev 7194) +++ trunk/core/components/loggingservices/project-template.pom 2008-11-27 17:54:07 UTC (rev 7195) @@ -14,18 +14,80 @@ <description> SmartFrog logging services </description> + + <dependencies> + <!-- always include commons-logging and log4J --> <dependency> <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> + <artifactId>commons-logging</artifactId> <version>${commons-logging.version}</version> + <exclusions> + <exclusion> + <groupId>avalon-framework</groupId> + <artifactId>avalon-framework</artifactId> + </exclusion> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + <exclusion> + <groupId>logkit</groupId> + <artifactId>logkit</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>${log4j.version}</version> + <scope>optional</scope> + <exclusions> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + <exclusion> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jdmk</groupId> + <artifactId>jmxtools</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jmx</groupId> + <artifactId>jmxri</artifactId> + </exclusion> + </exclusions> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jcl</artifactId> + <version>${slf4j.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.smartfrog</groupId> <artifactId>smartfrog</artifactId> <version>${smartfrog.version}</version> Modified: trunk/core/release/build.xml =================================================================== --- trunk/core/release/build.xml 2008-11-27 14:31:32 UTC (rev 7194) +++ trunk/core/release/build.xml 2008-11-27 17:54:07 UTC (rev 7195) @@ -479,14 +479,8 @@ <ln artifact="sf-hadoop" version="${smartfrog.version}"/> <ln artifact="hadoop-core" version="${hadoop.version}"/> <ln artifact="commons-cli" version="${commons-cli.version}"/> - <ln artifact="commons-el" version="${commons-el.version}"/> <ln artifact="jets3t" version="${jets3t.version}"/> - <ln artifact="jsp-api" version="${hadoop.jsp-api.version}"/> - <ln artifact="jasper-compiler" version="${hadoop.jasper.version}"/> - <ln artifact="jasper-runtime" version="${hadoop.jasper.version}"/> <ln artifact="xmlenc" version="${xmlenc.version}"/> -<!-- <ln artifact="org.mortbay.jetty" version="${hadoop.jetty.version}"/>--> - <!--<ln artifact="servlet-api" version="${hadoop.servletapi.version}"/>--> <!-- jmx --> <rpmpackage package="jmx"/> @@ -535,7 +529,7 @@ <ln artifact="sf-junit" version="${smartfrog.version}"/> <ln artifact="junit" version="${junit.version}"/> - + <!--velocity--> <rpmpackage package="velocity"/> <ln artifact="sf-velocity" version="${smartfrog.version}"/> <ln artifact="velocity" version="${velocity.version}"/> @@ -549,15 +543,17 @@ <ln artifact="commons-httpclient" version="${commons-httpclient.version}"/> <ln artifact="commons-codec" version="${commons-codec.version}"/> - - <!--Jetty--> <!--comes in after the www package--> <ln artifact="sf-jetty" version="${smartfrog.version}"/> <ln artifact="jetty" version="${jetty.version}"/> <ln artifact="jetty-util" version="${jetty.version}"/> <ln artifact="servlet-api" version="${servletapi.version}"/> - + <ln artifact="commons-el" version="${commons-el.version}"/> + <ln artifact="jsp-api-2.1" version="${jetty.version}"/> + <ln artifact="jsp-2.1" version="${jetty.version}"/> + <ln artifact="core" version="${org.eclipse.jdt.core.version}"/> + <!-- xml--> <rpmpackage package="xml"/> <ln artifact="sf-xml" version="${smartfrog.version}"/> Modified: trunk/core/release/ivy.xml =================================================================== --- trunk/core/release/ivy.xml 2008-11-27 14:31:32 UTC (rev 7194) +++ trunk/core/release/ivy.xml 2008-11-27 17:54:07 UTC (rev 7195) @@ -242,16 +242,11 @@ changing="true" rev="${ivy.smartfrog.version}" conf="package-www->master,redist,documentation,servletapi"/> -<!-- <dependency org="org.smartfrog" - name="sf-tomcat" - changing="true" - rev="${ivy.smartfrog.version}" - conf="package-www->master,redist,documentation"/>--> <dependency org="org.smartfrog" name="sf-jetty" changing="true" rev="${ivy.smartfrog.version}" - conf="package-www->master,redist"/> + conf="package-www->master,redist,jsp"/> <!-- <dependency org="org.smartfrog" name="sf-cargo" Modified: trunk/core/release/izpack/smartfrog-install.xml =================================================================== --- trunk/core/release/izpack/smartfrog-install.xml 2008-11-27 14:31:32 UTC (rev 7194) +++ trunk/core/release/izpack/smartfrog-install.xml 2008-11-27 17:54:07 UTC (rev 7195) @@ -690,9 +690,6 @@ The bundled libraries are commons-httpclient-${commons-httpclient.version}.jar commons-codec-${commons-codec.version}.jar - servlet-api-${servletapi.version}.jar - jetty-${jetty.version}.jar - jetty-util-${jetty.version}.jar Prerequisite packages: Logging. </description> @@ -705,15 +702,6 @@ <file src="ivy/lib/package-www/sf-www-documentation-${smartfrog.version}.zip" targetdir="$INSTALL_PATH" unpack="true"/> -<!-- <file src="ivy/lib/package-www/sf-tomcat-${smartfrog.version}.jar" - targetdir="$INSTALL_PATH/lib" - /> - <file src="ivy/lib/package-www/sf-tomcat-javadocs-${smartfrog.version}.zip" - targetdir="$INSTALL_PATH" - unpack="true"/> - <file src="ivy/lib/package-www/sf-tomcat-documentation-${smartfrog.version}.zip" - targetdir="$INSTALL_PATH" - unpack="true"/>--> <file src="ivy/lib/package-www/commons-httpclient-${commons-httpclient.version}.jar" targetdir="$INSTALL_PATH/lib" @@ -721,10 +709,20 @@ <file src="ivy/lib/package-www/commons-codec-${commons-codec.version}.jar" targetdir="$INSTALL_PATH/lib" /> + <depends packname="Logging"/> + </pack> + + <pack name="Jetty" required="no" preselected="no"> + <description>Jetty support. + This package contains components to deploy web applications onto Jetty ${jetty.version}. + It also contains the libraries needed to compile and run JSP pages under Jetty + + Prerequisite packages: Logging, Ant, WWW + </description> <file src="ivy/lib/package-www/sf-jetty-${smartfrog.version}.jar" - targetdir="$INSTALL_PATH/lib" - /> + targetdir="$INSTALL_PATH/lib" + /> <file src="ivy/lib/package-www/servlet-api-${servletapi.version}.jar" targetdir="$INSTALL_PATH/lib" /> @@ -734,7 +732,21 @@ <file src="ivy/lib/package-www/jetty-util-${jetty.version}.jar" targetdir="$INSTALL_PATH/lib" /> + <file src="ivy/lib/package-www/jsp-api-2.1-${jetty.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <file src="ivy/lib/package-www/jsp-2.1-${jetty.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <file src="ivy/lib/package-www/commons-el-${commons-el.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <file src="ivy/lib/package-www/core-${org.eclipse.jdt.core.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> <depends packname="Logging"/> + <depends packname="Ant"/> + <depends packname="WWW"/> </pack> <pack name="XML" required="no" preselected="no"> Modified: trunk/core/release/metadata/rpm/smartfrog.spec =================================================================== --- trunk/core/release/metadata/rpm/smartfrog.spec 2008-11-27 14:31:32 UTC (rev 7194) +++ trunk/core/release/metadata/rpm/smartfrog.spec 2008-11-27 17:54:07 UTC (rev 7195) @@ -259,7 +259,7 @@ %package jetty Group: ${rpm.framework} Summary: Jetty integration -Requires: %{name} = %{version}-%{release} , %{name}-logging , %{name}-www +Requires: %{name} = %{version}-%{release} , %{name}-logging , %{name}-www, %{name}-ant Conflicts: %{name}-hadoop %description jetty @@ -731,22 +731,8 @@ %{libdir}/hadoop-core-${hadoop.version}.jar %{linkdir}/hadoop-core.jar -#Jetty, tomcat and servlet artifacts which can cause trouble -%{libdir}/jsp-api-${hadoop.jsp-api.version}.jar -#%{libdir}/jasper-compiler-${hadoop.jasper.version}.jar -#%{libdir}/jasper-runtime-${hadoop.jasper.version}.jar -%{linkdir}/jsp-api.jar -#%{linkdir}/jasper-compiler.jar -#%{linkdir}/jasper-runtime.jar -#%{libdir}/org.mortbay.jetty-${hadoop.jetty.version}.jar -#%{linkdir}/org.mortbay.jetty.jar -#%{libdir}/servlet-api-${hadoop.servlet-api.version}.jar -#%{linkdir}/servlet-api.jar - %{libdir}/commons-cli-${commons-cli.version}.jar %{linkdir}/commons-cli.jar -%{libdir}/commons-el-${commons-el.version}.jar -%{linkdir}/commons-el.jar %{libdir}/jets3t-${jets3t.version}.jar %{linkdir}/jets3t.jar %{libdir}/xmlenc-${xmlenc.version}.jar @@ -764,6 +750,16 @@ %{linkdir}/jetty-util.jar +%{libdir}/jsp-2.1-${jetty.version}.jar +%{linkdir}/jsp-2.1.jar +%{libdir}/jsp-api-2.1-${jetty.version}.jar +%{linkdir}/jsp-api-2.1.jar +%{libdir}/commons-el-${commons-el.version}.jar +%{linkdir}/commons-el.jar +%{libdir}/core-${org.eclipse.jdt.core.version}.jar +%{linkdir}/core.jar + + %files jmx %{libdir}/sf-jmx-${smartfrog.version}.jar This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-12-11 14:26:07
|
Revision: 7228 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7228&view=rev Author: steve_l Date: 2008-12-11 14:25:20 +0000 (Thu, 11 Dec 2008) Log Message: ----------- moving to this week's hadoop Modified Paths: -------------- trunk/core/components/libraries.properties Added Paths: ----------- trunk/core/antbuild/repository/org.apache.hadoop/hadoop-core/0.20.0-alpha-5/ trunk/core/antbuild/repository/org.apache.hadoop/hadoop-core/0.20.0-alpha-5/hadoop-core-0.20.0-alpha-5.jar Removed Paths: ------------- trunk/core/antbuild/repository/hadoop/hadoop-core/0.16.2/hadoop-core-0.16.2.jar trunk/core/antbuild/repository/hadoop/hadoop-core/0.16.2/hadoop-core-0.16.2.pom trunk/core/antbuild/repository/hadoop/hadoop-core/0.16.3/hadoop-core-0.16.3.jar trunk/core/antbuild/repository/hadoop/hadoop-core/0.16.3/hadoop-core-0.16.3.pom trunk/core/antbuild/repository/hadoop/hadoop-core/0.18.0-dev/hadoop-core-0.18.0-dev.jar trunk/core/antbuild/repository/hadoop/hadoop-core/0.20.0-dev/hadoop-core-0.20.0-dev.jar Deleted: trunk/core/antbuild/repository/hadoop/hadoop-core/0.16.2/hadoop-core-0.16.2.jar =================================================================== (Binary files differ) Deleted: trunk/core/antbuild/repository/hadoop/hadoop-core/0.16.2/hadoop-core-0.16.2.pom =================================================================== --- trunk/core/antbuild/repository/hadoop/hadoop-core/0.16.2/hadoop-core-0.16.2.pom 2008-12-11 10:18:03 UTC (rev 7227) +++ trunk/core/antbuild/repository/hadoop/hadoop-core/0.16.2/hadoop-core-0.16.2.pom 2008-12-11 14:25:20 UTC (rev 7228) @@ -1,137 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <!-- - This POM is released under the Apache License, Version 2.0 - --> - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <packaging>jar</packaging> - <version>0.16.2</version> - <description> - Hadoop is the distributed computing framework of Apache; hadoop-core contains - the filesystem, job tracker and map/reduce modules - </description> - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <url>http://apache.org/licenses/LICENSE-2.0</url> - </license> - </licenses> - <dependencies> - - - <!-- always include commons-logging and log4J --> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - <exclusions> - <exclusion> - <groupId>avalon-framework</groupId> - <artifactId>avalon-framework</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - <exclusion> - <groupId>logkit</groupId> - <artifactId>logkit</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.12.13</version> - <scope>optional</scope> - </dependency> - - <!--Httpclient and its components are optional--> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - <scope>optional</scope> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.3</version> - <scope>optional</scope> - </dependency> - - <!--CLI is needed to scan the command line, but only the 1.0 branch is released --> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>2.0-20070823</version> - <scope>optional</scope> - </dependency> - - <!-- JetS3t is a client library for S3. - -It is only needed if you want to work with S3 filesystems - -It pulls in commons-logging 1.1.1 and does not exclude all the cruft that comes with it. - By excluding it we stay in control of versions and dependencies - --> - - <dependency> - <groupId>net.java.dev.jets3t</groupId> - <artifactId>jets3t</artifactId> - <version>0.5.0</version> - <scope>optional</scope> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - - <!--Kosmos filesystem - http://kosmosfs.sourceforge.net/ - This is not in the central repository - --> - <!-- - <dependency> - <groupId>org.kosmix</groupId> - <artifactId>kfs</artifactId> - <version>0.1</version> - <scope>optional</scope> - </dependency> - --> - - <!-- - http://xmlenc.sourceforge.net/ - "The xmlenc library is a fast stream-based XML output library for Java." - --> - <dependency> - <groupId>xmlenc</groupId> - <artifactId>xmlenc</artifactId> - <version>0.52</version> - <scope>optional</scope> - </dependency> - </dependencies> -</project> \ No newline at end of file Deleted: trunk/core/antbuild/repository/hadoop/hadoop-core/0.16.3/hadoop-core-0.16.3.jar =================================================================== (Binary files differ) Deleted: trunk/core/antbuild/repository/hadoop/hadoop-core/0.16.3/hadoop-core-0.16.3.pom =================================================================== --- trunk/core/antbuild/repository/hadoop/hadoop-core/0.16.3/hadoop-core-0.16.3.pom 2008-12-11 10:18:03 UTC (rev 7227) +++ trunk/core/antbuild/repository/hadoop/hadoop-core/0.16.3/hadoop-core-0.16.3.pom 2008-12-11 14:25:20 UTC (rev 7228) @@ -1,137 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <!-- - This POM is released under the Apache License, Version 2.0 - --> - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <packaging>jar</packaging> - <version>0.16.3</version> - <description> - Hadoop is the distributed computing framework of Apache; hadoop-core contains - the filesystem, job tracker and map/reduce modules - </description> - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <url>http://apache.org/licenses/LICENSE-2.0</url> - </license> - </licenses> - <dependencies> - - - <!-- always include commons-logging and log4J --> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - <exclusions> - <exclusion> - <groupId>avalon-framework</groupId> - <artifactId>avalon-framework</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - <exclusion> - <groupId>logkit</groupId> - <artifactId>logkit</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.12.13</version> - <scope>optional</scope> - </dependency> - - <!--Httpclient and its components are optional--> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - <scope>optional</scope> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.3</version> - <scope>optional</scope> - </dependency> - - <!--CLI is needed to scan the command line, but only the 1.0 branch is released --> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>2.0-20070823</version> - <scope>optional</scope> - </dependency> - - <!-- JetS3t is a client library for S3. - -It is only needed if you want to work with S3 filesystems - -It pulls in commons-logging 1.1.1 and does not exclude all the cruft that comes with it. - By excluding it we stay in control of versions and dependencies - --> - - <dependency> - <groupId>net.java.dev.jets3t</groupId> - <artifactId>jets3t</artifactId> - <version>0.5.0</version> - <scope>optional</scope> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - - <!--Kosmos filesystem - http://kosmosfs.sourceforge.net/ - This is not in the central repository - --> - <!-- - <dependency> - <groupId>org.kosmix</groupId> - <artifactId>kfs</artifactId> - <version>0.1</version> - <scope>optional</scope> - </dependency> - --> - - <!-- - http://xmlenc.sourceforge.net/ - "The xmlenc library is a fast stream-based XML output library for Java." - --> - <dependency> - <groupId>xmlenc</groupId> - <artifactId>xmlenc</artifactId> - <version>0.52</version> - <scope>optional</scope> - </dependency> - </dependencies> -</project> Deleted: trunk/core/antbuild/repository/hadoop/hadoop-core/0.18.0-dev/hadoop-core-0.18.0-dev.jar =================================================================== (Binary files differ) Deleted: trunk/core/antbuild/repository/hadoop/hadoop-core/0.20.0-dev/hadoop-core-0.20.0-dev.jar =================================================================== (Binary files differ) Added: trunk/core/antbuild/repository/org.apache.hadoop/hadoop-core/0.20.0-alpha-5/hadoop-core-0.20.0-alpha-5.jar =================================================================== (Binary files differ) Property changes on: trunk/core/antbuild/repository/org.apache.hadoop/hadoop-core/0.20.0-alpha-5/hadoop-core-0.20.0-alpha-5.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/core/components/libraries.properties =================================================================== --- trunk/core/components/libraries.properties 2008-12-11 10:18:03 UTC (rev 7227) +++ trunk/core/components/libraries.properties 2008-12-11 14:25:20 UTC (rev 7228) @@ -97,7 +97,7 @@ #hadoop artifacts commons-cli.version=2.0-SNAPSHOT -hadoop.version=0.20.0-alpha-4 +hadoop.version=0.20.0-alpha-5 #hadoop.jetty.version=5.1.4 #hadoop.servlet-api.version=2.4 #hadoop.tomcat.version=5.5.12 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-12-12 12:46:22
|
Revision: 7238 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7238&view=rev Author: steve_l Date: 2008-12-12 12:46:11 +0000 (Fri, 12 Dec 2008) Log Message: ----------- SFOS-1042 Release SmartFrog 3.17.004 Modified Paths: -------------- trunk/core/release/doc/announcements/release-template.html trunk/core/release/doc/announcements/release-template.txt trunk/core/release/doc/announcements/release_3.17.004.html trunk/core/release/doc/announcements/release_3.17.004.txt trunk/core/release/doc/creating_release_artifacts.sxw trunk/core/smartfrog/sf-build-version.properties Modified: trunk/core/release/doc/announcements/release-template.html =================================================================== --- trunk/core/release/doc/announcements/release-template.html 2008-12-12 12:40:25 UTC (rev 7237) +++ trunk/core/release/doc/announcements/release-template.html 2008-12-12 12:46:11 UTC (rev 7238) @@ -266,106 +266,6 @@ <h3>Changes since last release</h3> - -<h4> Bug -</h4> -<ul> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-443'>SFOS-443</a>] - sfStopDaemon doesnt pick up SFHOME in RPM uninstall -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-991'>SFOS-991</a>] - ClassCastException in AntProject in Hudson Tests -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-992'>SFOS-992</a>] - sourceforge have taken shell.sf.net away -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1004'>SFOS-1004</a>] - Hadoop services leak if the component is terminated while the service is starting up -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1008'>SFOS-1008</a>] - TaskTracker isn't starting/stopping right -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1012'>SFOS-1012</a>] - JobTracker is getting its URIs for the fileystem wrong -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1015'>SFOS-1015</a>] - Some of the cluster tests aren't shutting down the hdfs -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1026'>SFOS-1026</a>] - Trackers need a cluster around before they come up reliably -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1036'>SFOS-1036</a>] - jetty build warns of deprecated methods in Jetty 6.1.14 -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1037'>SFOS-1037</a>] - build failing as dependencies in hadoop component are wrong -</li> -</ul> - -<h4> Improvement -</h4> -<ul> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1002'>SFOS-1002</a>] - look at workflow classes and clean code up a bit -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1007'>SFOS-1007</a>] - Add ability of namenode and datanodes to delete test dirs when closing the service -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1009'>SFOS-1009</a>] - clean up some name accessors -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1011'>SFOS-1011</a>] - Have hadoop IsServiceLive condition get the string description of a service and add it as an attribute -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1014'>SFOS-1014</a>] - move from Throwable.getMessage() to Throwable.toString() in hadoop code -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1016'>SFOS-1016</a>] - Catch System.exit() calls in third party libraries through a new SecurityManager -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1017'>SFOS-1017</a>] - Move to Log4J 1.12.15 -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1018'>SFOS-1018</a>] - Split smartfrog-www RPM into smartfrog-www and smartfrog-jetty -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1023'>SFOS-1023</a>] - produce better test termination message when a child terminates normally (and it was not meant to) -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1029'>SFOS-1029</a>] - Add configuration options to Jetty's SelectChannelConnector -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1034'>SFOS-1034</a>] - Move to Ivy 2.0.0rc2 -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1045'>SFOS-1045</a>] - have the TextFile component attempt to create the parent directory if it does not exist -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1046'>SFOS-1046</a>] - assert component should go case insensitive in the EN_US locale always -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1047'>SFOS-1047</a>] - add rpmtools RPM -</li> -</ul> - -<h4> New Feature -</h4> -<ul> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-149'>SFOS-149</a>] - Add a component to deploy every .sf file in a well known directory -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-624'>SFOS-624</a>] - Allow RPM-installed SmartFrog to create new RPMs containing signed/customised artifacts -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-654'>SFOS-654</a>] - Create a chmod component. -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1003'>SFOS-1003</a>] - Add a TimeoutInterval class to manage timeouts more cleanly -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1019'>SFOS-1019</a>] - Add smartfrog-hadoop RPM that contains all the artifacts needed to bring up Hadoop under SmartFrog -</li> -</ul> - -<h4> Task -</h4> -<ul> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-85'>SFOS-85</a>] - Updated language documentation -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-505'>SFOS-505</a>] - Move up to jsch 0.1.38 -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-547'>SFOS-547</a>] - move up to log4j 1.12.15 -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-827'>SFOS-827</a>] - Upgrade IVY to 2.0 Beta 2 -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1032'>SFOS-1032</a>] - Update Ant library version to Ant 1.7.1 -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1033'>SFOS-1033</a>] - Move to Jetty 6.1.14 -</li> -</ul> - -<h4> Sub-task -</h4> -<ul> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-474'>SFOS-474</a>] - add SLF4J support to logging services -</li> -<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-789'>SFOS-789</a>] - write component to start hadoop task tracker in-VM -</li> -</ul> - </body> </html> Modified: trunk/core/release/doc/announcements/release-template.txt =================================================================== --- trunk/core/release/doc/announcements/release-template.txt 2008-12-12 12:40:25 UTC (rev 7237) +++ trunk/core/release/doc/announcements/release-template.txt 2008-12-12 12:46:11 UTC (rev 7238) @@ -143,57 +143,5 @@ ========================== -Release Notes - SmartFrog - Version 3.17.004 -** Bug - * [SFOS-443] - sfStopDaemon doesnt pick up SFHOME in RPM uninstall - * [SFOS-991] - ClassCastException in AntProject in Hudson Tests - * [SFOS-992] - sourceforge have taken shell.sf.net away - * [SFOS-1004] - Hadoop services leak if the component is terminated while the service is starting up - * [SFOS-1008] - TaskTracker isn't starting/stopping right - * [SFOS-1012] - JobTracker is getting its URIs for the fileystem wrong - * [SFOS-1015] - Some of the cluster tests aren't shutting down the hdfs - * [SFOS-1026] - Trackers need a cluster around before they come up reliably - * [SFOS-1036] - jetty build warns of deprecated methods in Jetty 6.1.14 - * [SFOS-1037] - build failing as dependencies in hadoop component are wrong - - -** Improvement - * [SFOS-1002] - look at workflow classes and clean code up a bit - * [SFOS-1007] - Add ability of namenode and datanodes to delete test dirs when closing the service - * [SFOS-1009] - clean up some name accessors - * [SFOS-1011] - Have hadoop IsServiceLive condition get the string description of a service and add it as an attribute - * [SFOS-1014] - move from Throwable.getMessage() to Throwable.toString() in hadoop code - * [SFOS-1016] - Catch System.exit() calls in third party libraries through a new SecurityManager - * [SFOS-1017] - Move to Log4J 1.12.15 - * [SFOS-1018] - Split smartfrog-www RPM into smartfrog-www and smartfrog-jetty - * [SFOS-1023] - produce better test termination message when a child terminates normally (and it was not meant to) - * [SFOS-1029] - Add configuration options to Jetty's SelectChannelConnector - * [SFOS-1034] - Move to Ivy 2.0.0rc2 - * [SFOS-1045] - have the TextFile component attempt to create the parent directory if it does not exist - * [SFOS-1046] - assert component should go case insensitive in the EN_US locale always - * [SFOS-1047] - add rpmtools RPM - -** New Feature - * [SFOS-149] - Add a component to deploy every .sf file in a well known directory - * [SFOS-624] - Allow RPM-installed SmartFrog to create new RPMs containing signed/customised artifacts - * [SFOS-654] - Create a chmod component. - * [SFOS-1003] - Add a TimeoutInterval class to manage timeouts more cleanly - * [SFOS-1019] - Add smartfrog-hadoop RPM that contains all the artifacts needed to bring up Hadoop under SmartFrog - - -** Task - * [SFOS-85] - Updated language documentation - * [SFOS-505] - Move up to jsch 0.1.38 - * [SFOS-547] - move up to log4j 1.12.15 - * [SFOS-827] - Upgrade IVY to 2.0 Beta 2 - * [SFOS-1032] - Update Ant library version to Ant 1.7.1 - * [SFOS-1033] - Move to Jetty 6.1.14 - -** Sub-task - * [SFOS-474] - add SLF4J support to logging services - * [SFOS-789] - write component to start hadoop task tracker in-VM - - - Modified: trunk/core/release/doc/announcements/release_3.17.004.html =================================================================== --- trunk/core/release/doc/announcements/release_3.17.004.html 2008-12-12 12:40:25 UTC (rev 7237) +++ trunk/core/release/doc/announcements/release_3.17.004.html 2008-12-12 12:46:11 UTC (rev 7238) @@ -265,7 +265,104 @@ <h3>Changes since last release</h3> - +<h4> Bug +</h4> +<ul> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-443'>SFOS-443</a>] - sfStopDaemon doesnt pick up SFHOME in RPM uninstall +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-991'>SFOS-991</a>] - ClassCastException in AntProject in Hudson Tests +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-992'>SFOS-992</a>] - sourceforge have taken shell.sf.net away +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1004'>SFOS-1004</a>] - Hadoop services leak if the component is terminated while the service is starting up +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1008'>SFOS-1008</a>] - TaskTracker isn't starting/stopping right +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1012'>SFOS-1012</a>] - JobTracker is getting its URIs for the fileystem wrong +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1015'>SFOS-1015</a>] - Some of the cluster tests aren't shutting down the hdfs +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1026'>SFOS-1026</a>] - Trackers need a cluster around before they come up reliably +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1036'>SFOS-1036</a>] - jetty build warns of deprecated methods in Jetty 6.1.14 +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1037'>SFOS-1037</a>] - build failing as dependencies in hadoop component are wrong +</li> +</ul> + +<h4> Improvement +</h4> +<ul> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1002'>SFOS-1002</a>] - look at workflow classes and clean code up a bit +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1007'>SFOS-1007</a>] - Add ability of namenode and datanodes to delete test dirs when closing the service +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1009'>SFOS-1009</a>] - clean up some name accessors +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1011'>SFOS-1011</a>] - Have hadoop IsServiceLive condition get the string description of a service and add it as an attribute +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1014'>SFOS-1014</a>] - move from Throwable.getMessage() to Throwable.toString() in hadoop code +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1016'>SFOS-1016</a>] - Catch System.exit() calls in third party libraries through a new SecurityManager +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1017'>SFOS-1017</a>] - Move to Log4J 1.12.15 +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1018'>SFOS-1018</a>] - Split smartfrog-www RPM into smartfrog-www and smartfrog-jetty +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1023'>SFOS-1023</a>] - produce better test termination message when a child terminates normally (and it was not meant to) +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1029'>SFOS-1029</a>] - Add configuration options to Jetty's SelectChannelConnector +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1034'>SFOS-1034</a>] - Move to Ivy 2.0.0rc2 +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1045'>SFOS-1045</a>] - have the TextFile component attempt to create the parent directory if it does not exist +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1046'>SFOS-1046</a>] - assert component should go case insensitive in the EN_US locale always +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1047'>SFOS-1047</a>] - add rpmtools RPM +</li> +</ul> + +<h4> New Feature +</h4> +<ul> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-149'>SFOS-149</a>] - Add a component to deploy every .sf file in a well known directory +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-624'>SFOS-624</a>] - Allow RPM-installed SmartFrog to create new RPMs containing signed/customised artifacts +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-654'>SFOS-654</a>] - Create a chmod component. +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1003'>SFOS-1003</a>] - Add a TimeoutInterval class to manage timeouts more cleanly +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1019'>SFOS-1019</a>] - Add smartfrog-hadoop RPM that contains all the artifacts needed to bring up Hadoop under SmartFrog +</li> +</ul> + +<h4> Task +</h4> +<ul> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-85'>SFOS-85</a>] - Updated language documentation +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-505'>SFOS-505</a>] - Move up to jsch 0.1.38 +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-547'>SFOS-547</a>] - move up to log4j 1.12.15 +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-827'>SFOS-827</a>] - Upgrade IVY to 2.0 Beta 2 +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1032'>SFOS-1032</a>] - Update Ant library version to Ant 1.7.1 +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1033'>SFOS-1033</a>] - Move to Jetty 6.1.14 +</li> +</ul> + +<h4> Sub-task +</h4> +<ul> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-474'>SFOS-474</a>] - add SLF4J support to logging services +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-789'>SFOS-789</a>] - write component to start hadoop task tracker in-VM +</li> +</ul> </body> </html> Modified: trunk/core/release/doc/announcements/release_3.17.004.txt =================================================================== --- trunk/core/release/doc/announcements/release_3.17.004.txt 2008-12-12 12:40:25 UTC (rev 7237) +++ trunk/core/release/doc/announcements/release_3.17.004.txt 2008-12-12 12:46:11 UTC (rev 7238) @@ -143,5 +143,57 @@ ========================== +Release Notes - SmartFrog - Version 3.17.004 +** Bug + * [SFOS-443] - sfStopDaemon doesnt pick up SFHOME in RPM uninstall + * [SFOS-991] - ClassCastException in AntProject in Hudson Tests + * [SFOS-992] - sourceforge have taken shell.sf.net away + * [SFOS-1004] - Hadoop services leak if the component is terminated while the service is starting up + * [SFOS-1008] - TaskTracker isn't starting/stopping right + * [SFOS-1012] - JobTracker is getting its URIs for the fileystem wrong + * [SFOS-1015] - Some of the cluster tests aren't shutting down the hdfs + * [SFOS-1026] - Trackers need a cluster around before they come up reliably + * [SFOS-1036] - jetty build warns of deprecated methods in Jetty 6.1.14 + * [SFOS-1037] - build failing as dependencies in hadoop component are wrong + + +** Improvement + * [SFOS-1002] - look at workflow classes and clean code up a bit + * [SFOS-1007] - Add ability of namenode and datanodes to delete test dirs when closing the service + * [SFOS-1009] - clean up some name accessors + * [SFOS-1011] - Have hadoop IsServiceLive condition get the string description of a service and add it as an attribute + * [SFOS-1014] - move from Throwable.getMessage() to Throwable.toString() in hadoop code + * [SFOS-1016] - Catch System.exit() calls in third party libraries through a new SecurityManager + * [SFOS-1017] - Move to Log4J 1.12.15 + * [SFOS-1018] - Split smartfrog-www RPM into smartfrog-www and smartfrog-jetty + * [SFOS-1023] - produce better test termination message when a child terminates normally (and it was not meant to) + * [SFOS-1029] - Add configuration options to Jetty's SelectChannelConnector + * [SFOS-1034] - Move to Ivy 2.0.0rc2 + * [SFOS-1045] - have the TextFile component attempt to create the parent directory if it does not exist + * [SFOS-1046] - assert component should go case insensitive in the EN_US locale always + * [SFOS-1047] - add rpmtools RPM + +** New Feature + * [SFOS-149] - Add a component to deploy every .sf file in a well known directory + * [SFOS-624] - Allow RPM-installed SmartFrog to create new RPMs containing signed/customised artifacts + * [SFOS-654] - Create a chmod component. + * [SFOS-1003] - Add a TimeoutInterval class to manage timeouts more cleanly + * [SFOS-1019] - Add smartfrog-hadoop RPM that contains all the artifacts needed to bring up Hadoop under SmartFrog + + +** Task + * [SFOS-85] - Updated language documentation + * [SFOS-505] - Move up to jsch 0.1.38 + * [SFOS-547] - move up to log4j 1.12.15 + * [SFOS-827] - Upgrade IVY to 2.0 Beta 2 + * [SFOS-1032] - Update Ant library version to Ant 1.7.1 + * [SFOS-1033] - Move to Jetty 6.1.14 + +** Sub-task + * [SFOS-474] - add SLF4J support to logging services + * [SFOS-789] - write component to start hadoop task tracker in-VM + + + Modified: trunk/core/release/doc/creating_release_artifacts.sxw =================================================================== (Binary files differ) Modified: trunk/core/smartfrog/sf-build-version.properties =================================================================== --- trunk/core/smartfrog/sf-build-version.properties 2008-12-12 12:40:25 UTC (rev 7237) +++ trunk/core/smartfrog/sf-build-version.properties 2008-12-12 12:46:11 UTC (rev 7238) @@ -1,8 +1,8 @@ # SmartFrog release properties used during build process sf.majorRelease=3 sf.minorRelease=17 -sf.build=004 -sf.status= -#sf.status=dev +sf.build=005 +#sf.status= +sf.status=dev sf.svn.lastchangeddate=$LastChangedDate$ sf.svn.revision=$Revision$ \ 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...> - 2009-01-09 16:54:59
|
Revision: 7252 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7252&view=rev Author: steve_l Date: 2009-01-09 16:54:04 +0000 (Fri, 09 Jan 2009) Log Message: ----------- SFOS-1040 Create a hadoop-cluster component that includes everything needed to run hadoop on a real or virtual cluster Modified Paths: -------------- trunk/core/extras/hadoop-cluster/build.xml trunk/core/extras/hadoop-cluster/ivy.xml trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/cluster.sf trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/hadoop.sf trunk/core/extras/hadoop-cluster/test/org/smartfrog/extras/hadoop/cluster/test/system/ClusterTest.java trunk/core/release/metadata/servers/rpm.centos.properties Added Paths: ----------- trunk/core/extras/hadoop-cluster/build.properties Added: trunk/core/extras/hadoop-cluster/build.properties =================================================================== --- trunk/core/extras/hadoop-cluster/build.properties (rev 0) +++ trunk/core/extras/hadoop-cluster/build.properties 2009-01-09 16:54:04 UTC (rev 7252) @@ -0,0 +1,6 @@ +#vmware.image=192.168.174.130 +vmware.image=127.0.0.1 +namenode=${vmware.image} +datanode=${vmware.image} +tasktracker=${vmware.image} +jobtracker=${vmware.image} \ No newline at end of file Modified: trunk/core/extras/hadoop-cluster/build.xml =================================================================== --- trunk/core/extras/hadoop-cluster/build.xml 2009-01-08 18:04:17 UTC (rev 7251) +++ trunk/core/extras/hadoop-cluster/build.xml 2009-01-09 16:54:04 UTC (rev 7252) @@ -60,4 +60,53 @@ </target> + <!-- ========================================================== --> + <!-- deploy; requires a host --> + <!-- ========================================================== --> + <target name="ready-to-deploy" depends="common.ready-to-deploy" + description="deploy a namenode"> + + + <echo level="verbose">tests.run.classpath=${toString:tests.run.classpath}</echo> + <presetdef name="hadoop" > + <sf-deploy classpathref="tests.run.classpath" + logStackTraces="true" + host="${namenode}" + timeout="30000" + > + <codebase url="${codebase}"/> + <syspropertyset> + <propertyref prefix="test."/> + </syspropertyset> + </sf-deploy> + </presetdef> + </target> + + <!-- ========================================================== --> + <!-- deploy; requires a host --> + <!-- ========================================================== --> + <target name="cluster" depends="ready-to-deploy" + description="deploy a cluster"> + <hadoop> + <application name="cluster" + descriptor="/${cluster.sf}"/> + </hadoop> + </target> + + <target name="namenode" depends="ready-to-deploy" + description="deploy a namenode"> + <hadoop> + <application name="namenode" + descriptor="/org/smartfrog/extras/hadoop/cluster/services/namenode/default.sf"/> + </hadoop> + </target> + + <target name="datanode" depends="ready-to-deploy" + description="deploy a namenode"> + <hadoop> + <application name="datanode" + descriptor="/org/smartfrog/extras/hadoop/cluster/services/datanode/default.sf"/> + </hadoop> + </target> + </project> \ No newline at end of file Modified: trunk/core/extras/hadoop-cluster/ivy.xml =================================================================== --- trunk/core/extras/hadoop-cluster/ivy.xml 2009-01-08 18:04:17 UTC (rev 7251) +++ trunk/core/extras/hadoop-cluster/ivy.xml 2009-01-09 16:54:04 UTC (rev 7252) @@ -63,12 +63,15 @@ name="sf-anubis" changing="true" rev="latest.integration" conf="runtime->default"/> - <dependency org="org.smartfrog" + name="sf-csvfiles" changing="true" + rev="latest.integration" + conf="runtime->default"/> + <dependency org="org.smartfrog" name="sf-hadoop" changing="true" rev="latest.integration" - conf="runtime->server"/> + conf="runtime->server,default"/> <dependency org="org.smartfrog" name="sf-rpmtools" changing="true" Modified: trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/cluster.sf =================================================================== --- trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/cluster.sf 2009-01-08 18:04:17 UTC (rev 7251) +++ trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/cluster.sf 2009-01-09 16:54:04 UTC (rev 7252) @@ -30,11 +30,10 @@ } -/* datanode extends ClusterDataNodeCompound { } - */ + /* jobTracker extends ClusterJobTrackerCompound { @@ -49,3 +48,5 @@ */ } + +sfConfig extends HadoopCluster; \ No newline at end of file Modified: trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/hadoop.sf =================================================================== --- trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/hadoop.sf 2009-01-08 18:04:17 UTC (rev 7251) +++ trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/hadoop.sf 2009-01-09 16:54:04 UTC (rev 7252) @@ -38,21 +38,33 @@ } -ClusterDataNodeCompound extends TransientDataNodeCompound, Bindings { - jobtracker:mapred.job.tracker.handler.count threads; -} -ClusterNameNodeCompound extends TransientDataNodeCompound, Bindings { +ClusterNameNodeCompound extends TransientNameNodeCompound{ + threads WORKER_THREADS; + fs.default.name namenode.filesystem; namenode:dfs.datanode.handler.count threads; + namenode:checkRunning false; } -ClusterJobTrackerCompound extends TransientJobTrackerCompound, Bindings { +ClusterDataNodeCompound extends TransientDataNodeCompound { + threads WORKER_THREADS; + fs.default.name namenode.filesystem; + //datanode:mapred.job.tracker.handler.count threads; +} +/* + +ClusterJobTrackerCompound extends TransientJobTrackerCompound { + threads WORKER_THREADS; + fs.default.name namenode.filesystem; jobtracker:mapred.job.tracker.handler.count threads; } -ClusterTaskTrackerCompound extends TransientJobTrackerCompound, Bindings { +ClusterTaskTrackerCompound extends TransientJobTrackerCompound { + threads WORKER_THREADS; + fs.default.name namenode.filesystem; tasktracker.http.threads threads; } +*/ Modified: trunk/core/extras/hadoop-cluster/test/org/smartfrog/extras/hadoop/cluster/test/system/ClusterTest.java =================================================================== --- trunk/core/extras/hadoop-cluster/test/org/smartfrog/extras/hadoop/cluster/test/system/ClusterTest.java 2009-01-08 18:04:17 UTC (rev 7251) +++ trunk/core/extras/hadoop-cluster/test/org/smartfrog/extras/hadoop/cluster/test/system/ClusterTest.java 2009-01-09 16:54:04 UTC (rev 7252) @@ -19,9 +19,15 @@ */ package org.smartfrog.extras.hadoop.cluster.test.system; +import org.smartfrog.test.DeployingTestBase; + /** * Created 05-Jan-2009 16:12:47 */ -public class ClusterTest { +public class ClusterTest extends DeployingTestBase { + + public ClusterTest(String name) { + super(name); + } } Modified: trunk/core/release/metadata/servers/rpm.centos.properties =================================================================== --- trunk/core/release/metadata/servers/rpm.centos.properties 2009-01-08 18:04:17 UTC (rev 7251) +++ trunk/core/release/metadata/servers/rpm.centos.properties 2009-01-09 16:54:04 UTC (rev 7252) @@ -1,7 +1,7 @@ #This is an example rpm upload target to a nearby vmware image, one with the appropriate ssh keys for root #and the nominated user -rpm.ssh.server=192.168.1.4 +rpm.ssh.server=192.168.174.130 rpm.ssh.user=smartfrog rpm.ssh.keyfile=${user.home}/.ssh/id_rsa rpm.ssh.passphrase= This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-01-23 13:40:20
|
Revision: 7301 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7301&view=rev Author: steve_l Date: 2009-01-23 13:39:36 +0000 (Fri, 23 Jan 2009) Log Message: ----------- SFOS-1035 Add commons-pool and commons-dbcp JARs to sf-database component and RPM Modified Paths: -------------- trunk/core/components/database/ivy.xml trunk/core/release/build.xml trunk/core/release/izpack/smartfrog-install.xml trunk/core/release/metadata/rpm/smartfrog.spec Removed Paths: ------------- trunk/core/release/scripts/ant/ Modified: trunk/core/components/database/ivy.xml =================================================================== --- trunk/core/components/database/ivy.xml 2009-01-23 11:54:22 UTC (rev 7300) +++ trunk/core/components/database/ivy.xml 2009-01-23 13:39:36 UTC (rev 7301) @@ -69,10 +69,17 @@ name="hsqldb" rev="${hsqldb.version}" conf="test->default"/> -<!-- <dependency org="commons-dbutils" - name="commons-dbutils" - rev="${commons-dbutils.version}" - conf="redist->master"/> - --> + <dependency org="commons-dbcp" + name="commons-dbcp" + rev="${commons-dbcp.version}" + conf="redist->master"/> + <dependency org="commons-pool" + name="commons-pool" + rev="${commons-pool.version}" + conf="redist->master"/> + <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/release/build.xml =================================================================== --- trunk/core/release/build.xml 2009-01-23 11:54:22 UTC (rev 7300) +++ trunk/core/release/build.xml 2009-01-23 13:39:36 UTC (rev 7301) @@ -478,6 +478,9 @@ <!-- database --> <rpmpackage package="database"/> <ln artifact="sf-database" version="${smartfrog.version}"/> + <ln artifact="commons-dbcp" version="${commons-dbcp.version}"/> + <ln artifact="commons-pool" version="${commons-pool.version}"/> + <ln artifact="commons-dbutils" version="${commons-dbutils.version}"/> <!-- hadoop --> <rpmpackage package="hadoop"/> Modified: trunk/core/release/izpack/smartfrog-install.xml =================================================================== --- trunk/core/release/izpack/smartfrog-install.xml 2009-01-23 11:54:22 UTC (rev 7300) +++ trunk/core/release/izpack/smartfrog-install.xml 2009-01-23 13:39:36 UTC (rev 7301) @@ -404,8 +404,14 @@ during deployment, or when terminating a deployment. It has special component templates. to start and administer MySQL. + Includes: + commons-dbutils-${commons-dbutils.version}.jar + commons-pool-${commons-pool.version}.jar + commons-dbcp-${commons-dbcp.version}.jar + This package does not include any JDBC drivers. The appropriate JDBC driver for the target system must be installed in order for JDBC connectivity to work. + </description> <file src="ivy/lib/package-database/sf-database-${smartfrog.version}.jar" targetdir="$INSTALL_PATH/lib" @@ -416,6 +422,16 @@ <file src="ivy/lib/package-database/sf-database-documentation-${smartfrog.version}.zip" targetdir="$INSTALL_PATH" unpack="true"/> + + <file src="ivy/lib/package-database/commons-dbutils-${commons-dbutils.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <file src="ivy/lib/package-database/commons-pool-${commons-pool.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <file src="ivy/lib/package-database/commons-dbcp-${commons-dbcp.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> </pack> <pack name="JMX" required="no" preselected="no"> Modified: trunk/core/release/metadata/rpm/smartfrog.spec =================================================================== --- trunk/core/release/metadata/rpm/smartfrog.spec 2009-01-23 11:54:22 UTC (rev 7300) +++ trunk/core/release/metadata/rpm/smartfrog.spec 2009-01-23 13:39:36 UTC (rev 7301) @@ -229,6 +229,10 @@ target system must be installed/added to the sfCodeBase attribute of the components, in order for JDBC connectivity to work. +Includes: +commons-dbutils-${commons-dbutils.version}.jar +commons-pool-${commons-pool.version}.jar +commons-dbcp-${commons-dbcp.version}.jar # ----------------------------------------------------------------------------- @@ -238,7 +242,8 @@ Requires: %{name} = %{version}-%{release} , %{name}-logging , %{name}-www, %{name}-jetty %description hadoop -This includes all the artifacts needed for Apache Hadoop. +This includes all the artifacts needed to bring up a Apache Hadoop cluster with SmartFrog. +It does not contain the Apache Hadoop shell scripts # ----------------------------------------------------------------------------- @@ -735,6 +740,12 @@ %{libdir}/sf-database-${smartfrog.version}.jar %{linkdir}/sf-database.jar +%{libdir}/commons-dbcp-${commons-dbcp.version}.jar +%{linkdir}/commons-dbcp.jar +%{libdir}/commons-pool-${commons-pool.version}.jar +%{linkdir}/commons-pool.jar +%{libdir}/commons-dbutils-${commons-dbutils.version}.jar +%{linkdir}/commons-dbutils.jar %files hadoop %{linkdir}/sf-hadoop.jar This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-01-23 14:07:12
|
Revision: 7302 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7302&view=rev Author: steve_l Date: 2009-01-23 14:06:26 +0000 (Fri, 23 Jan 2009) Log Message: ----------- SFOS-1074 add hadoop bundle to the installer JAR Modified Paths: -------------- trunk/core/components/hadoop/ivy.xml trunk/core/release/izpack/smartfrog-install.xml Modified: trunk/core/components/hadoop/ivy.xml =================================================================== --- trunk/core/components/hadoop/ivy.xml 2009-01-23 13:39:36 UTC (rev 7301) +++ trunk/core/components/hadoop/ivy.xml 2009-01-23 14:06:26 UTC (rev 7302) @@ -58,6 +58,8 @@ <publications> <!--get the artifact from our module name--> <artifact conf="master"/> + <artifact name="sf-hadoop-javadocs" conf="documentation" ext="zip"/> + <artifact name="sf-hadoop-documentation" conf="documentation" ext="zip"/> </publications> <dependencies> <dependency org="org.smartfrog" Modified: trunk/core/release/izpack/smartfrog-install.xml =================================================================== --- trunk/core/release/izpack/smartfrog-install.xml 2009-01-23 13:39:36 UTC (rev 7301) +++ trunk/core/release/izpack/smartfrog-install.xml 2009-01-23 14:06:26 UTC (rev 7302) @@ -434,6 +434,49 @@ /> </pack> + <pack name="Hadoop" required="no" preselected="no"> + <description> + The sf-hadoop package contains the components needed to deploy a Hadoop filesystem + DataNode or NameNode, a MapReduce JobTracker or TaskTracker, and a set of components + to manipulate the filesystem and submit Jobs. It can be used on a server to + provide part of a Hadoop cluster, and on the client to work with a remote cluster. + + Includes: + hadoop-core-${hadoop.version}.jar + commons-cli-${commons-cli.version}.jar + jets3t-${jets3t.version}.jar + xmlenc-${xmlenc.version}.jar + + Prerequisites: Jetty, Logging, WWW, Ant + + </description> + <file src="ivy/lib/package-hadoop/sf-hadoop-${smartfrog.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <file src="ivy/lib/package-hadoop/sf-hadoop-javadocs-${smartfrog.version}.zip" + targetdir="$INSTALL_PATH" + unpack="true"/> + <file src="ivy/lib/package-hadoop/sf-hadoop-documentation-${smartfrog.version}.zip" + targetdir="$INSTALL_PATH" + unpack="true"/> + + <file src="ivy/lib/package-hadoop/hadoop-core-${hadoop.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <file src="ivy/lib/package-hadoop/commons-cli-${commons-cli.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <file src="ivy/lib/package-hadoop/jets3t-${jets3t.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <file src="ivy/lib/package-hadoop/xmlenc-${xmlenc.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <depends packname="Jetty"/> + <depends packname="Logging"/> + <depends packname="Ant"/> + <depends packname="WWW"/> + </pack> <pack name="JMX" required="no" preselected="no"> <description> The sf-jmx package can integrate JMX MBeans with SmartFrog, and This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-01-23 16:53:07
|
Revision: 7306 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7306&view=rev Author: steve_l Date: 2009-01-23 16:52:12 +0000 (Fri, 23 Jan 2009) Log Message: ----------- SFOS-1077 Now that exits are being trapped, wherever in the code we call it intentionally, that operation now fails Modified Paths: -------------- trunk/core/smartfrog/src/org/smartfrog/services/management/SFDeployDisplay.java trunk/core/smartfrog/src/org/smartfrog/sfcore/common/ExitCodes.java trunk/core/smartfrog/src/org/smartfrog/sfcore/security/ExitTrappingSecurityManager.java trunk/core/testharness/testcases/org/smartfrog/test/system/exceptions/JvmExit.java Modified: trunk/core/smartfrog/src/org/smartfrog/services/management/SFDeployDisplay.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/services/management/SFDeployDisplay.java 2009-01-23 16:46:48 UTC (rev 7305) +++ trunk/core/smartfrog/src/org/smartfrog/services/management/SFDeployDisplay.java 2009-01-23 16:52:12 UTC (rev 7306) @@ -386,8 +386,7 @@ if (str != null) { System.err.println(str); } - - System.exit(exitCode); + ExitCodes.exitSilently(exitCode); } Modified: trunk/core/smartfrog/src/org/smartfrog/sfcore/common/ExitCodes.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/sfcore/common/ExitCodes.java 2009-01-23 16:46:48 UTC (rev 7305) +++ trunk/core/smartfrog/src/org/smartfrog/sfcore/common/ExitCodes.java 2009-01-23 16:52:12 UTC (rev 7306) @@ -87,12 +87,21 @@ LogFactory.sfGetProcessLog().debug ("SmartFrog System.Exit code: "+ code + ", v" + Version.versionStringforrelease()); } } catch (Throwable ignored) { /* ignore */ } + exitSilently(code); + } + + /** + * Exits from the system. No log message is printed + * + * @param code integer exit code + */ + public static void exitSilently(int code) { ExitTrappingSecurityManager.setSystemExitPermitted(true); System.exit(code); } /** - * + * the log, creating the process log if needed * @return LogSF */ public static LogSF sfLog() { Modified: trunk/core/smartfrog/src/org/smartfrog/sfcore/security/ExitTrappingSecurityManager.java =================================================================== --- trunk/core/smartfrog/src/org/smartfrog/sfcore/security/ExitTrappingSecurityManager.java 2009-01-23 16:46:48 UTC (rev 7305) +++ trunk/core/smartfrog/src/org/smartfrog/sfcore/security/ExitTrappingSecurityManager.java 2009-01-23 16:52:12 UTC (rev 7306) @@ -29,10 +29,18 @@ private static volatile boolean systemExitPermitted = false; + /** + * Query to see if the security manager permits system exits + * @return true if the system exit is permitted + */ public static boolean isSystemExitPermitted() { return systemExitPermitted; } + /** + * Set the system exit flag + * @param systemExitPermitted true if exit is to be allowed, false otherwise + */ public static void setSystemExitPermitted(boolean systemExitPermitted) { ExitTrappingSecurityManager.systemExitPermitted = systemExitPermitted; } Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/exceptions/JvmExit.java =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/exceptions/JvmExit.java 2009-01-23 16:46:48 UTC (rev 7305) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/exceptions/JvmExit.java 2009-01-23 16:52:12 UTC (rev 7306) @@ -22,6 +22,7 @@ import java.rmi.RemoteException; import org.smartfrog.sfcore.common.SmartFrogException; +import org.smartfrog.sfcore.common.ExitCodes; import org.smartfrog.sfcore.prim.Prim; import org.smartfrog.sfcore.prim.PrimImpl; @@ -47,6 +48,6 @@ public void sfDeploy() throws SmartFrogException, RemoteException { super.sfDeploy(); sfLog().warn("Going to exit...."); - System.exit(10); + ExitCodes.exit(10); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-01-29 15:29:26
|
Revision: 7323 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7323&view=rev Author: steve_l Date: 2009-01-29 15:28:37 +0000 (Thu, 29 Jan 2009) Log Message: ----------- SFOS-1090 Move Hadoop service lifecycle from "terminated" to close; update state diagrams SFOS-788 SFOS-780 write component to submit jobs to a Hadoop cluster Modified Paths: -------------- trunk/core/components/libraries.properties Added Paths: ----------- trunk/core/antbuild/repository/org.apache.hadoop/hadoop-core/0.21.0-alpha-3/ trunk/core/antbuild/repository/org.apache.hadoop/hadoop-core/0.21.0-alpha-3/hadoop-core-0.21.0-alpha-3.jar Added: trunk/core/antbuild/repository/org.apache.hadoop/hadoop-core/0.21.0-alpha-3/hadoop-core-0.21.0-alpha-3.jar =================================================================== (Binary files differ) Property changes on: trunk/core/antbuild/repository/org.apache.hadoop/hadoop-core/0.21.0-alpha-3/hadoop-core-0.21.0-alpha-3.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/core/components/libraries.properties =================================================================== --- trunk/core/components/libraries.properties 2009-01-29 13:06:23 UTC (rev 7322) +++ trunk/core/components/libraries.properties 2009-01-29 15:28:37 UTC (rev 7323) @@ -97,7 +97,7 @@ #hadoop artifacts commons-cli.version=2.0-SNAPSHOT -hadoop.version=0.21.0-alpha-2 +hadoop.version=0.21.0-alpha-3 #hadoop.jetty.version=5.1.4 #hadoop.servlet-api.version=2.4 #hadoop.tomcat.version=5.5.12 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-01-30 16:20:14
|
Revision: 7327 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7327&view=rev Author: steve_l Date: 2009-01-30 16:19:26 +0000 (Fri, 30 Jan 2009) Log Message: ----------- SFOS-1073 Move up to ivy 2.0.0 release Modified Paths: -------------- trunk/core/common.xml trunk/core/components/libraries.properties trunk/core/smartfrog/build.xml Added Paths: ----------- trunk/core/antbuild/ivy/lib/ivy-2.0.0.jar Removed Paths: ------------- trunk/core/antbuild/ivy/lib/ivy-2.0.0-beta2.jar trunk/core/antbuild/ivy/lib/ivy-2.0.0-rc2.jar trunk/core/antbuild/ivy/lib/ivy-2.0.0.rc1_20080519182948.jar Deleted: trunk/core/antbuild/ivy/lib/ivy-2.0.0-beta2.jar =================================================================== (Binary files differ) Deleted: trunk/core/antbuild/ivy/lib/ivy-2.0.0-rc2.jar =================================================================== (Binary files differ) Added: trunk/core/antbuild/ivy/lib/ivy-2.0.0.jar =================================================================== (Binary files differ) Property changes on: trunk/core/antbuild/ivy/lib/ivy-2.0.0.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/core/antbuild/ivy/lib/ivy-2.0.0.rc1_20080519182948.jar =================================================================== (Binary files differ) Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2009-01-29 15:56:29 UTC (rev 7326) +++ trunk/core/common.xml 2009-01-30 16:19:26 UTC (rev 7327) @@ -1944,7 +1944,7 @@ <target name="ivy-properties" depends="init-common-simpledefinitions,load-versions" > - <property name="ivy.version" value="2.0.0-beta1" /> + <property name="ivy.version" value="2.0.0" /> <property name="ivy.dir" location="${build.dir}/ivy" /> <property name="ivy.lib.dir" location="${ivy.dir}/lib" /> <property name="ivy.user.dir" location="${user.home}/.ivy" /> @@ -2135,7 +2135,23 @@ artifactspattern="${dist.lib.dir}/[artifact]-[revision].[ext]" /> </target> + <target name="ivy-warn-no-ivy" depends="ivy-properties" unless="ivy.found"> + <echo level="error"> + No Ivy file found: + ${ivy.jar} + Artifacts created in this build will not be published. + </echo> + </target> + <target name="ivy-require-ivy" depends="ivy-properties" unless="ivy.found"> + <fail> + No Ivy file found: + ${ivy.jar} + Either ivy.version is inconsistent with the artifacts in ${ivy.lib.dir}, or that directory + and/or the file inside it is missing + </fail> + </target> + <!--jars,--> <target name="ready-to-publish" depends="checksum-target-jar,ivy-report"/> Modified: trunk/core/components/libraries.properties =================================================================== --- trunk/core/components/libraries.properties 2009-01-29 15:56:29 UTC (rev 7326) +++ trunk/core/components/libraries.properties 2009-01-30 16:19:26 UTC (rev 7327) @@ -27,7 +27,7 @@ fractal.version=2.0.1 hsqldb.version=1.8.0.7 httpunit.version=1.6.2 -ivy.version=2.0.0-rc2 +ivy.version=2.0.0 izpack.version=3.8.0 javassist.version=3.4.ga jaxen.version=1.1-beta-8 Modified: trunk/core/smartfrog/build.xml =================================================================== --- trunk/core/smartfrog/build.xml 2009-01-29 15:56:29 UTC (rev 7326) +++ trunk/core/smartfrog/build.xml 2009-01-30 16:19:26 UTC (rev 7327) @@ -23,7 +23,7 @@ It requires -Java1.5 or later. -Ant 1.7 or later - -Ivy 2.0 beta 2 or later from ant.apache.org + -Ivy 2.0 or later from ant.apache.org A copy of JavaCC is needed if the language itself is changed. @@ -972,7 +972,7 @@ <target name="ivy-properties" 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.version" value="2.0.0-rc2" /> + <property name="ivy.version" value="2.0.0" /> <property name="ivy.resource" value="fr/jayasoft/ivy/ant/antlib.xml" /> <property name="ivy.reports.dir" location="${ivy.dir}/reports"/> <property name="antbuild.dir" location="../antbuild" /> @@ -996,6 +996,15 @@ </echo> </target> + <target name="ivy-require-ivy" depends="ivy-properties" unless="ivy.found"> + <fail > + No Ivy file found: + ${ivy.jar} + Either ivy.version is inconsistent with the artifacts in ${ivy.lib.dir}, or that directory + and/or the file inside it is missing + </fail> + </target> + <target name="ivy-init" depends="ivy-warn-no-ivy" if="ivy.jar.found" unless="ivy.resource.found"> <typedef uri="antlib:org.apache.ivy.ant" onerror="fail" resource="${ivy.resource}"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-01-30 16:23:52
|
Revision: 7328 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7328&view=rev Author: steve_l Date: 2009-01-30 16:23:06 +0000 (Fri, 30 Jan 2009) Log Message: ----------- SFOS-1040 Create a hadoop-cluster component that includes everything needed to run hadoop on a real or virtual cluster Modified Paths: -------------- trunk/core/components/hadoop/src/org/smartfrog/services/hadoop/components/cluster/HadoopServiceImpl.java trunk/core/components/hadoop/src/org/smartfrog/services/hadoop/examples/lightweight.sf trunk/core/components/junit/ivy.xml trunk/core/components/xunit/ivy.xml trunk/core/extras/hadoop-cluster/ivy.xml trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/cluster.sf trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/hadoop.sf Modified: trunk/core/components/hadoop/src/org/smartfrog/services/hadoop/components/cluster/HadoopServiceImpl.java =================================================================== --- trunk/core/components/hadoop/src/org/smartfrog/services/hadoop/components/cluster/HadoopServiceImpl.java 2009-01-30 16:19:26 UTC (rev 7327) +++ trunk/core/components/hadoop/src/org/smartfrog/services/hadoop/components/cluster/HadoopServiceImpl.java 2009-01-30 16:23:06 UTC (rev 7328) @@ -237,7 +237,7 @@ /** * Get the deployer thread; may be null * - * @return + * @return the thread that is hosting the service */ protected final ServiceDeployerThread getDeployerThread() { return deployerThread; Modified: trunk/core/components/hadoop/src/org/smartfrog/services/hadoop/examples/lightweight.sf =================================================================== --- trunk/core/components/hadoop/src/org/smartfrog/services/hadoop/examples/lightweight.sf 2009-01-30 16:19:26 UTC (rev 7327) +++ trunk/core/components/hadoop/src/org/smartfrog/services/hadoop/examples/lightweight.sf 2009-01-30 16:23:06 UTC (rev 7328) @@ -166,7 +166,7 @@ TransientJobTrackerCompound extends TransientHadoopCompound { description "A job tracker"; - jobTracker extends LightweightJobTracker { + jobtracker extends LightweightJobTracker { fs.default.name PARENT:ATTRIB fs.default.name; dataDir LAZY PARENT:ATTRIB dataDir; dataDirectories [dataDir]; @@ -185,7 +185,7 @@ description "A compound with a task tracker"; - taskTracker extends LightweightTaskTracker { + tasktracker extends LightweightTaskTracker { fs.default.name PARENT:ATTRIB fs.default.name; mapred.job.tracker LAZY PARENT:ATTRIB mapred.job.tracker; //yes, this is milliseconds. But there is a sleep involved too Modified: trunk/core/components/junit/ivy.xml =================================================================== --- trunk/core/components/junit/ivy.xml 2009-01-30 16:19:26 UTC (rev 7327) +++ trunk/core/components/junit/ivy.xml 2009-01-30 16:23:06 UTC (rev 7328) @@ -17,7 +17,7 @@ description="artifacts needed to build the application"/> <conf name="compile" visibility="private" description="artifacts needed to compile the application"/> - <conf name="daemon" visibility="private" + <conf name="daemon" visibility="private" extends="test" description="the classpath needed to run smartfrog daemons"/> <conf name="test" extends="default,compile" description="the classpath needed to run tests"/> Modified: trunk/core/components/xunit/ivy.xml =================================================================== --- trunk/core/components/xunit/ivy.xml 2009-01-30 16:19:26 UTC (rev 7327) +++ trunk/core/components/xunit/ivy.xml 2009-01-30 16:23:06 UTC (rev 7328) @@ -17,7 +17,7 @@ description="artifacts needed to build the application"/> <conf name="compile" visibility="private" extends="antxml" description="artifacts needed to compile the application"/> - <conf name="daemon" visibility="private" + <conf name="daemon" visibility="private" extends="test" description="the classpath needed to run smartfrog daemons"/> <conf name="test" extends="default,compile,antxml" description="the classpath needed to run tests"/> @@ -27,8 +27,6 @@ extends="redist"/> <conf name="antxml" description="extra dependencies for Ant XML output"/> - - <conf name="documentation" description="all documentation artifacts"/> </configurations> Modified: trunk/core/extras/hadoop-cluster/ivy.xml =================================================================== --- trunk/core/extras/hadoop-cluster/ivy.xml 2009-01-30 16:19:26 UTC (rev 7327) +++ trunk/core/extras/hadoop-cluster/ivy.xml 2009-01-30 16:23:06 UTC (rev 7328) @@ -14,29 +14,30 @@ </configurations> --> <configurations defaultconfmapping="default"> - <conf name="default" extends="master,runtime" - description="default configuration contains artifacts and runtime dependencies"/> + <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" + <conf name="daemon" visibility="private" extends="test" description="the classpath needed to run smartfrog daemons"/> - <conf name="test" extends="default,compile" + <conf name="test" extends="default,compile,server" 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="server" description="server-side dependencies" + extends="runtime"/> <conf name="documentation" - description="all documentation artifacts"/> + description="all documentation artifacts"/> </configurations> <publications> <!--get the artifact from our module name--> <artifact conf="master"/> - <artifact name="sf-anubis-javadocs" conf="documentation" ext="zip"/> - <artifact name="sf-anubis-documentation" conf="documentation" ext="zip"/> + <artifact name="sf-hadoop-cluster" conf="documentation" ext="zip"/> + <artifact name="sf-hadoop-cluster" conf="documentation" ext="zip"/> </publications> <dependencies> <dependency org="org.smartfrog" @@ -71,7 +72,7 @@ name="sf-hadoop" changing="true" rev="latest.integration" - conf="runtime->server,default"/> + conf="server->server;compile->default"/> <dependency org="org.smartfrog" name="sf-rpmtools" changing="true" Modified: trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/cluster.sf =================================================================== --- trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/cluster.sf 2009-01-30 16:19:26 UTC (rev 7327) +++ trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/cluster.sf 2009-01-30 16:23:06 UTC (rev 7328) @@ -39,14 +39,12 @@ jobTracker extends ClusterJobTrackerCompound { } -*/ -/* + taskTracker extends ClusterTaskTrackerCompound { - } + }*/ -*/ } sfConfig extends HadoopCluster; \ No newline at end of file Modified: trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/hadoop.sf =================================================================== --- trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/hadoop.sf 2009-01-30 16:19:26 UTC (rev 7327) +++ trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/hadoop.sf 2009-01-30 16:23:06 UTC (rev 7328) @@ -51,7 +51,6 @@ fs.default.name namenode.filesystem; //datanode:mapred.job.tracker.handler.count threads; } -/* ClusterJobTrackerCompound extends TransientJobTrackerCompound { threads WORKER_THREADS; @@ -66,5 +65,4 @@ tasktracker.http.threads threads; } -*/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-02-02 14:41:36
|
Revision: 7330 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7330&view=rev Author: steve_l Date: 2009-02-02 14:22:00 +0000 (Mon, 02 Feb 2009) Log Message: ----------- SFOS-780 weekly merge of my branch with hadoop Modified Paths: -------------- trunk/core/components/libraries.properties Added Paths: ----------- trunk/core/antbuild/repository/org.apache.hadoop/hadoop-core/0.21.0-alpha-4/ trunk/core/antbuild/repository/org.apache.hadoop/hadoop-core/0.21.0-alpha-4/hadoop-core-0.21.0-alpha-4.jar Added: trunk/core/antbuild/repository/org.apache.hadoop/hadoop-core/0.21.0-alpha-4/hadoop-core-0.21.0-alpha-4.jar =================================================================== (Binary files differ) Property changes on: trunk/core/antbuild/repository/org.apache.hadoop/hadoop-core/0.21.0-alpha-4/hadoop-core-0.21.0-alpha-4.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/core/components/libraries.properties =================================================================== --- trunk/core/components/libraries.properties 2009-02-02 14:14:27 UTC (rev 7329) +++ trunk/core/components/libraries.properties 2009-02-02 14:22:00 UTC (rev 7330) @@ -97,7 +97,7 @@ #hadoop artifacts commons-cli.version=2.0-SNAPSHOT -hadoop.version=0.21.0-alpha-3 +hadoop.version=0.21.0-alpha-4 #hadoop.jetty.version=5.1.4 #hadoop.servlet-api.version=2.4 #hadoop.tomcat.version=5.5.12 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-02-03 17:26:22
|
Revision: 7335 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7335&view=rev Author: steve_l Date: 2009-02-03 17:26:17 +0000 (Tue, 03 Feb 2009) Log Message: ----------- SFOS-1096 add test for dfshealth on the filesystem Modified Paths: -------------- trunk/core/components/hadoop/src/org/apache/hadoop/mapred/ExtTaskTracker.java trunk/core/components/hadoop/src/org/smartfrog/services/hadoop/components/other/components.sf trunk/core/components/hadoop/src/org/smartfrog/services/hadoop/examples/lightweight.sf trunk/core/components/hadoop/test/org/smartfrog/services/hadoop/test/system/local/machine/MachineTest.java trunk/core/components/hadoop/test/org/smartfrog/services/hadoop/test/system/local/machine/components.sf trunk/core/extras/hadoop-cluster/build.xml trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/hadoop.sf Added Paths: ----------- trunk/core/components/hadoop/test/org/smartfrog/services/hadoop/test/system/local/machine/testJvmHealth.sf trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/cluster2.sf Modified: trunk/core/components/hadoop/src/org/apache/hadoop/mapred/ExtTaskTracker.java =================================================================== --- trunk/core/components/hadoop/src/org/apache/hadoop/mapred/ExtTaskTracker.java 2009-02-03 16:36:35 UTC (rev 7334) +++ trunk/core/components/hadoop/src/org/apache/hadoop/mapred/ExtTaskTracker.java 2009-02-03 17:26:17 UTC (rev 7335) @@ -33,7 +33,7 @@ import java.util.ArrayList; /** - * Task tracker with some lifecycle support + * Task tracker with some lifecycle support and state information */ public class ExtTaskTracker extends TaskTracker implements ServiceInfo, ConfigurationAttributes { @@ -104,7 +104,12 @@ //@Override public List<BindingTuple> getBindingInformation() { List<BindingTuple> bindings = new ArrayList<BindingTuple>(); - bindings.add(NodeUtils.toBindingTuple(MAPRED_TASK_TRACKER_REPORT_ADDRESS, "http", getTaskTrackerReportAddress())); + bindings.add(NodeUtils.toBindingTuple(MAPRED_TASK_TRACKER_REPORT_ADDRESS, "http", + getTaskTrackerReportAddress())); + bindings.add(new BindingTuple(MAPRED_TASK_TRACKER_HTTP_ADDRESS, + NodeUtils.toURL("http", + getTaskTrackerReportAddress().getHostName(), + getWebPort()))); return bindings; } Modified: trunk/core/components/hadoop/src/org/smartfrog/services/hadoop/components/other/components.sf =================================================================== --- trunk/core/components/hadoop/src/org/smartfrog/services/hadoop/components/other/components.sf 2009-02-03 16:36:35 UTC (rev 7334) +++ trunk/core/components/hadoop/src/org/smartfrog/services/hadoop/components/other/components.sf 2009-02-03 17:26:17 UTC (rev 7335) @@ -36,4 +36,51 @@ ServiceValueChecker extends Prim { sfClass "org.smartfrog.services.hadoop.components.other.ServiceValueCheckerImpl" expectedValues []; -} \ No newline at end of file +} + +CheckJspClasses extends LoadClass { + + classes [ + classname + ]; + create false; + retain false; + message "Failed to load a JSP class. These may not have been compiled in correctly"; + sfShouldTerminate true; +} + +HadoopJspClasses extends CheckJspClasses { + dfshealth "org.apache.hadoop.hdfs.server.namenode.dfshealth_jsp"; + browseBlock "org.apache.hadoop.hdfs.server.datanode.browseBlock_jsp"; + analyseJobHistory "org.apache.hadoop.mapred.analysejobhistory_jsp"; + classes [dfshealth, browseBlock, analyseJobHistory ]; + +} + +CheckNamenodeJspClass extends CheckJspClasses{ + classname HadoopJspClasses:dfshealth; +} + +CheckDatanodeJspClass extends CheckJspClasses{ + classname HadoopJspClasses:browseBlock; +} + +CheckJobtrackerJspClass extends CheckJspClasses{ + classname HadoopJspClasses:analyseJobHistory; +} + + + +/** + * helper component to check that we can load JSP classes + */ +CheckJava6PlusClassesPresent extends LoadClass { + classes [ + "java.net.CookieManager" + ]; + create false; + retain false; + message "Failed to load a Java 6 class. Hadoop requires Java 6 or later"; + sfShouldTerminate true; +} + Modified: trunk/core/components/hadoop/src/org/smartfrog/services/hadoop/examples/lightweight.sf =================================================================== --- trunk/core/components/hadoop/src/org/smartfrog/services/hadoop/examples/lightweight.sf 2009-02-03 16:36:35 UTC (rev 7334) +++ trunk/core/components/hadoop/src/org/smartfrog/services/hadoop/examples/lightweight.sf 2009-02-03 17:26:17 UTC (rev 7335) @@ -192,3 +192,15 @@ } } +/** + * This is either a sequence to check the system is well + */ + + +HealthCheck extends Sequence { + checkNamenodeJspClass CheckNamenodeJspClass; + checkJobtrackerJspClass CheckJobtrackerJspClass; + checkDatanodeJspClass CheckDatanodeJspClass; + checkJspClassesPresent HadoopJspClasses ; + checkJava6PlusClassesPresent CheckJava6PlusClassesPresent; +} \ No newline at end of file Modified: trunk/core/components/hadoop/test/org/smartfrog/services/hadoop/test/system/local/machine/MachineTest.java =================================================================== --- trunk/core/components/hadoop/test/org/smartfrog/services/hadoop/test/system/local/machine/MachineTest.java 2009-02-03 16:36:35 UTC (rev 7334) +++ trunk/core/components/hadoop/test/org/smartfrog/services/hadoop/test/system/local/machine/MachineTest.java 2009-02-03 17:26:17 UTC (rev 7335) @@ -53,4 +53,7 @@ expectSuccessfulTestRunOrSkip(PACKAGE, "testBasicDiskSpaceSkipMissingDir"); } + public void testJvmHealth() throws Throwable { + expectSuccessfulTestRunOrSkip(PACKAGE, "testJvmHealth"); + } } \ No newline at end of file Modified: trunk/core/components/hadoop/test/org/smartfrog/services/hadoop/test/system/local/machine/components.sf =================================================================== --- trunk/core/components/hadoop/test/org/smartfrog/services/hadoop/test/system/local/machine/components.sf 2009-02-03 16:36:35 UTC (rev 7334) +++ trunk/core/components/hadoop/test/org/smartfrog/services/hadoop/test/system/local/machine/components.sf 2009-02-03 17:26:17 UTC (rev 7335) @@ -75,3 +75,8 @@ skipAbsentDirectories true; } } + +testJvmHealth extends ExpectTerminate { + description "check the jvm health"; + action extends HealthCheck; +} Copied: trunk/core/components/hadoop/test/org/smartfrog/services/hadoop/test/system/local/machine/testJvmHealth.sf (from rev 7328, trunk/core/components/hadoop/test/org/smartfrog/services/hadoop/test/system/local/machine/testJasperOnClasspath.sf) =================================================================== --- trunk/core/components/hadoop/test/org/smartfrog/services/hadoop/test/system/local/machine/testJvmHealth.sf (rev 0) +++ trunk/core/components/hadoop/test/org/smartfrog/services/hadoop/test/system/local/machine/testJvmHealth.sf 2009-02-03 17:26:17 UTC (rev 7335) @@ -0,0 +1,28 @@ +/* (C) Copyright 2008 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/hadoop/test/system/local/machine/components.sf" + + +/** + * Test case + */ +sfConfig testJvmHealth ; \ No newline at end of file Property changes on: trunk/core/components/hadoop/test/org/smartfrog/services/hadoop/test/system/local/machine/testJvmHealth.sf ___________________________________________________________________ Added: svn:mergeinfo + Modified: trunk/core/extras/hadoop-cluster/build.xml =================================================================== --- trunk/core/extras/hadoop-cluster/build.xml 2009-02-03 16:36:35 UTC (rev 7334) +++ trunk/core/extras/hadoop-cluster/build.xml 2009-02-03 17:26:17 UTC (rev 7335) @@ -56,7 +56,10 @@ <target name="init" depends="common.init"> <property name="namenode" value="localhost" /> <property name="test.namenode" value="${namenode}" /> - <property name="cluster.sf" value="org/smartfrog/extras/hadoop/cluster/cluster.sf" /> + <property name="cluster" value="org/smartfrog/extras/hadoop/cluster" /> + <property name="cluster.sf" value="${cluster}/cluster.sf" /> + <property name="cluster2.sf" value="${cluster}/cluster2.sf" /> + <property name="deploy.sf" value="${cluster.sf}" /> <property name="deploy.host" value="${namenode}" /> </target> @@ -81,6 +84,14 @@ </deploy> </target> + <target name="cluster2" depends="ready-to-deploy" + description="deploy a forked cluster"> + <deploy> + <application name="cluster" + descriptor="/${cluster2.sf}"/> + </deploy> + </target> + <target name="hdfs" depends="ready-to-deploy" description="deploy a hdfs filesystem"> <deploy> Copied: trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/cluster2.sf (from rev 7333, trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/cluster.sf) =================================================================== --- trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/cluster2.sf (rev 0) +++ trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/cluster2.sf 2009-02-03 17:26:17 UTC (rev 7335) @@ -0,0 +1,28 @@ +/* (C) Copyright 2009 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/extras/hadoop/cluster/components.sf" + + + +sfConfig extends ForkedCluster { + + + +} \ No newline at end of file Property changes on: trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/cluster2.sf ___________________________________________________________________ Added: svn:mergeinfo + Modified: trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/hadoop.sf =================================================================== --- trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/hadoop.sf 2009-02-03 16:36:35 UTC (rev 7334) +++ trunk/core/extras/hadoop-cluster/src/org/smartfrog/extras/hadoop/cluster/hadoop.sf 2009-02-03 17:26:17 UTC (rev 7335) @@ -68,6 +68,10 @@ HadoopClusterCompound extends Compound { + health extends HadoopJspClasses { + sfShouldTerminate false; + } + } HadoopFilesystem extends HadoopClusterCompound { @@ -88,6 +92,7 @@ HadoopCluster extends HadoopFilesystem { + jobTracker extends ClusterJobTrackerCompound { } @@ -97,4 +102,11 @@ } +} + +ForkedCluster extends HadoopCluster { + jobTracker:sfProcessName "jobTracker"; + taskTracker:sfProcessName "taskTracker"; + namenode:sfProcessName "namenode"; + datanode:sfProcessName "datanode"; } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |