db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1492111 - in /db/derby/code/trunk: java/engine/org/apache/derby/iapi/services/info/ java/engine/org/apache/derby/impl/io/ java/engine/org/apache/derby/impl/services/monitor/ java/engine/org/apache/derby/impl/sql/compile/ java/testing/org/a...
Date Wed, 12 Jun 2013 08:29:25 GMT
Author: kahatlen
Date: Wed Jun 12 08:29:25 2013
New Revision: 1492111

URL: http://svn.apache.org/r1492111
Log:
DERBY-6213: Deprecate support for Java 5 and CDC

- Remove checks for the JVMInfo.J2ME constant

- Move functionality from DirStorageFactory4 to the base class

Removed:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile4.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory4.java
Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericConstantNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericTypeCompiler.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DatabaseClassLoadingTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/corruptio/CorruptDiskStorageFactory.java
    db/derby/code/trunk/tools/jar/extraDBMSclasses.properties

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java?rev=1492111&r1=1492110&r2=1492111&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java Wed Jun
12 08:29:25 2013
@@ -61,8 +61,6 @@ public abstract class JVMInfo
     public static final int J2SE_17 = 8; // Java SE 7
     public static final int J2SE_18 = 9;
 
-	public static final boolean J2ME;
-
 	static 
 	{
 		int id;
@@ -79,16 +77,6 @@ public abstract class JVMInfo
 		// version 1.4.
 		//
 		String javaVersion;
-		String javaSpec;
-		boolean isJ2ME;
-
-		try {
-			javaSpec = System.getProperty("java.specification.name");
-		} catch (SecurityException se) {
-			// some vms do not know about this property so they
-			// throw a security exception when access is restricted.
-			javaSpec = null;
-		}
 
 		try {
 			javaVersion = System.getProperty("java.specification.version", "1.4");
@@ -99,66 +87,45 @@ public abstract class JVMInfo
 			javaVersion = "1.4";
 		}
 
-		if (javaSpec != null &&
-            (
-             javaSpec.startsWith("J2ME") || // recognize IBM WCTME
-             javaSpec.startsWith("CDC")  || // Oracle Java ME Embedded Client
-             (
-              (javaSpec.indexOf( "Profile" ) > -1) && // recognize phoneME
-              (javaSpec.indexOf( "Specification" ) > -1)
-             )
-            )
-            )
-		{
-			id = J2SE_14;
-			isJ2ME = true;
-		}
-		else
-		{
-			// J2SE/J2EE
-			isJ2ME = false;
+        if (javaVersion.equals("1.4"))
+        {
+            String vmVersion = System.getProperty("java.version", "1.4.0");
+
+            if (JVMInfo.vmCheck(vmVersion, "1.4.0") || JVMInfo.vmCheck(vmVersion, "1.4.1"))
+                id = J2SE_14;
+            else
+                id = J2SE_142;
+        }
+        else if (javaVersion.equals("1.5"))
+        {
+            id = J2SE_15;
+        }
+        else if (javaVersion.equals("1.6"))
+        {
+            id = J2SE_16;
+        }
+        else if (javaVersion.equals("1.7"))
+        {
+            id = J2SE_17;
+        }
+        else if (javaVersion.equals("1.8")) {
+            id = J2SE_18;
+        }
+        else
+        {
+            // aussme our lowest support unless the java spec
+            // is greater than our highest level.
+            id = J2SE_14;
 
-			if (javaVersion.equals("1.4"))
-			{
-				String vmVersion = System.getProperty("java.version", "1.4.0");
-
-				if (JVMInfo.vmCheck(vmVersion, "1.4.0") || JVMInfo.vmCheck(vmVersion, "1.4.1"))
-					id = J2SE_14;
-				else
-					id = J2SE_142;
-			}
-			else if (javaVersion.equals("1.5"))
-			{
-				id = J2SE_15;
-			}
-			else if (javaVersion.equals("1.6"))
-			{
-				id = J2SE_16;
-			}
-            else if (javaVersion.equals("1.7"))
-            {
-                id = J2SE_17;
-            }
-            else if (javaVersion.equals("1.8")) {
-                id = J2SE_18;
+            try {
+
+                if (Float.parseFloat(javaVersion) > 1.8f)
+                    id = J2SE_18;
+            } catch (NumberFormatException nfe) {
             }
-			else
-			{
-				// aussme our lowest support unless the java spec
-				// is greater than our highest level.
-				id = J2SE_14;
-
-				try {
-
-                    if (Float.parseFloat(javaVersion) > 1.8f)
-                        id = J2SE_18;
-				} catch (NumberFormatException nfe) {
-				}
-			}
-		}
+        }
 
 		JDK_ID = id;
-		J2ME = isJ2ME;
 	}
 
 	/**
@@ -177,7 +144,7 @@ public abstract class JVMInfo
 	{
 		switch (JDK_ID)
 		{
-		case J2SE_14: return J2ME ? "J2ME - JDBC for CDC/FP 1.1" : "J2SE 1.4 - JDBC 3.0";
+		case J2SE_14: return "J2SE 1.4 - JDBC 3.0";
 		case J2SE_142: return "J2SE 1.4.2 - JDBC 3.0";
 		case J2SE_15: return "J2SE 5.0 - JDBC 3.0";
         case J2SE_16: return "Java SE 6 - JDBC 4.1";

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java?rev=1492111&r1=1492110&r2=1492111&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java Wed Jun 12 08:29:25
2013
@@ -36,11 +36,13 @@ import java.io.FileNotFoundException;
 import java.io.RandomAccessFile;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.security.AccessControlException;
+import java.nio.channels.AsynchronousCloseException;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
+import java.nio.channels.OverlappingFileLockException;
 import org.apache.derby.iapi.error.StandardException;
 import org.apache.derby.iapi.services.io.FileUtil;
 import org.apache.derby.iapi.util.InterruptStatus;
-import org.apache.derby.shared.common.reference.SQLState;
 
 /**
  * This class provides a disk based implementation of the StorageFile interface. It is used
by the
@@ -48,6 +50,9 @@ import org.apache.derby.shared.common.re
  */
 class DirFile extends File implements StorageFile
 {
+    private RandomAccessFile lockFileOpen;
+    private FileChannel lockFileChannel;
+    private FileLock dbLock;
 
     /**
      * Construct a DirFile from a path name.
@@ -132,7 +137,7 @@ class DirFile extends File implements St
     public OutputStream getOutputStream( final boolean append) throws FileNotFoundException
     {
         boolean exists = exists();
-        OutputStream result = new FileOutputStream( getPath(), append);
+        OutputStream result = new FileOutputStream(this, append);
 
         if (!exists) {
             FileUtil.limitAccessToOwner(this);
@@ -163,44 +168,163 @@ class DirFile extends File implements St
      *    NO_FILE_LOCK_SUPPORT if the system does not support exclusive locks.<br>
      */
     public synchronized int getExclusiveFileLock() throws StandardException
-	{
-		if (exists())
-		{
-			delete();
-		}
-		try
+    {
+        boolean validExclusiveLock = false;
+        int status;
+
+        /*
+        ** There can be  a scenario where there is some other JVM that is before jkdk1.4
+        ** had booted the system and jdk1.4 trying to boot it, in this case we will get the
+        ** Exclusive Lock even though some other JVM has already booted the database. But
+        ** the lock is not a reliable one , so we should  still throw the warning.
+        ** The Way we identify this case is if "dbex.lck" file size  is differen
+        ** for pre jdk1.4 jvms and jdk1.4 or above.
+        ** Zero size "dbex.lck" file  is created by a jvm i.e before jdk1.4 and
+        ** File created by jdk1.4 or above writes EXCLUSIVE_FILE_LOCK value into the file.
+        ** If we are unable to acquire the lock means other JVM that
+        ** currently booted the system is also JDK1.4 or above;
+        ** In this case we could confidently throw a exception instead of
+        ** of a warning.
+        **/
+
+        try
         {
-			//Just create an empty file
-			RandomAccessFile lockFileOpen = new RandomAccessFile( (File) this, "rw");
-            limitAccessToOwner();
-			lockFileOpen.getFD().sync( );
-			lockFileOpen.close();
-		}catch(IOException ioe)
-		{
-			// do nothing - it may be read only medium, who knows what the
-			// problem is
-			if (SanityManager.DEBUG)
-			{
-				SanityManager.THROWASSERT(
-                    "Unable to create Exclusive Lock File " + getPath(), ioe);
-			}
-		}
-		
-		return NO_FILE_LOCK_SUPPORT;
-	} // end of getExclusiveFileLock
+            //create the file that us used to acquire exclusive lock if it does not exists.
+            if (createNewFile())
+            {
+                validExclusiveLock = true;
+            }
+            else if (length() > 0)
+            {
+                validExclusiveLock = true;
+            }
+
+            //If we can acquire a reliable exclusive lock , try to get it.
+            if (validExclusiveLock)
+            {
+                int retries = InterruptStatus.MAX_INTERRUPT_RETRIES;
+                while (true) {
+                    lockFileOpen = new RandomAccessFile((File) this, "rw");
+                    limitAccessToOwner(); // tamper-proof..
+                    lockFileChannel = lockFileOpen.getChannel();
+
+                    try {
+                        dbLock =lockFileChannel.tryLock();
+                        if(dbLock == null) {
+                            lockFileChannel.close();
+                            lockFileChannel=null;
+                            lockFileOpen.close();
+                            lockFileOpen = null;
+                            status = EXCLUSIVE_FILE_LOCK_NOT_AVAILABLE;
+                        } else {
+                            lockFileOpen.writeInt(EXCLUSIVE_FILE_LOCK);
+                            lockFileChannel.force(true);
+                            status = EXCLUSIVE_FILE_LOCK;
+                        }
+                    } catch (AsynchronousCloseException e) {
+                        // JDK bug 6979009: use AsynchronousCloseException
+                        // instead of the logically correct
+                        // ClosedByInterruptException
+
+                        InterruptStatus.setInterrupted();
+                        lockFileOpen.close();
+
+                        if (retries-- > 0) {
+                            continue;
+                        } else {
+                            throw e;
+                        }
+                    }
+
+                    break;
+                }
+            }
+            else
+            {
+                status = NO_FILE_LOCK_SUPPORT;
+            }
+
+        } catch(IOException ioe)
+        {
+            // do nothing - it may be read only medium, who knows what the
+            // problem is
+
+            //release all the possible resource we created in this functions.
+            releaseExclusiveFileLock();
+            status = NO_FILE_LOCK_SUPPORT;
+            if (SanityManager.DEBUG)
+            {
+                SanityManager.THROWASSERT("Unable to Acquire Exclusive Lock on "
+                                          + getPath(), ioe);
+            }
+        } catch (OverlappingFileLockException ofle)
+        {
+            //
+            // Under Java 6 and later, this exception is raised if the database
+            // has been opened by another Derby instance in a different
+            // ClassLoader in this VM. See DERBY-700.
+            //
+            // The OverlappingFileLockException is raised by the
+            // lockFileChannel.tryLock() call above.
+            //
+            try {
+                lockFileChannel.close();
+                lockFileOpen.close();
+            } catch (IOException e)
+            {
+                if (SanityManager.DEBUG)
+                {
+                    SanityManager.THROWASSERT("Error closing file channel "
+                                              + getPath(), e);
+                }
+            }
+            lockFileChannel = null;
+            lockFileOpen = null;
+            status = EXCLUSIVE_FILE_LOCK_NOT_AVAILABLE;
+        }
+
+        return status;
+    } // end of getExclusiveFileLock
 
 	/**
      * Release the resource associated with an earlier acquired exclusive lock
      *
      * @see #getExclusiveFileLock
      */
-	public synchronized void releaseExclusiveFileLock()
-	{
-		if( exists())
-		{
-			delete(); 
-		}
-	} // End of releaseExclusiveFileLock
+    public synchronized void releaseExclusiveFileLock()
+    {
+        try
+        {
+            if (dbLock!=null)
+            {
+                dbLock.release();
+                dbLock = null;
+            }
+
+            if (lockFileChannel != null)
+            {
+                lockFileChannel.close();
+                lockFileChannel = null;
+            }
+
+            if (lockFileOpen != null)
+            {
+                lockFileOpen.close();
+                lockFileOpen = null;
+            }
+
+            // delete the exclusive lock file name.
+            if (exists())
+            {
+                delete();
+            }
+        }
+        catch (IOException ioe)
+        {
+            // do nothing - it may be read only medium, who knows what the
+            // problem is
+        }
+    } // End of releaseExclusiveFileLock
 
     /**
      * Get a random access (read/write) file.
@@ -224,9 +348,6 @@ class DirFile extends File implements St
      */
     public StorageRandomAccessFile getRandomAccessFile( String mode) throws FileNotFoundException
     {
-        // Assume that modes "rws" and "rwd" are not supported.
-        if( "rws".equals( mode) || "rwd".equals( mode))
-            mode = "rw";
         return new DirRandomAccessFile( (File) this, mode);
     } // end of getRandomAccessFile
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory.java?rev=1492111&r1=1492110&r2=1492111&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory.java Wed Jun
12 08:29:25 2013
@@ -21,22 +21,15 @@
 
 package org.apache.derby.impl.io;
 
-import org.apache.derby.iapi.services.sanity.SanityManager;
-
 import org.apache.derby.io.WritableStorageFactory;
 import org.apache.derby.io.StorageFile;
-import org.apache.derby.io.StorageRandomAccessFile;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.FileInputStream;
-import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.IOException;
 import java.io.SyncFailedException;
 
-import java.util.Properties;
 
 /**
  * This class provides a disk based implementation of the StorageFactory interface. It is
used by the
@@ -159,7 +152,7 @@ public class DirStorageFactory extends B
      */
     public boolean supportsWriteSync()
     {
-        return false;
+        return true;
     }
 
     public boolean isReadOnlyDatabase()

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java?rev=1492111&r1=1492110&r2=1492111&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
Wed Jun 12 08:29:25 2013
@@ -1656,14 +1656,8 @@ nextModule:
 
     private static final HashMap<String,String> storageFactories = new HashMap<String,String>();
     static {
-		String dirStorageFactoryClass;
-        if (!JVMInfo.J2ME)
-            dirStorageFactoryClass = "org.apache.derby.impl.io.DirStorageFactory4";
-        else
-            dirStorageFactoryClass = "org.apache.derby.impl.io.DirStorageFactory";
-
-
-        storageFactories.put( PersistentService.DIRECTORY, dirStorageFactoryClass);
+        storageFactories.put( PersistentService.DIRECTORY,
+                                "org.apache.derby.impl.io.DirStorageFactory");
         storageFactories.put( PersistentService.CLASSPATH,
                                 "org.apache.derby.impl.io.CPStorageFactory");
         storageFactories.put( PersistentService.JAR,

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericConstantNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericConstantNode.java?rev=1492111&r1=1492110&r2=1492111&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericConstantNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericConstantNode.java
Wed Jun 12 08:29:25 2013
@@ -30,7 +30,6 @@ import org.apache.derby.iapi.sql.compile
 import org.apache.derby.iapi.error.StandardException;
 
 import org.apache.derby.iapi.services.compiler.MethodBuilder;
-import org.apache.derby.iapi.services.info.JVMInfo;
 
 import org.apache.derby.iapi.types.SQLDouble;
 import org.apache.derby.iapi.types.SQLInteger;
@@ -42,10 +41,6 @@ import org.apache.derby.iapi.types.TypeI
 import org.apache.derby.iapi.types.DataTypeUtilities;
 import org.apache.derby.iapi.types.NumberDataValue;
 
-import org.apache.derby.impl.sql.compile.ExpressionClassBuilder;
-
-import org.apache.derby.iapi.util.ReuseFactory;
-
 import java.sql.Types;
 
 public final class NumericConstantNode extends ConstantNode
@@ -235,13 +230,9 @@ public final class NumericConstantNode e
 			mb.push(value.getShort());
 			break;
 		case C_NodeTypes.DECIMAL_CONSTANT_NODE:
-			// No java.math.BigDecimal class in J2ME so the constant
-			// from the input SQL is handled directly as a String.
-			if (!JVMInfo.J2ME)
-				mb.pushNewStart("java.math.BigDecimal");
+            mb.pushNewStart("java.math.BigDecimal");
 			mb.push(value.getString());
-			if (!JVMInfo.J2ME)
-				mb.pushNewComplete(1);
+            mb.pushNewComplete(1);
 			break;
 		case C_NodeTypes.DOUBLE_CONSTANT_NODE:
 			mb.push(value.getDouble());

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericTypeCompiler.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericTypeCompiler.java?rev=1492111&r1=1492110&r2=1492111&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericTypeCompiler.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericTypeCompiler.java
Wed Jun 12 08:29:25 2013
@@ -29,14 +29,11 @@ import org.apache.derby.iapi.services.lo
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
 
-import org.apache.derby.iapi.services.info.JVMInfo;
 import org.apache.derby.iapi.services.io.StoredFormatIds;
 
 import org.apache.derby.iapi.error.StandardException;
 
 import org.apache.derby.iapi.types.DataTypeDescriptor;
-import org.apache.derby.iapi.types.DataTypeDescriptor;
-import org.apache.derby.iapi.types.DataValueFactory;
 import org.apache.derby.iapi.types.NumberDataValue;
 import org.apache.derby.iapi.types.TypeId;
 
@@ -533,12 +530,9 @@ public final class NumericTypeCompiler e
 	public void generateDataValue(MethodBuilder mb, int collationType,
 			LocalField field)
 	{
-		if (!JVMInfo.J2ME && getTypeId().isDecimalTypeId())
+        if (getTypeId().isDecimalTypeId())
 		{
 			// cast the value to a Number (from BigDecimal) for method resolution
-			// For J2ME there is no implementation of Number for DECIMAL
-			// so values are handled as thier original type, which is just
-			// a String for DECIMAL constants from the parser.
 			mb.upCast("java.lang.Number");
 		}
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DatabaseClassLoadingTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DatabaseClassLoadingTest.java?rev=1492111&r1=1492110&r2=1492111&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DatabaseClassLoadingTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DatabaseClassLoadingTest.java
Wed Jun 12 08:29:25 2013
@@ -45,8 +45,6 @@ import javax.sql.DataSource;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.derby.iapi.services.info.JVMInfo;
-
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
 import org.apache.derbyTesting.junit.JDBC;
@@ -1006,11 +1004,6 @@ public class DatabaseClassLoadingTest ex
      */
     public void testTableFunctionInJar() throws SQLException, MalformedURLException
     {
-        // skip this test if vm is pre Java 5. This is because the jar file was
-        // compiled by a modern compiler and the jar file won't load on
-        // old vms.
-        if ( JVMInfo.J2ME || (JVMInfo.JDK_ID < JVMInfo.J2SE_15 ) ) { return; }
-        
         String jarName = "EMC.DUMMY_VTI";
 
         installJar("dummy_vti.jar", jarName );
@@ -1097,11 +1090,6 @@ public class DatabaseClassLoadingTest ex
      */
     public void testUDAInJar() throws SQLException, MalformedURLException
     {
-        // skip this test if vm is pre Java 6. This is because the jar file was
-        // compiled by a modern compiler and the jar file won't load on
-        // old vms.
-        if ( JVMInfo.J2ME || (JVMInfo.JDK_ID < JVMInfo.J2SE_16 ) ) { return; }
-        
         String jarName = "EMC.MEDIAN_UDA";
 
         installJar( "median_uda.jar", jarName );
@@ -1174,11 +1162,6 @@ public class DatabaseClassLoadingTest ex
      */
     public void test_5352() throws SQLException, MalformedURLException
     {
-        // skip this test if vm is pre Java 5. This is because the jar file was
-        // compiled by a modern compiler and the jar file won't load on
-        // old vms.
-        if ( JVMInfo.J2ME || (JVMInfo.JDK_ID < JVMInfo.J2SE_15 ) ) { return; }
-        
         String jarName = "EMC.DUMMY_VTI2";
 
         installJar("dummy_vti.jar", jarName );

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/corruptio/CorruptDiskStorageFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/corruptio/CorruptDiskStorageFactory.java?rev=1492111&r1=1492110&r2=1492111&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/corruptio/CorruptDiskStorageFactory.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/corruptio/CorruptDiskStorageFactory.java
Wed Jun 12 08:29:25 2013
@@ -69,7 +69,7 @@ public class CorruptDiskStorageFactory e
 	WritableStorageFactory getRealStorageFactory()
 	{
 		String dirStorageFactoryClass =
-                "org.apache.derby.impl.io.DirStorageFactory4";
+                "org.apache.derby.impl.io.DirStorageFactory";
 		
 		WritableStorageFactory storageFactory = null;
 		try{

Modified: db/derby/code/trunk/tools/jar/extraDBMSclasses.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/jar/extraDBMSclasses.properties?rev=1492111&r1=1492110&r2=1492111&view=diff
==============================================================================
--- db/derby/code/trunk/tools/jar/extraDBMSclasses.properties (original)
+++ db/derby/code/trunk/tools/jar/extraDBMSclasses.properties Wed Jun 12 08:29:25 2013
@@ -97,7 +97,7 @@ derby.module.osgi.activator=org.apache.d
 derby.module.database.baseexpressionactivation=org.apache.derby.impl.sql.execute.BaseExpressionActivation
 derby.module.database.constantactionactivation=org.apache.derby.impl.sql.execute.ConstantActionActivation
 
-derby.module.store.dsf4=org.apache.derby.impl.io.DirStorageFactory4
+derby.module.store.dsf=org.apache.derby.impl.io.DirStorageFactory
 derby.module.store.vfmsf=org.apache.derby.impl.io.VFMemoryStorageFactory
 derby.module.store.isf=org.apache.derby.impl.io.InputStreamFile
 derby.module.store.jardbf=org.apache.derby.impl.io.JarDBFile



Mime
View raw message