db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject cvs commit: db-ojb/src/java/org/apache/ojb/broker/core PersistenceBrokerImpl.java
Date Sun, 04 May 2003 11:06:04 GMT
thma        2003/05/04 04:06:04

  Modified:    src/java/org/apache/ojb/broker/util ProxyHelper.java
               src/java/org/apache/ojb/broker/metadata ClassDescriptor.java
               src/java/org/apache/ojb/broker/core
                        PersistenceBrokerImpl.java
  Log:
  repair broken #ifdefs for JDK1.2 import statements
  
  Revision  Changes    Path
  1.9       +7 -1      db-ojb/src/java/org/apache/ojb/broker/util/ProxyHelper.java
  
  Index: ProxyHelper.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/ProxyHelper.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ProxyHelper.java	26 Apr 2003 23:18:24 -0000	1.8
  +++ ProxyHelper.java	4 May 2003 11:06:03 -0000	1.9
  @@ -54,7 +54,13 @@
    * <http://www.apache.org/>.
    */
   
  +//#ifdef JDK13
   import java.lang.reflect.Proxy;
  +//#else
  +/*
  +import com.develop.java.lang.reflect.Proxy;
  +*/
  +//#endif
   import java.util.List;
   import java.util.Set;
   
  
  
  
  1.59      +4 -4      db-ojb/src/java/org/apache/ojb/broker/metadata/ClassDescriptor.java
  
  Index: ClassDescriptor.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/ClassDescriptor.java,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- ClassDescriptor.java	2 May 2003 18:17:14 -0000	1.58
  +++ ClassDescriptor.java	4 May 2003 11:06:04 -0000	1.59
  @@ -58,7 +58,6 @@
   import java.lang.reflect.Constructor;
   import java.lang.reflect.Method;
   import java.lang.reflect.Modifier;
  -import java.lang.reflect.Proxy;
   import java.sql.Timestamp;
   import java.util.ArrayList;
   import java.util.Arrays;
  @@ -70,6 +69,7 @@
   import java.util.Map;
   import java.util.Vector;
   
  +
   import org.apache.commons.lang.builder.ToStringBuilder;
   import org.apache.ojb.broker.PersistenceBrokerException;
   import org.apache.ojb.broker.accesslayer.RowReader;
  @@ -82,8 +82,8 @@
   import org.apache.ojb.broker.util.configuration.impl.OjbConfigurator;
   import org.apache.ojb.broker.util.logging.LoggerFactory;
   
  -//#ifdef JDK13   
  -//import java.lang.reflect.Proxy;
  +//#ifdef JDK13
  +import java.lang.reflect.Proxy;
   //#else
   /*
   import com.develop.java.lang.reflect.Proxy;
  
  
  
  1.6       +1 -2      db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerImpl.java
  
  Index: PersistenceBrokerImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- PersistenceBrokerImpl.java	4 May 2003 10:10:31 -0000	1.5
  +++ PersistenceBrokerImpl.java	4 May 2003 11:06:04 -0000	1.6
  @@ -55,7 +55,6 @@
    */
   
   import java.lang.reflect.Array;
  -import java.lang.reflect.Proxy;
   import java.util.ArrayList;
   import java.util.Collection;
   import java.util.Enumeration;
  
  
  

Mime
View raw message