CVS: jcontainer/loom/engine/src/java/org/jcontainer/loom/frontends CLIMain.java,1.20,1.21 CLISetup.java,1.9,1.10

Peter Donald <pdonald-yCVjj/[email protected]> Tue, 2 Dec 2003 20:54:47 -0600
Newsgroups gmane.comp.java.jcontainer.cvs
Message-ID <[email protected]>
Update of /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/frontends
In directory hogshead.codehaus.org:/tmp/cvs-serv26429/engine/src/java/org/jcontainer/loom/frontends

Modified Files:
	CLIMain.java CLISetup.java 
Log Message:
Update to latest release of following spice libraries that were re-released in codehaus namespace.

spice-salt
spice-xmlpolicy
spice-classman
spice-extension


Index: CLIMain.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/frontends/CLIMain.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- CLIMain.java	29 Nov 2003 13:44:27 -0000	1.20
+++ CLIMain.java	3 Dec 2003 02:54:43 -0000	1.21
@@ -106,9 +106,9 @@
 import org.jcontainer.loom.components.util.ConfigUtil;
 import org.jcontainer.loom.interfaces.ContainerConstants;
 import org.jcontainer.loom.interfaces.Embeddor;
-import org.realityforge.salt.i18n.ResourceManager;
-import org.realityforge.salt.i18n.Resources;
-import org.realityforge.salt.lang.ExceptionUtil;
+import org.codehaus.spice.salt.i18n.ResourceManager;
+import org.codehaus.spice.salt.i18n.Resources;
+import org.codehaus.spice.salt.lang.ExceptionUtil;
 import org.xml.sax.InputSource;
 
 /**

Index: CLISetup.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/frontends/CLISetup.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- CLISetup.java	29 Nov 2003 13:44:28 -0000	1.9
+++ CLISetup.java	3 Dec 2003 02:54:43 -0000	1.10
@@ -88,12 +88,12 @@
 
 import java.util.List;
 import java.util.Properties;
+import org.codehaus.spice.salt.i18n.ResourceManager;
+import org.codehaus.spice.salt.i18n.Resources;
 import org.realityforge.cli.CLArgsParser;
 import org.realityforge.cli.CLOption;
 import org.realityforge.cli.CLOptionDescriptor;
 import org.realityforge.cli.CLUtil;
-import org.realityforge.salt.i18n.ResourceManager;
-import org.realityforge.salt.i18n.Resources;
 
 /**
  * The class prepare parameters based on input options.
@@ -180,8 +180,8 @@
 
         if( null != parser.getErrorString() )
         {
-            final String message = REZ.getString( "cli.error.parser",
-                                                  parser.getErrorString() );
+            final String message = REZ.format( "cli.error.parser",
+                                               parser.getErrorString() );
             System.err.println( message );
             return false;
         }
@@ -198,8 +198,8 @@
                 case 0:
                     {
                         final String message =
-                            REZ.getString( "cli.error.unknown.arg",
-                                           option.getArgument() );
+                            REZ.format( "cli.error.unknown.arg",
+                                        option.getArgument() );
                         System.err.println( message );
                     }
                     return false;