You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by ar...@apache.org on 2003/04/18 13:15:58 UTC
cvs commit: db-ojb/src/java/org/apache/ojb/broker/util ProxyHelper.java
arminw 2003/04/18 04:15:58
Modified: src/java/org/apache/ojb/broker/metadata FieldDescriptor.java
RepositoryXmlHandler.java
src/java/org/apache/ojb/broker/singlevm
PersistenceBrokerImpl.java
src/java/org/apache/ojb/broker/util ProxyHelper.java
Log:
- add attribute 'access' method support to
FieldDescriptor
- repair #if-preprocess
Revision Changes Path
1.21 +31 -2 db-ojb/src/java/org/apache/ojb/broker/metadata/FieldDescriptor.java
Index: FieldDescriptor.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/FieldDescriptor.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- FieldDescriptor.java 4 Apr 2003 19:15:55 -0000 1.20
+++ FieldDescriptor.java 18 Apr 2003 11:15:58 -0000 1.21
@@ -78,6 +78,10 @@
*/
public class FieldDescriptor extends AttributeDescriptorBase implements XmlCapable, Serializable
{
+ public static final String ACCESS_ANONYMOUS = RepositoryElements.TAG_ACCESS_ANONYMOUS;
+ public static final String ACCESS_READONLY = RepositoryElements.TAG_ACCESS_READONLY;
+ public static final String ACCESS_READWRITE = RepositoryElements.TAG_ACCESS_READWRITE;
+
private int m_ColNo;
private String m_ColumnName;
private String m_ColumnType;
@@ -97,11 +101,12 @@
private FieldConversion fieldConversion = null;
// true if field is used for optimistic locking BRJ
private boolean locking = false;
- // if locking is true and updateLock is true then
+ // if locking is true and updateLock is true then
// on save lock columns will be updated.
// if false then it is the responsibility of the
// dbms to update all lock columns eg using triggers
private boolean updateLock = true;
+ private String access;
/**
* returns a comparator that allows to sort a Vector of FieldMappingDecriptors
@@ -278,7 +283,9 @@
public String toString()
{
// here we got value of all fields
- return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
+ String result = ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
+ result = result + " --> belonging class was " + getClassDescriptor().getClassNameOfObject();
+ return result;
}
/**
@@ -490,6 +497,25 @@
this.lengthSpecified = lengthSpecified;
}
+ public String getAccess()
+ {
+ return access;
+ }
+
+ public void setAccess(String access)
+ {
+ if(ACCESS_ANONYMOUS.equals(access) ||
+ ACCESS_READONLY.equals(access) ||
+ ACCESS_READWRITE.equals(access))
+ {
+ this.access = access;
+ }
+ else
+ {
+ throw new OJBRuntimeException("Try to set unkown field 'access' value: "+access);
+ }
+ }
+
/*
* @see XmlCapable#toXML()
*/
@@ -574,6 +600,9 @@
{
result += " " + tags.getAttribute(SCALE, "" + getScale()) + eol;
}
+
+ // access
+ result += " " + tags.getAttribute(ACCESS, this.getAccess()) + eol;
result += " />" + eol;
return result;
1.40 +9 -8 db-ojb/src/java/org/apache/ojb/broker/metadata/RepositoryXmlHandler.java
Index: RepositoryXmlHandler.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/RepositoryXmlHandler.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- RepositoryXmlHandler.java 3 Apr 2003 20:35:26 -0000 1.39
+++ RepositoryXmlHandler.java 18 Apr 2003 11:15:58 -0000 1.40
@@ -317,17 +317,18 @@
String strId = atts.getValue(tags.getTagById(ID));
m_lastId = (strId == null ? m_lastId + 1 : Integer.parseInt(strId));
-
+
String strAccess = atts.getValue(tags.getTagById(ACCESS));
+
if (tags.TAG_ACCESS_ANONYMOUS.equalsIgnoreCase(strAccess))
{
- m_CurrentFLD = new AnonymousFieldDescriptor(m_CurrentCLD, m_lastId);
+ m_CurrentFLD = new AnonymousFieldDescriptor(m_CurrentCLD, m_lastId);
}
else
{
m_CurrentFLD = new FieldDescriptor(m_CurrentCLD, m_lastId);
- }
-
+ }
+ m_CurrentFLD.setAccess(strAccess);
m_CurrentCLD.addFieldDescriptor(m_CurrentFLD);
// prepare for custom attributes
@@ -335,7 +336,7 @@
String fieldName = atts.getValue(tags.getTagById(FIELD_NAME));
if (isDebug) logger.debug(" " + tags.getTagById(FIELD_NAME) + ": " + fieldName);
-
+
if (tags.TAG_ACCESS_ANONYMOUS.equalsIgnoreCase(strAccess))
{
m_CurrentFLD.setPersistentField(null, fieldName);
@@ -430,7 +431,7 @@
break;
}
-
+
case REFERENCE_DESCRIPTOR:
{
if (isDebug) logger.debug(" > " + tags.getTagById(REFERENCE_DESCRIPTOR));
@@ -928,7 +929,7 @@
logger.warn("unknown isolation-level: " + isoLevel + " using RW_UNCOMMITTED as default");
return defIsoLevel;
}
-
+
/**
* Check inheritance
* @author Houar TINE
1.156 +4 -1 db-ojb/src/java/org/apache/ojb/broker/singlevm/PersistenceBrokerImpl.java
Index: PersistenceBrokerImpl.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/singlevm/PersistenceBrokerImpl.java,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- PersistenceBrokerImpl.java 17 Apr 2003 16:55:34 -0000 1.155
+++ PersistenceBrokerImpl.java 18 Apr 2003 11:15:58 -0000 1.156
@@ -101,6 +101,9 @@
import org.apache.ojb.broker.util.sequence.SequenceManager;
import org.apache.ojb.broker.util.sequence.SequenceManagerException;
import org.apache.ojb.broker.util.sequence.SequenceManagerFactory;
+
+//#ifdef JDK13
+import java.lang.reflect.Proxy;
//#else
/*
import com.develop.java.lang.reflect.Proxy;
1.6 +8 -5 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ProxyHelper.java 17 Apr 2003 16:55:33 -0000 1.5
+++ ProxyHelper.java 18 Apr 2003 11:15:58 -0000 1.6
@@ -70,6 +70,9 @@
import org.apache.ojb.broker.singlevm.PersistenceBrokerImpl;
import org.apache.ojb.broker.util.logging.Logger;
import org.apache.ojb.broker.util.logging.LoggerFactory;
+
+//#ifdef JDK13
+import java.lang.reflect.Proxy;
//#else
/*
import com.develop.java.lang.reflect.Proxy;
@@ -239,7 +242,7 @@
return objectOrProxy.getClass();
}
}
-
+
/**
* Create a Collection Proxy for a given query
* @param broker
@@ -252,7 +255,7 @@
Class paramType[] = { PBKey.class, Class.class, Query.class };
Object param[] = { broker.getPBKey(), collectionClass, query };
Class proxyClass = broker.getCollectionProxyClass();
-
+
if (proxyClass == null)
{
proxyClass = getCollectionProxyClass(collectionClass);
@@ -267,7 +270,7 @@
throw new PersistenceBrokerException(e);
}
}
-
+
/**
* Answer the class to be used for CollectionProxy
* @param collectionClass
@@ -287,5 +290,5 @@
return CollectionProxy.class;
}
-
+
}