You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by go...@apache.org on 2011/11/28 19:18:23 UTC
svn commit: r1207486 - in
/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources:
bin/filemgr policy/oodt/product-types.xml
Author: goodale
Date: Mon Nov 28 18:18:23 2011
New Revision: 1207486
URL: http://svn.apache.org/viewvc?rev=1207486&view=rev
Log:
OODT-120: minor updates to the filemgr stop script (it will remove the pid file if no matching process is found), and updated the GenericFile Product Type policy to use the RADiX data/archive directory structure by default.
Modified:
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/bin/filemgr
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/policy/oodt/product-types.xml
Modified: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/bin/filemgr
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/bin/filemgr?rev=1207486&r1=1207485&r2=1207486&view=diff
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/bin/filemgr (original)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/bin/filemgr Mon Nov 28 18:18:23 2011
@@ -119,7 +119,8 @@ elif [ "$1" = "stop" ]; then
if [ -f "$FILEMGR_PID" ]; then
kill `cat $FILEMGR_PID` >/dev/null 2>&1
if [ $? -eq 1 ]; then
- echo "PID file ($FILEMGR_PID) found but no matching process was found. Stop aborted."
+ echo "ID file ($FILEMGR_PID) found with PID `cat $FILEMGR_PID` but no matching process was found. Removed $FILEMGR_PID, now FileManager can be started."
+ `rm $FILEMGR_PID`
exit 1
fi
else
Modified: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/policy/oodt/product-types.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/policy/oodt/product-types.xml?rev=1207486&r1=1207485&r2=1207486&view=diff
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/policy/oodt/product-types.xml (original)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/policy/oodt/product-types.xml Mon Nov 28 18:18:23 2011
@@ -17,7 +17,7 @@ limitations under the License.
-->
<cas:producttypes xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas">
<type id="urn:oodt:GenericFile" name="GenericFile">
- <repository path="file://[HOME]/files"/>
+ <repository path="file://[OODT_HOME]/data/archive"/>
<versioner class="org.apache.oodt.cas.filemgr.versioning.BasicVersioner"/>
<!--
You can optionally specify a 'trim' tag to identify whether