avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: avalon-sandbox/merlin/merlin-cli/src/java Merlin.java
Date Mon, 31 Mar 2003 19:04:20 GMT
bloritsch    2003/03/31 11:04:20

  Modified:    datasource/src/test/org/apache/excalibur/datasource/impl/test
                        SimpleDataSourceManagerTest.java
               merlin/merlin-cli/src/java Merlin.java
  Log:
  commenting out unused code
  
  Revision  Changes    Path
  1.3       +5 -6      avalon-sandbox/datasource/src/test/org/apache/excalibur/datasource/impl/test/SimpleDataSourceManagerTest.java
  
  Index: SimpleDataSourceManagerTest.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/datasource/src/test/org/apache/excalibur/datasource/impl/test/SimpleDataSourceManagerTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SimpleDataSourceManagerTest.java	22 Mar 2003 12:59:48 -0000	1.2
  +++ SimpleDataSourceManagerTest.java	31 Mar 2003 19:04:20 -0000	1.3
  @@ -80,7 +80,7 @@
   
     public void testGetConnection() throws SQLException {
       try {
  -      Connection bar = simpleDataSourceManager.getConnection("bar");
  +      simpleDataSourceManager.getConnection("bar");
         fail("Should have thrown an exception");
       } catch( Exception e ) {
         // ignore
  @@ -95,28 +95,28 @@
   
     public void testGetConnection1() throws SQLException {
       try {
  -      Connection bar = simpleDataSourceManager.getConnection("bar", null, null);
  +      simpleDataSourceManager.getConnection("bar", null, null);
         fail("Should have thrown an exception");
       } catch( Exception e ) {
         // ignore
       }
   
       try {
  -      Connection foo = simpleDataSourceManager.getConnection("foo", null, null);
  +      simpleDataSourceManager.getConnection("foo", null, null);
         fail("Should have thrown an exception");
       } catch( Exception e ) {
         // ignore
       }
   
       try {
  -      Connection foo = simpleDataSourceManager.getConnection("foo", "testor", null);
  +      simpleDataSourceManager.getConnection("foo", "testor", null);
         fail("Should have thrown an exception");
       } catch( Exception e ) {
         // ignore
       }
   
       try {
  -      Connection foo = simpleDataSourceManager.getConnection("foo", null, "passwd");
  +      simpleDataSourceManager.getConnection("foo", null, "passwd");
         fail("Should have thrown an exception");
       } catch( Exception e ) {
         // ignore
  @@ -131,7 +131,6 @@
   
     public void testSupportsClientCredentials() {
       assertEquals(true, simpleDataSourceManager.supportsClientCredentials());
  -    assertFalse( false == simpleDataSourceManager.supportsClientCredentials() );
     }
   
     private Configuration getConfiguration() {
  
  
  
  1.3       +4 -3      avalon-sandbox/merlin/merlin-cli/src/java/Merlin.java
  
  Index: Merlin.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-cli/src/java/Merlin.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Merlin.java	31 Mar 2003 18:57:13 -0000	1.2
  +++ Merlin.java	31 Mar 2003 19:04:20 -0000	1.3
  @@ -100,8 +100,8 @@
       private static URLClassLoader CLASSLOADER;
       private static URLClassLoader COMMON;
   
  -    private static File BASE;
  -    private static File PROFILE;
  +    //private static File BASE;
  +    //private static File PROFILE;
   
       private static Options buildCommandLineOptions()
       {
  @@ -512,7 +512,7 @@
               }
           }
       }
  -
  +/* NEVER USED
       private static File getBlockPath( File system, File home, CommandLine command ) throws
IOException
       {
           boolean flag = false;
  @@ -554,6 +554,7 @@
              "Unable to locate a block defintion relative to the paths: " + file;
           throw new IllegalArgumentException( error );
       }
  +*/
   /* NEVER USED
       private static File getProfile( File home, CommandLine command ) throws IOException
       {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message