tomdz 2005/01/27 13:18:21
Modified: src/java/org/apache/ojb/broker/metadata Tag: OJB_1_0_RELEASE
ClassDescriptor.java
src/java/org/apache/ojb/broker/core/proxy Tag:
OJB_1_0_RELEASE VirtualProxy.java
Log:
Fixed preprocessor handling for JDK1.2
Revision Changes Path
No revision
No revision
1.88.2.6 +3 -2
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.88.2.5
retrieving revision 1.88.2.6
diff -u -r1.88.2.5 -r1.88.2.6
--- ClassDescriptor.java 27 Jan 2005 00:08:31 -0000 1.88.2.5
+++ ClassDescriptor.java 27 Jan 2005 21:18:20 -0000 1.88.2.6
@@ -19,7 +19,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;
@@ -49,6 +48,8 @@
import org.apache.ojb.broker.util.configuration.Configurator;
import org.apache.ojb.broker.util.configuration.impl.OjbConfigurator;
import org.apache.ojb.broker.util.logging.LoggerFactory;
+//#ifdef JDK13
+import java.lang.reflect.Proxy;
//#else
/*
import net.sf.cglib.proxy.Proxy;
No revision
No revision
1.1.2.2 +3 -2
db-ojb/src/java/org/apache/ojb/broker/core/proxy/VirtualProxy.java
Index: VirtualProxy.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/VirtualProxy.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- VirtualProxy.java 27 Jan 2005 00:10:33 -0000 1.1.2.1
+++ VirtualProxy.java 27 Jan 2005 21:18:21 -0000 1.1.2.2
@@ -18,11 +18,12 @@
import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationHandler;
import org.apache.ojb.broker.Identity;
import org.apache.ojb.broker.PBKey;
import org.apache.ojb.broker.PersistenceBrokerException;
+//#ifdef JDK13
+import java.lang.reflect.InvocationHandler;
//#else
/*
import net.sf.cglib.proxy.InvocationHandler;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
