db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1480365 - in /db/derby/code/trunk/java/engine/org/apache/derby: iapi/services/ iapi/services/classfile/ iapi/services/info/ iapi/services/locks/ iapi/services/property/ iapi/types/ io/ vti/
Date Wed, 08 May 2013 17:25:00 GMT
Author: rhillegas
Date: Wed May  8 17:25:00 2013
New Revision: 1480365

URL: http://svn.apache.org/r1480365
Log:
DERBY-6213: Convert a couple misc packages to Java 6.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/Attributes.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassEnumeration.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/MemberTable.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Lockable.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/ShExLockable.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyValidation.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/io/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplate.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml?rev=1480365&r1=1480364&r2=1480365&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml Wed May  8 17:25:00
2013
@@ -34,12 +34,10 @@
 
 <!-- Targets -->
 
-  <target name="compile" depends="compile_crypto,java5"/>
-
-  <target name="compile_iapi_services_jsr169">
+  <target name="compile">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -51,38 +49,14 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${java16compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/iapi/services/**"/>
-      <exclude name="${derby.dir}/iapi/services/crypto/**"/>
+      <exclude name="${derby.dir}/iapi/crypto/io/**"/>
       <exclude name="${derby.dir}/iapi/services/io/**"/>
-      <exclude name="${derby.dir}/iapi/services/loader/Java5*"/>
+      <compilerarg value="-Xlint:unchecked"/>
     </javac>
     <ant dir="${derby.engine.dir}/iapi/services/io"/>
-  </target>
-
-  <target name="java5">
-    <javac
-      source="1.5"
-      target="1.5"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="${debug}"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}"
-      srcdir="${derby.engine.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${java15compile.classpath}"/>
-      </classpath>
-      <include name="${derby.dir}/iapi/services/loader/Java5*"/>
-    </javac>
-  </target>
-
-  <target name="compile_crypto" depends="compile_iapi_services_jsr169">
     <ant dir="${derby.engine.dir}/iapi/services/crypto" target="compile_crypto"/>
   </target>
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/Attributes.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/Attributes.java?rev=1480365&r1=1480364&r2=1480365&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/Attributes.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/Attributes.java
Wed May  8 17:25:00 2013
@@ -25,7 +25,7 @@ import java.util.Vector;
 
 import java.io.IOException;
 
-class Attributes extends Vector {
+class Attributes extends Vector<AttributeEntry> {
 	private int classFileSize;
 
 	Attributes(int count) {
@@ -35,7 +35,7 @@ class Attributes extends Vector {
 	void put(ClassFormatOutput out) throws IOException {
 		int size = size();
 		for (int i = 0; i < size; i++) {
-			((AttributeEntry) elementAt(i)).put(out);
+			elementAt(i).put(out);
 		}
 	}
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassEnumeration.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassEnumeration.java?rev=1480365&r1=1480364&r2=1480365&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassEnumeration.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassEnumeration.java
Wed May  8 17:25:00 2013
@@ -39,7 +39,7 @@ class ClassEnumeration implements Enumer
 	ClassHolder	cpt;
 	Enumeration			inner;
 	CONSTANT_Index_info	position;
-	HashSet           foundClasses;
+	HashSet<String>           foundClasses;
     Enumeration         classList;
 
     ClassEnumeration(   ClassHolder cpt,
@@ -49,7 +49,7 @@ class ClassEnumeration implements Enumer
     {
 		this.cpt = cpt;
 		inner = e;
-		foundClasses = new HashSet(30, 0.8f);
+		foundClasses = new HashSet<String>(30, 0.8f);
 		findMethodReferences(methods, foundClasses);
 		findFieldReferences(fields, foundClasses);
 		findClassReferences(foundClasses);
@@ -62,7 +62,7 @@ class ClassEnumeration implements Enumer
 	}
 
 	// uses cpt and inner
-	private void findClassReferences(HashSet foundClasses)
+	private void findClassReferences(HashSet<String> foundClasses)
 	{
 
 		ConstantPoolEntry	item;
@@ -108,7 +108,7 @@ class ClassEnumeration implements Enumer
 	}
 
 	private void findMethodReferences(  Enumeration methods,
-	                                    HashSet foundClasses)
+	                                    HashSet<String> foundClasses)
 	{
 	    while (methods.hasMoreElements())
 	    {
@@ -119,7 +119,7 @@ class ClassEnumeration implements Enumer
 	}
 
 	private void findFieldReferences(   Enumeration fields,
-	                                    HashSet foundClasses)
+	                                    HashSet<String> foundClasses)
 	{
 	    while (fields.hasMoreElements())
 	    {
@@ -129,7 +129,7 @@ class ClassEnumeration implements Enumer
 	    }
 	}
 
-	void distillClasses(String fieldOrMethodSig, HashSet foundClasses)
+	void distillClasses(String fieldOrMethodSig, HashSet<String> foundClasses)
 	{
 	    if (fieldOrMethodSig == null || fieldOrMethodSig.length() < 1)
 	    {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java?rev=1480365&r1=1480364&r2=1480365&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java
Wed May  8 17:25:00 2013
@@ -91,8 +91,8 @@ public class ClassHolder {
 	/*
 	** Fields for Constant Pool Table
 	*/
-	protected Hashtable cptHashTable;
-	protected Vector cptEntries;
+	protected Hashtable<Object,ConstantPoolEntry> cptHashTable;
+	protected Vector<ConstantPoolEntry> cptEntries;
 	private int cptEstimatedSize;
 
 	/**
@@ -108,8 +108,8 @@ public class ClassHolder {
 	protected ClassHolder(int estimatedConstantPoolCount) {
 		// Constant Pool Information
 		// 100 is the estimate of the number of entries that will be generated
-		cptEntries = new Vector(estimatedConstantPoolCount);
-		cptHashTable = new Hashtable(estimatedConstantPoolCount, (float)0.75);
+		cptEntries = new Vector<ConstantPoolEntry>(estimatedConstantPoolCount);
+		cptHashTable = new Hashtable<Object,ConstantPoolEntry>(estimatedConstantPoolCount,
(float)0.75);
 
 		// reserve the 0'th constant pool entry
 		cptEntries.setSize(1);
@@ -536,8 +536,8 @@ public class ClassHolder {
 
  	protected void cptPut(ClassFormatOutput out) throws IOException {
 
-		for (Enumeration e = cptEntries.elements(); e.hasMoreElements(); ) {
-			ConstantPoolEntry item = (ConstantPoolEntry) e.nextElement();
+		for (Enumeration<ConstantPoolEntry> e = cptEntries.elements(); e.hasMoreElements();
) {
+			ConstantPoolEntry item = e.nextElement();
 			if (item == null) {
 				continue;
 			}
@@ -551,7 +551,7 @@ public class ClassHolder {
 	*/
 
 	public ConstantPoolEntry getEntry(int index) {
-		return (ConstantPoolEntry) cptEntries.get(index);
+		return cptEntries.get(index);
 	}
 
 	/**
@@ -657,7 +657,7 @@ public class ClassHolder {
 	}
 
 	protected ConstantPoolEntry findMatchingEntry(Object key) {
-		return (ConstantPoolEntry) cptHashTable.get(key);
+		return cptHashTable.get(key);
 	}
 
 	/** get a string (UTF) given a name_index into the constant pool

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java?rev=1480365&r1=1480364&r2=1480365&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java
Wed May  8 17:25:00 2013
@@ -139,7 +139,7 @@ public class ClassInvestigator extends C
 	public Enumeration implementedInterfaces()
 	{
 		int interfaceCount = interfaces == null ? 0 : interfaces.length;
-		Vector implemented = new Vector(interfaceCount);
+		Vector<String> implemented = new Vector<String>(interfaceCount);
 
         for (int i = 0; i < interfaceCount; i++)
         {
@@ -147,16 +147,20 @@ public class ClassInvestigator extends C
         }
         return implemented.elements();
 	}
-    public Enumeration getFields() {
+    public Enumeration<ClassMember> getFields() {
 		if (field_info == null)
-			return Collections.enumeration(Collections.EMPTY_LIST);
+        {
+			return Collections.enumeration( new Vector<ClassMember>() );
+        }
 
 		return field_info.entries.elements();
 	}
 
-    public Enumeration getMethods() {
+    public Enumeration<ClassMember> getMethods() {
 		if (method_info == null)
-			return Collections.enumeration(Collections.EMPTY_LIST);
+        {
+			return Collections.enumeration( new Vector<ClassMember>() );
+        }
 		return method_info.entries.elements();
 	}
 
@@ -168,13 +172,13 @@ public class ClassInvestigator extends C
 		Return an Enumeration of all referenced classes
 	*/
 
-	private Enumeration getClasses(Enumeration methods, Enumeration fields)
+	private Enumeration getClasses(Enumeration<ClassMember> methods, Enumeration<ClassMember>
fields)
 	{
 		return new ClassEnumeration(this, cptEntries.elements(), methods, fields);
 	}
 
 	public Enumeration getStrings() {
-		HashSet strings = new HashSet(30, 0.8f);
+		HashSet<String> strings = new HashSet<String>(30, 0.8f);
 		
 		int size = cptEntries.size();
 		for (int i = 1; i < size; i++) {
@@ -240,8 +244,8 @@ public class ClassInvestigator extends C
 		attribute_info = null;
 
 		// fields
-		for (Enumeration e = getFields(); e.hasMoreElements(); ) {
-			ClassMember member = (ClassMember) e.nextElement();
+		for (Enumeration<ClassMember> e = getFields(); e.hasMoreElements(); ) {
+			ClassMember member = e.nextElement();
 
 			Attributes attrs = member.attribute_info;
 
@@ -266,8 +270,8 @@ public class ClassInvestigator extends C
 		}
 
 		// methods
-		for (Enumeration e = getMethods(); e.hasMoreElements(); ) {
-			ClassMember member = (ClassMember) e.nextElement();
+		for (Enumeration<ClassMember> e = getMethods(); e.hasMoreElements(); ) {
+			ClassMember member = e.nextElement();
 
 			Attributes attrs = member.attribute_info;
 
@@ -392,10 +396,10 @@ public class ClassInvestigator extends C
 		renameMembers(getMethods(), classNameMap, memberNameMap);
 	}
 
-	private void renameMembers(Enumeration e, Hashtable classNameMap, Hashtable memberNameMap)
{
+	private void renameMembers(Enumeration<ClassMember> e, Hashtable classNameMap, Hashtable
memberNameMap) {
 
 		for (; e.hasMoreElements(); ) {
-			ClassMember member = (ClassMember) e.nextElement();
+			ClassMember member = e.nextElement();
 
 			String oldMemberName = nameIndexToString(member.name_index);
 			String newMemberName = (String) memberNameMap.get(oldMemberName);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/MemberTable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/MemberTable.java?rev=1480365&r1=1480364&r2=1480365&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/MemberTable.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/MemberTable.java
Wed May  8 17:25:00 2013
@@ -29,13 +29,13 @@ import java.util.Vector;
 
 
 class MemberTable {
-	protected Vector entries;
-	private Hashtable hashtable;
+	protected Vector<ClassMember> entries;
+	private Hashtable<MemberTableHash,MemberTableHash> hashtable;
 	private MemberTableHash	mutableMTH = null;
 
 	public MemberTable(int count) {
-		entries = new Vector(count);
-		hashtable = new Hashtable((count > 50) ? count : 50);
+		entries = new Vector<ClassMember>(count);
+		hashtable = new Hashtable<MemberTableHash,MemberTableHash>((count > 50) ? count
: 50);
 		mutableMTH = new MemberTableHash(null, null);
 	}
 
@@ -59,21 +59,21 @@ class MemberTable {
 		mutableMTH.setHashCode();
 
 		/* search the hash table */
-		MemberTableHash mth = (MemberTableHash) hashtable.get(mutableMTH);
+		MemberTableHash mth = hashtable.get(mutableMTH);
 		if (mth == null)
 		{
 			return null;
 		}
 
-		return (ClassMember) entries.get(mth.index);
+		return entries.get(mth.index);
 	}
 
 	void put(ClassFormatOutput out) throws IOException {
 
-		Vector lentries = entries;
+		Vector<ClassMember> lentries = entries;
 		int count = lentries.size();
 		for (int i = 0; i < count; i++) {
-			((ClassMember) lentries.get(i)).put(out);
+			lentries.get(i).put(out);
 		}
 	}
 
@@ -84,10 +84,10 @@ class MemberTable {
 	int classFileSize() {
 		int size = 0;
 
-		Vector lentries = entries;
+		Vector<ClassMember> lentries = entries;
 		int count = lentries.size();
 		for (int i = 0; i < count; i++) {
-			size += ((ClassMember) lentries.get(i)).classFileSize();
+			size += lentries.get(i).classFileSize();
 		}
 
 		return size;

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=1480365&r1=1480364&r2=1480365&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 May
 8 17:25:00 2013
@@ -194,10 +194,10 @@ public abstract class JVMInfo
      */
     private static String getSystemProperty(final String name) {
         
-        return (String) AccessController
-                .doPrivileged(new java.security.PrivilegedAction() {
+        return AccessController
+                .doPrivileged(new java.security.PrivilegedAction<String>() {
                     
-                    public Object run() {
+                    public String run() {
                         return System.getProperty(name);
                         
                     }
@@ -232,12 +232,12 @@ public abstract class JVMInfo
      */
     public static void javaDump() {
         if (isIBMJVM()) {
-            Class ibmc = null;
+            Class<?> ibmc = null;
             try {
                 ibmc = Class.forName("com.ibm.jvm.Dump");
-                final Method ibmm = ibmc.getMethod("JavaDump", new Class[] {});
+                final Method ibmm = ibmc.getMethod("JavaDump", new Class<?>[] {});
                 
-                AccessController.doPrivileged(new PrivilegedExceptionAction() {
+                AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
{
                     public Object run() throws IllegalAccessException,
                             MalformedURLException, InstantiationException,
                             InvocationTargetException {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Lockable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Lockable.java?rev=1480365&r1=1480364&r2=1480365&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Lockable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Lockable.java Wed
May  8 17:25:00 2013
@@ -147,5 +147,5 @@ public interface Lockable {
 
 		@see VirtualLockTable
 	 */
-	public boolean lockAttributes(int flag, Hashtable attributes);
+	public boolean lockAttributes(int flag, Hashtable<String,Object> attributes);
 }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/ShExLockable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/ShExLockable.java?rev=1480365&r1=1480364&r2=1480365&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/ShExLockable.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/ShExLockable.java
Wed May  8 17:25:00 2013
@@ -96,7 +96,7 @@ public class ShExLockable implements Loc
      * Any lockable object which DOES NOT want to participate should
      * override this function.
      */
-	public boolean lockAttributes(int flag, Hashtable attributes)
+	public boolean lockAttributes(int flag, Hashtable<String,Object> attributes)
 	{
         if((flag & VirtualLockTable.SHEXLOCK) == 0)
             return false;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyValidation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyValidation.java?rev=1480365&r1=1480364&r2=1480365&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyValidation.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyValidation.java
Wed May  8 17:25:00 2013
@@ -39,7 +39,7 @@ import java.util.Vector;
 
 public class PropertyValidation implements PropertyFactory
 {
-	private Vector  notifyOnSet;
+	private Vector<PropertySetCallback>  notifyOnSet;
 
     /* Constructors for This class: */
 	public PropertyValidation()
@@ -57,7 +57,7 @@ public class PropertyValidation implemen
 			synchronized (this) {
 
 				for (int i = 0; i < notifyOnSet.size() ; i++) {
-					PropertySetCallback psc = (PropertySetCallback) notifyOnSet.get(i);
+					PropertySetCallback psc = notifyOnSet.get(i);
 					if (!psc.validate(key, value, d))
 						continue;
 
@@ -101,7 +101,7 @@ public class PropertyValidation implemen
 		Serializable mappedValue = null;
  		if (notifyOnSet != null) {
 			for (int i = 0; i < notifyOnSet.size() && mappedValue == null; i++) {
-				PropertySetCallback psc = (PropertySetCallback) notifyOnSet.get(i);
+				PropertySetCallback psc = notifyOnSet.get(i);
 				mappedValue = psc.map(key, value, set);
 			}
 		}
@@ -126,7 +126,7 @@ public class PropertyValidation implemen
 
  		if (notifyOnSet != null) {
 			for (int i = 0; i < notifyOnSet.size(); i++) {
-				PropertySetCallback psc = (PropertySetCallback) notifyOnSet.get(i);
+				PropertySetCallback psc = notifyOnSet.get(i);
 				psc.validate(key, value, set);
 			}
 		}
@@ -135,7 +135,7 @@ public class PropertyValidation implemen
 	public synchronized void addPropertySetNotification(PropertySetCallback who){
 
 		if (notifyOnSet == null)
-			notifyOnSet = new Vector(1,1);
+			notifyOnSet = new Vector<PropertySetCallback>(1,1);
 		notifyOnSet.add(who);
 
 	}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/build.xml?rev=1480365&r1=1480364&r2=1480365&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/build.xml Wed May  8 17:25:00
2013
@@ -35,12 +35,9 @@
 <!-- Targets -->
 
   <target name="compile_types">
-    <!-- We only compile SqlXmlUtil against JDK 1.4 because it   -->
-    <!-- relies on several XML classes that are part of 1.4 but  -->
-    <!-- that aren't in 1.3.                                     -->
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -52,50 +49,10 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${xmlApis};${java15compile.classpath}"/>
-      </classpath>
-      <include name="${derby.dir}/iapi/types/SqlXmlUtil.java"/>
-    </javac>
-    <javac
-      source="1.4"
-      target="1.4"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="${debug}"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}"
-      srcdir="${derby.engine.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${java16compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/iapi/types/*.java"/>
-      <exclude name="${derby.dir}/iapi/types/SQLDecimal.java"/>
-      <exclude name="${derby.dir}/iapi/types/J2SEDataValueFactory.java"/>
-      <exclude name="${derby.dir}/iapi/types/SqlXmlUtil.java"/>
-    </javac>
-    <javac
-      source="1.4"
-      target="1.4"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="${debug}"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}"
-      srcdir="${derby.engine.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${java15compile.classpath}"/>
-      </classpath>
-      <include name="${derby.dir}/iapi/types/SQLDecimal.java"/>
-      <include name="${derby.dir}/iapi/types/J2SEDataValueFactory.java"/>
-      <exclude name="${derby.dir}/iapi/types/SqlXmlUtil.java"/>
+      <!-- <compilerarg value="-Xlint:unchecked"/> -->
     </javac>
   </target>
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/io/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/io/build.xml?rev=1480365&r1=1480364&r2=1480365&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/io/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/io/build.xml Wed May  8 17:25:00 2013
@@ -37,8 +37,8 @@
 
   <target name="compile_io">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -50,9 +50,10 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${java16compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/io/**"/>
+      <compilerarg value="-Xlint:unchecked"/>
     </javac>
   </target>
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplate.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplate.java?rev=1480365&r1=1480364&r2=1480365&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplate.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplate.java Wed May  8 17:25:00
2013
@@ -36,6 +36,7 @@ import java.sql.ResultSetMetaData;
 import java.sql.RowId;
 import java.sql.SQLData;
 import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
 import java.sql.SQLInput;
 import java.sql.SQLOutput;
 import java.sql.SQLWarning;
@@ -285,7 +286,7 @@ public abstract class VTITemplate   impl
      */
     protected SQLException    notImplemented( String methodName )
     {
-        return new SQLException( "Unimplemented method: " + methodName );
+        return new SQLFeatureNotSupportedException( "Unimplemented method: " + methodName
);
     }
     
 }



Mime
View raw message