DPML Notify

[mcconnell AT dpml.net]

Author: mcconnell AT dpml.net
Date: Tue May 17 15:33:57 2005
New Revision: 2581

Modified:
   development/main/depot/console/build.xml
   development/main/depot/console/src/main/net/dpml/depot/lang/Main.java
   development/main/depot/station/build.xml
Log:
Fix and issue with build files (result of build were not being copied) and 
add a missing import in Depot Main.

Modified: development/main/depot/console/build.xml
==============================================================================
--- development/main/depot/console/build.xml    (original)
+++ development/main/depot/console/build.xml    Tue May 17 15:33:57 2005
@@ -24,7 +24,7 @@
     </echo>
     <property name="lib" location="${dpml.data}/lib"/>
     <mkdir dir="${lib}"/>
-    <copy toDir="${lib}" preservelastmodified="true">
+    <copy toDir="${lib}" preservelastmodified="true" overwrite="true">
       <fileset dir="${basedir}/target/deliverables/jars">
         <include name="${project.filename}"/>
         <include name="${project.filename}.md5"/>
@@ -36,7 +36,7 @@
 # Updating DPML SYSTEM ${dpml.system}/bin
 
#----------------------------------------------------------------------------------
     </echo>
-    <copy todir="${dpml.system}" preservelastmodified="true">
+    <copy todir="${dpml.system}" preservelastmodified="true" 
overwrite="true">
       <fileset dir="target">
         <include name="bin/**"/>
       </fileset>

Modified: 
development/main/depot/console/src/main/net/dpml/depot/lang/Main.java
==============================================================================
--- development/main/depot/console/src/main/net/dpml/depot/lang/Main.java     
  (original)
+++ development/main/depot/console/src/main/net/dpml/depot/lang/Main.java     
  Tue May 17 15:33:57 2005
@@ -23,6 +23,7 @@
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.util.Properties;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.prefs.BackingStoreException;
 import java.util.prefs.Preferences;
@@ -63,15 +64,47 @@
     public static void main( final String[] args )
         throws Exception
     {
+        Logger logger = Logger.getLogger( "depot" );
+        logger.info( "Depot (Build ID " + DPML.BUILD_ID + ")." );
+
+        //
+        // check if a prefs reset has been requested
+        //
+
+        for( int i=0; i < args.length; i++ )
+        {
+            String arg = args[i];
+            if( arg.equals( "-reset" ) )
+            {
+                try
+                {
+                    Preferences prefs = Preferences.systemNodeForPackage( 
Main.class );
+                    logger.info( "Resetting: " + prefs );
+                    prefs.removeNode();
+                }
+                catch( Throwable e )
+                {
+                    logger.log( Level.SEVERE, "System preferences reset 
failure.", e );
+                }
+                try
+                {
+                    Preferences prefs = Preferences.userNodeForPackage( 
Main.class );
+                    logger.info( "Resetting: " + prefs );
+                    prefs.removeNode();
+                }
+                catch( Throwable e )
+                {
+                    logger.log( Level.SEVERE, "User preferences reset 
failure.", e );
+                }
+            }
+        }
+
         Preferences profile = getProfileFromArgs( args );
         if( null == profile )
         {
             return;
         }
 
-        Logger logger = Logger.getLogger( "depot" );
-        logger.info( "Depot (Build ID " + DPML.BUILD_ID + ")." );
-
         String name = profile.get( "title", profile.name() );
         logger.info( "loading " + name );
 
@@ -112,6 +145,8 @@
                         StringBuffer buffer = new StringBuffer();
                         buffer.append( "Application class not found." );
                         buffer.append( "\nClassname: " + classname );
+                        buffer.append( "\nDepot Main Codesource: " ); 
+                        buffer.append( 
Main.class.getProtectionDomain().getCodeSource().getLocation().toString() );
                         buffer.append( "\nSystem classpath:" );
                         URL[] urls = classloader.getURLs();
                         for( int i=0; i<urls.length; i++ )

Modified: development/main/depot/station/build.xml
==============================================================================
--- development/main/depot/station/build.xml    (original)
+++ development/main/depot/station/build.xml    Tue May 17 15:33:57 2005
@@ -14,7 +14,7 @@
     </echo>
     <property name="lib" location="${dpml.data}/lib"/>
     <mkdir dir="${lib}"/>
-    <copy toDir="${lib}" preservelastmodified="true">
+    <copy toDir="${lib}" preservelastmodified="true" overwrite="true">
       <fileset dir="${basedir}/target/deliverables/jars">
         <include name="${project.filename}"/>
         <include name="${project.filename}.md5"/>