db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r482835 - in /db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect: InstalledJar.java JarFile.java JarFileJava2.java JarLoader.java UpdateLoader.java
Date Wed, 06 Dec 2006 00:09:46 GMT
Author: djd
Date: Tue Dec  5 16:09:45 2006
New Revision: 482835

URL: http://svn.apache.org/viewvc?view=rev&rev=482835
Log:
DERBY-538 (partial) Rename jarFile to InstalledJar so that once JarFileJava2 is merged into
it the
java.util.jar.JarFile can be used directly without causing confusion.

Added:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/InstalledJar.java
      - copied, changed from r482812, db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFile.java
Removed:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFile.java
Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFileJava2.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarLoader.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/UpdateLoader.java

Copied: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/InstalledJar.java
(from r482812, db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFile.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/InstalledJar.java?view=diff&rev=482835&p1=db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFile.java&r1=482812&p2=db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/InstalledJar.java&r2=482835
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFile.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/InstalledJar.java
Tue Dec  5 16:09:45 2006
@@ -1,6 +1,6 @@
 /*
 
-   Derby - Class org.apache.derby.impl.services.reflect.JarFile
+   Derby - Class org.apache.derby.impl.services.reflect.InstalledJar
 
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -39,12 +39,12 @@
  * The source for the Jar is either a File (database from a file system)
  * or an InputStream (database is in a jar file itself).
  */
-abstract class JarFile {
+abstract class InstalledJar {
 	final String[] name;
 	protected ZipFile zip;
 	boolean isStream;
 
-	JarFile(String[] name) {
+	InstalledJar(String[] name) {
 		this.name = name;
 	}
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFileJava2.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFileJava2.java?view=diff&rev=482835&r1=482834&r2=482835
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFileJava2.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFileJava2.java
Tue Dec  5 16:09:45 2006
@@ -43,7 +43,7 @@
 	java.util.jar.* classes to be signature aware.
 */
 
-final class JarFileJava2 extends JarFile {
+final class JarFileJava2 extends InstalledJar {
 
 	JarFileJava2(String[] name) {
 		super(name);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarLoader.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarLoader.java?view=diff&rev=482835&r1=482834&r2=482835
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarLoader.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarLoader.java
Tue Dec  5 16:09:45 2006
@@ -43,7 +43,7 @@
 class JarLoader extends ClassLoader {
 
 	private UpdateLoader updateLoader;
-	private JarFile jf;
+	private InstalledJar jf;
 	private HeaderPrintWriter vs;
 
 	JarLoader(UpdateLoader updateLoader, String[] name, HeaderPrintWriter vs) {
@@ -261,7 +261,7 @@
 
 	}
 
-	JarFile setInvalid(boolean newJarFile) {
+	InstalledJar setInvalid(boolean newJarFile) {
 
 		jf.setInvalid();
 		updateLoader = null;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/UpdateLoader.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/UpdateLoader.java?view=diff&rev=482835&r1=482834&r2=482835
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/UpdateLoader.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/UpdateLoader.java
Tue Dec  5 16:09:45 2006
@@ -249,7 +249,7 @@
 
 				JarLoader jl = jarList[i];
 
-				JarFile newJarFile = jl.setInvalid(reload);
+				InstalledJar newJarFile = jl.setInvalid(reload);
 			}
 		}
 	}



Mime
View raw message