Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/Property.java (from r479154, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/Property.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/Property.java?view=diff&rev=479155&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/Property.java&r1=479154&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/Property.java&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/Property.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/Property.java Sat Nov 25 09:58:07 2006 @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.property; +package org.apache.cayenne.reflect; /** * Defines bean property API used by Cayenne to access object data, do faulting and graph
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/PropertyException.java (from r479154, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/PropertyException.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/PropertyException.java?view=diff&rev=479155&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/PropertyException.java&r1=479154&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/PropertyException.java&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/PropertyException.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/PropertyException.java Sat Nov 25 09:58:07 2006 @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.property; +package org.apache.cayenne.reflect; import org.apache.cayenne.CayenneRuntimeException; Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/PropertyUtils.java (from r479154, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/PropertyUtils.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/PropertyUtils.java?view=diff&rev=479155&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/PropertyUtils.java&r1=479154&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/PropertyUtils.java&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/PropertyUtils.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/PropertyUtils.java Sat Nov 25 09:58:07 2006 @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.property; +package org.apache.cayenne.reflect; import java.beans.BeanInfo; import java.beans.IntrospectionException; Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/PropertyVisitor.java (from r479154, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/PropertyVisitor.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/PropertyVisitor.java?view=diff&rev=479155&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/PropertyVisitor.java&r1=479154&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/PropertyVisitor.java&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/PropertyVisitor.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/PropertyVisitor.java Sat Nov 25 09:58:07 2006 @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.property; +package org.apache.cayenne.reflect; /** * A visitor for various types of properties in a ClassDescriptor. Helpful in defining Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/SimpleAttributeProperty.java (from r479154, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/SimpleAttributeProperty.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/SimpleAttributeProperty.java?view=diff&rev=479155&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/SimpleAttributeProperty.java&r1=479154&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/SimpleAttributeProperty.java&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/SimpleAttributeProperty.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/SimpleAttributeProperty.java Sat Nov 25 09:58:07 2006 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ****************************************************************/ -package org.apache.cayenne.property; +package org.apache.cayenne.reflect; import org.apache.cayenne.ObjectContext; import org.apache.cayenne.Persistent; Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/ToManyListProperty.java (from r479154, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/ToManyListProperty.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/ToManyListProperty.java?view=diff&rev=479155&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/ToManyListProperty.java&r1=479154&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/ToManyListProperty.java&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/ToManyListProperty.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/ToManyListProperty.java Sat Nov 25 09:58:07 2006 @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.property; +package org.apache.cayenne.reflect; import org.apache.cayenne.Fault; import org.apache.cayenne.Persistent; Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/ToManyProperty.java (from r479154, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/ToManyProperty.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/ToManyProperty.java?view=diff&rev=479155&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/ToManyProperty.java&r1=479154&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/ToManyProperty.java&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/ToManyProperty.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/ToManyProperty.java Sat Nov 25 09:58:07 2006 @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.property; +package org.apache.cayenne.reflect; /** Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/ToOneProperty.java (from r479154, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/ToOneProperty.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/ToOneProperty.java?view=diff&rev=479155&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/ToOneProperty.java&r1=479154&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/ToOneProperty.java&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/ToOneProperty.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/ToOneProperty.java Sat Nov 25 09:58:07 2006 @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.property; +package org.apache.cayenne.reflect; /** * An ArcProperty that points to a single graph node. Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/ValueHolderProperty.java (from r479154, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/ValueHolderProperty.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/ValueHolderProperty.java?view=diff&rev=479155&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/ValueHolderProperty.java&r1=479154&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/ValueHolderProperty.java&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/ValueHolderProperty.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/ValueHolderProperty.java Sat Nov 25 09:58:07 2006 @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.property; +package org.apache.cayenne.reflect; import org.apache.cayenne.Persistent; import org.apache.cayenne.ValueHolder; Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/remote/ClientChannel.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/remote/ClientChannel.java?view=diff&rev=479155&r1=479154&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/remote/ClientChannel.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/remote/ClientChannel.java Sat Nov 25 09:58:07 2006 @@ -36,9 +36,9 @@ import org.apache.cayenne.graph.GraphDiff; import org.apache.cayenne.graph.GraphEvent; import org.apache.cayenne.map.EntityResolver; -import org.apache.cayenne.property.ClassDescriptor; import org.apache.cayenne.query.Query; import org.apache.cayenne.query.QueryMetadata; +import org.apache.cayenne.reflect.ClassDescriptor; import org.apache.cayenne.util.DeepMergeOperation; /** Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/remote/IncrementalQuery.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/remote/IncrementalQuery.java?view=diff&rev=479155&r1=479154&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/remote/IncrementalQuery.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/remote/IncrementalQuery.java Sat Nov 25 09:58:07 2006 @@ -24,13 +24,13 @@ import org.apache.cayenne.map.EntityResolver; import org.apache.cayenne.map.ObjEntity; import org.apache.cayenne.map.Procedure; -import org.apache.cayenne.property.ClassDescriptor; import org.apache.cayenne.query.PrefetchTreeNode; import org.apache.cayenne.query.Query; import org.apache.cayenne.query.QueryMetadata; import org.apache.cayenne.query.QueryRouter; import org.apache.cayenne.query.SQLAction; import org.apache.cayenne.query.SQLActionVisitor; +import org.apache.cayenne.reflect.ClassDescriptor; /** * A client wrapper for the incremental query that overrides the metadata to ensure that Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/remote/RangeQuery.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/remote/RangeQuery.java?view=diff&rev=479155&r1=479154&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/remote/RangeQuery.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/remote/RangeQuery.java Sat Nov 25 09:58:07 2006 @@ -24,13 +24,13 @@ import org.apache.cayenne.map.EntityResolver; import org.apache.cayenne.map.ObjEntity; import org.apache.cayenne.map.Procedure; -import org.apache.cayenne.property.ClassDescriptor; import org.apache.cayenne.query.PrefetchTreeNode; import org.apache.cayenne.query.Query; import org.apache.cayenne.query.QueryMetadata; import org.apache.cayenne.query.QueryRouter; import org.apache.cayenne.query.SQLAction; import org.apache.cayenne.query.SQLActionVisitor; +import org.apache.cayenne.reflect.ClassDescriptor; /** * An Query wrapper that triggers pagination processing on the server. This query is Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/DeepMergeOperation.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/DeepMergeOperation.java?view=diff&rev=479155&r1=479154&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/DeepMergeOperation.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/DeepMergeOperation.java Sat Nov 25 09:58:07 2006 @@ -29,11 +29,11 @@ import org.apache.cayenne.ObjectContext; import org.apache.cayenne.ObjectId; import org.apache.cayenne.Persistent; -import org.apache.cayenne.property.AttributeProperty; -import org.apache.cayenne.property.ClassDescriptor; -import org.apache.cayenne.property.ToManyProperty; -import org.apache.cayenne.property.PropertyVisitor; -import org.apache.cayenne.property.ToOneProperty; +import org.apache.cayenne.reflect.AttributeProperty; +import org.apache.cayenne.reflect.ClassDescriptor; +import org.apache.cayenne.reflect.PropertyVisitor; +import org.apache.cayenne.reflect.ToManyProperty; +import org.apache.cayenne.reflect.ToOneProperty; /** * An operation that performs object graph deep merge, terminating merge at unresolved Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/IndexPropertyList.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/IndexPropertyList.java?view=diff&rev=479155&r1=479154&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/IndexPropertyList.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/IndexPropertyList.java Sat Nov 25 09:58:07 2006 @@ -27,7 +27,7 @@ import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.ValueHolder; -import org.apache.cayenne.property.PropertyUtils; +import org.apache.cayenne.reflect.PropertyUtils; /** * A List implementation that would maintain its internal ordering based on some object Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/ObjectContextGraphAction.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/ObjectContextGraphAction.java?view=diff&rev=479155&r1=479154&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/ObjectContextGraphAction.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/ObjectContextGraphAction.java Sat Nov 25 09:58:07 2006 @@ -23,9 +23,9 @@ import org.apache.cayenne.ObjectContext; import org.apache.cayenne.PersistenceState; import org.apache.cayenne.Persistent; -import org.apache.cayenne.property.ArcProperty; -import org.apache.cayenne.property.ClassDescriptor; -import org.apache.cayenne.property.Property; +import org.apache.cayenne.reflect.ArcProperty; +import org.apache.cayenne.reflect.ClassDescriptor; +import org.apache.cayenne.reflect.Property; /** * A base implementation of a helper class to handle Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/ObjectContextQueryAction.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/ObjectContextQueryAction.java?view=diff&rev=479155&r1=479154&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/ObjectContextQueryAction.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/ObjectContextQueryAction.java Sat Nov 25 09:58:07 2006 @@ -30,12 +30,12 @@ import org.apache.cayenne.QueryResponse; import org.apache.cayenne.cache.QueryCache; import org.apache.cayenne.cache.QueryCacheEntryFactory; -import org.apache.cayenne.property.ArcProperty; -import org.apache.cayenne.property.ClassDescriptor; import org.apache.cayenne.query.ObjectIdQuery; import org.apache.cayenne.query.Query; import org.apache.cayenne.query.QueryMetadata; import org.apache.cayenne.query.RelationshipQuery; +import org.apache.cayenne.reflect.ArcProperty; +import org.apache.cayenne.reflect.ClassDescriptor; /** * A helper class that implements Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/ObjectDetachOperation.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/ObjectDetachOperation.java?view=diff&rev=479155&r1=479154&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/ObjectDetachOperation.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/ObjectDetachOperation.java Sat Nov 25 09:58:07 2006 @@ -29,13 +29,13 @@ import org.apache.cayenne.ObjectId; import org.apache.cayenne.Persistent; import org.apache.cayenne.map.EntityResolver; -import org.apache.cayenne.property.AttributeProperty; -import org.apache.cayenne.property.ClassDescriptor; -import org.apache.cayenne.property.ToManyProperty; -import org.apache.cayenne.property.Property; -import org.apache.cayenne.property.PropertyVisitor; -import org.apache.cayenne.property.ToOneProperty; import org.apache.cayenne.query.PrefetchTreeNode; +import org.apache.cayenne.reflect.AttributeProperty; +import org.apache.cayenne.reflect.ClassDescriptor; +import org.apache.cayenne.reflect.Property; +import org.apache.cayenne.reflect.PropertyVisitor; +import org.apache.cayenne.reflect.ToManyProperty; +import org.apache.cayenne.reflect.ToOneProperty; /** * An operation that creates a subgraph of detached objects, using the PrefetchTree to Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/RelationshipFault.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/RelationshipFault.java?view=diff&rev=479155&r1=479154&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/RelationshipFault.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/RelationshipFault.java Sat Nov 25 09:58:07 2006 @@ -28,8 +28,8 @@ import org.apache.cayenne.map.EntityResolver; import org.apache.cayenne.map.ObjEntity; import org.apache.cayenne.map.ObjRelationship; -import org.apache.cayenne.property.Property; import org.apache.cayenne.query.RelationshipQuery; +import org.apache.cayenne.reflect.Property; /** * An abstract superlcass of lazily faulted to-one and to-many relationships. Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/validation/BeanValidationFailure.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/validation/BeanValidationFailure.java?view=diff&rev=479155&r1=479154&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/validation/BeanValidationFailure.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/validation/BeanValidationFailure.java Sat Nov 25 09:58:07 2006 @@ -22,7 +22,7 @@ import java.util.Collection; import org.apache.cayenne.CayenneRuntimeException; -import org.apache.cayenne.property.PropertyUtils; +import org.apache.cayenne.reflect.PropertyUtils; /** * ValidationFailure implementation that described a failure of a single named property of Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/xml/SerializableEntity.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/xml/SerializableEntity.java?view=diff&rev=479155&r1=479154&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/xml/SerializableEntity.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/xml/SerializableEntity.java Sat Nov 25 09:58:07 2006 @@ -23,7 +23,7 @@ import java.util.Iterator; import org.apache.cayenne.CayenneRuntimeException; -import org.apache.cayenne.property.PropertyUtils; +import org.apache.cayenne.reflect.PropertyUtils; import org.w3c.dom.Element; /** Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/xml/XMLDecoder.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/xml/XMLDecoder.java?view=diff&rev=479155&r1=479154&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/xml/XMLDecoder.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/xml/XMLDecoder.java Sat Nov 25 09:58:07 2006 @@ -36,7 +36,7 @@ import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.Persistent; import org.apache.cayenne.access.DataContext; -import org.apache.cayenne.property.PropertyUtils; +import org.apache.cayenne.reflect.PropertyUtils; import org.apache.cayenne.util.Util; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/xml/XMLMappingDescriptor.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/xml/XMLMappingDescriptor.java?view=diff&rev=479155&r1=479154&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/xml/XMLMappingDescriptor.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/xml/XMLMappingDescriptor.java Sat Nov 25 09:58:07 2006 @@ -27,7 +27,7 @@ import javax.xml.parsers.DocumentBuilder; import org.apache.cayenne.CayenneRuntimeException; -import org.apache.cayenne.property.PropertyUtils; +import org.apache.cayenne.reflect.PropertyUtils; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataRowUtilsTst.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataRowUtilsTst.java?view=diff&rev=479155&r1=479154&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataRowUtilsTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataRowUtilsTst.java Sat Nov 25 09:58:07 2006 @@ -26,9 +26,9 @@ import org.apache.art.Painting; import org.apache.cayenne.DataRow; import org.apache.cayenne.exp.Expression; -import org.apache.cayenne.property.ArcProperty; -import org.apache.cayenne.property.ClassDescriptor; import org.apache.cayenne.query.SelectQuery; +import org.apache.cayenne.reflect.ArcProperty; +import org.apache.cayenne.reflect.ClassDescriptor; import org.apache.cayenne.unit.CayenneTestCase; /** Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextTst.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextTst.java?view=diff&rev=479155&r1=479154&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextTst.java Sat Nov 25 09:58:07 2006 @@ -24,9 +24,9 @@ import org.apache.cayenne.Fault; import org.apache.cayenne.FlattenedRelationshipsTst; import org.apache.cayenne.PersistenceState; -import org.apache.cayenne.property.ArcProperty; -import org.apache.cayenne.property.ClassDescriptor; import org.apache.cayenne.query.SelectQuery; +import org.apache.cayenne.reflect.ArcProperty; +import org.apache.cayenne.reflect.ClassDescriptor; import org.apache.cayenne.testdo.relationship.FlattenedTest3; import org.apache.cayenne.unit.RelationshipTestCase; Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/ObjectTreeResolver_TreeBuilderTst.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/ObjectTreeResolver_TreeBuilderTst.java?view=diff&rev=479155&r1=479154&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/ObjectTreeResolver_TreeBuilderTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/ObjectTreeResolver_TreeBuilderTst.java Sat Nov 25 09:58:07 2006 @@ -32,10 +32,10 @@ import org.apache.cayenne.map.DataMap; import org.apache.cayenne.map.DbEntity; import org.apache.cayenne.map.ObjEntity; -import org.apache.cayenne.property.ClassDescriptor; import org.apache.cayenne.query.MockQueryMetadata; import org.apache.cayenne.query.PrefetchTreeNode; import org.apache.cayenne.query.QueryMetadata; +import org.apache.cayenne.reflect.ClassDescriptor; import org.apache.cayenne.unit.CayenneTestCase; public class ObjectTreeResolver_TreeBuilderTst extends CayenneTestCase { Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorTst.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorTst.java?view=diff&rev=479155&r1=479154&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorTst.java Sat Nov 25 09:58:07 2006 @@ -20,11 +20,11 @@ package org.apache.cayenne.map; import org.apache.cayenne.map.compiled.ProxyClassDescriptor; -import org.apache.cayenne.property.ArcProperty; -import org.apache.cayenne.property.ClassDescriptor; -import org.apache.cayenne.property.MockClassDescriptor; -import org.apache.cayenne.property.MockClassDescriptorFactory; -import org.apache.cayenne.property.Property; +import org.apache.cayenne.reflect.ArcProperty; +import org.apache.cayenne.reflect.ClassDescriptor; +import org.apache.cayenne.reflect.MockClassDescriptor; +import org.apache.cayenne.reflect.MockClassDescriptorFactory; +import org.apache.cayenne.reflect.Property; import org.apache.cayenne.testdo.mt.MtTable1; import org.apache.cayenne.testdo.mt.MtTable2; import org.apache.cayenne.unit.AccessStack; Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/map/compiled/PersistentDescriptorTst.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/map/compiled/PersistentDescriptorTst.java?view=diff&rev=479155&r1=479154&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/map/compiled/PersistentDescriptorTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/map/compiled/PersistentDescriptorTst.java Sat Nov 25 09:58:07 2006 @@ -21,9 +21,9 @@ import junit.framework.TestCase; -import org.apache.cayenne.property.FieldAccessor; -import org.apache.cayenne.property.Property; -import org.apache.cayenne.property.SimpleAttributeProperty; +import org.apache.cayenne.reflect.FieldAccessor; +import org.apache.cayenne.reflect.Property; +import org.apache.cayenne.reflect.SimpleAttributeProperty; import org.apache.cayenne.unit.util.TestBean; public class PersistentDescriptorTst extends TestCase { Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/query/MockQueryMetadata.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/query/MockQueryMetadata.java?view=diff&rev=479155&r1=479154&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/query/MockQueryMetadata.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/query/MockQueryMetadata.java Sat Nov 25 09:58:07 2006 @@ -23,7 +23,7 @@ import org.apache.cayenne.map.DbEntity; import org.apache.cayenne.map.ObjEntity; import org.apache.cayenne.map.Procedure; -import org.apache.cayenne.property.ClassDescriptor; +import org.apache.cayenne.reflect.ClassDescriptor; public class MockQueryMetadata implements QueryMetadata { Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/BasePropertyTst.java (from r479154, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/BasePropertyTst.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/BasePropertyTst.java?view=diff&rev=479155&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/BasePropertyTst.java&r1=479154&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/BasePropertyTst.java&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/BasePropertyTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/BasePropertyTst.java Sat Nov 25 09:58:07 2006 @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. ****************************************************************/ -package org.apache.cayenne.property; +package org.apache.cayenne.reflect; + +import org.apache.cayenne.reflect.BaseProperty; import junit.framework.TestCase; Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/BeanAccessorTst.java (from r479154, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/BeanAccessorTst.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/BeanAccessorTst.java?view=diff&rev=479155&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/BeanAccessorTst.java&r1=479154&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/BeanAccessorTst.java&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/BeanAccessorTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/BeanAccessorTst.java Sat Nov 25 09:58:07 2006 @@ -17,7 +17,9 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.property; +package org.apache.cayenne.reflect; + +import org.apache.cayenne.reflect.BeanAccessor; import junit.framework.TestCase; Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/FieldAccessorTst.java (from r479154, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/FieldAccessorTst.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/FieldAccessorTst.java?view=diff&rev=479155&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/FieldAccessorTst.java&r1=479154&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/FieldAccessorTst.java&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/FieldAccessorTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/FieldAccessorTst.java Sat Nov 25 09:58:07 2006 @@ -17,10 +17,11 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.property; +package org.apache.cayenne.reflect; import junit.framework.TestCase; +import org.apache.cayenne.reflect.FieldAccessor; import org.apache.cayenne.unit.util.TestBean; public class FieldAccessorTst extends TestCase { Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyTst.java (from r479154, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/MixedPersistenceStrategyTst.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyTst.java?view=diff&rev=479155&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/MixedPersistenceStrategyTst.java&r1=479154&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyTst.java&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/MixedPersistenceStrategyTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyTst.java Sat Nov 25 09:58:07 2006 @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.property; +package org.apache.cayenne.reflect; import org.apache.art.MixedPersistenceStrategy; import org.apache.art.MixedPersistenceStrategy2; Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/MockAccessor.java (from r479154, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/MockAccessor.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/MockAccessor.java?view=diff&rev=479155&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/MockAccessor.java&r1=479154&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/MockAccessor.java&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/MockAccessor.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/MockAccessor.java Sat Nov 25 09:58:07 2006 @@ -16,7 +16,10 @@ * specific language governing permissions and limitations * under the License. ****************************************************************/ -package org.apache.cayenne.property; +package org.apache.cayenne.reflect; + +import org.apache.cayenne.reflect.Accessor; +import org.apache.cayenne.reflect.PropertyException; public class MockAccessor implements Accessor { Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/MockBaseProperty.java (from r479154, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/MockBaseProperty.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/MockBaseProperty.java?view=diff&rev=479155&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/MockBaseProperty.java&r1=479154&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/MockBaseProperty.java&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/MockBaseProperty.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/MockBaseProperty.java Sat Nov 25 09:58:07 2006 @@ -16,7 +16,12 @@ * specific language governing permissions and limitations * under the License. ****************************************************************/ -package org.apache.cayenne.property; +package org.apache.cayenne.reflect; + +import org.apache.cayenne.reflect.Accessor; +import org.apache.cayenne.reflect.BaseProperty; +import org.apache.cayenne.reflect.ClassDescriptor; +import org.apache.cayenne.reflect.PropertyVisitor; public class MockBaseProperty extends BaseProperty { Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/MockClassDescriptor.java (from r479154, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/MockClassDescriptor.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/MockClassDescriptor.java?view=diff&rev=479155&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/MockClassDescriptor.java&r1=479154&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/MockClassDescriptor.java&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/MockClassDescriptor.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/MockClassDescriptor.java Sat Nov 25 09:58:07 2006 @@ -17,11 +17,16 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.property; +package org.apache.cayenne.reflect; import java.util.Iterator; import org.apache.cayenne.map.ObjEntity; +import org.apache.cayenne.reflect.Accessor; +import org.apache.cayenne.reflect.ClassDescriptor; +import org.apache.cayenne.reflect.Property; +import org.apache.cayenne.reflect.PropertyException; +import org.apache.cayenne.reflect.PropertyVisitor; public class MockClassDescriptor implements ClassDescriptor { Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/MockClassDescriptorFactory.java (from r479154, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/MockClassDescriptorFactory.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/MockClassDescriptorFactory.java?view=diff&rev=479155&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/MockClassDescriptorFactory.java&r1=479154&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/MockClassDescriptorFactory.java&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/MockClassDescriptorFactory.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/MockClassDescriptorFactory.java Sat Nov 25 09:58:07 2006 @@ -17,10 +17,10 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.property; +package org.apache.cayenne.reflect; -import org.apache.cayenne.property.ClassDescriptor; -import org.apache.cayenne.property.ClassDescriptorFactory; +import org.apache.cayenne.reflect.ClassDescriptor; +import org.apache.cayenne.reflect.ClassDescriptorFactory; public class MockClassDescriptorFactory implements ClassDescriptorFactory { Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/PropertyUtilsTst.java (from r479154, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/PropertyUtilsTst.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/PropertyUtilsTst.java?view=diff&rev=479155&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/PropertyUtilsTst.java&r1=479154&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/PropertyUtilsTst.java&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/PropertyUtilsTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/PropertyUtilsTst.java Sat Nov 25 09:58:07 2006 @@ -17,11 +17,13 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.property; +package org.apache.cayenne.reflect; import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; + +import org.apache.cayenne.reflect.PropertyUtils; import junit.framework.TestCase; Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/TestFields.java (from r479154, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/TestFields.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/TestFields.java?view=diff&rev=479155&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/TestFields.java&r1=479154&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/TestFields.java&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/TestFields.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/TestFields.java Sat Nov 25 09:58:07 2006 @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.property; +package org.apache.cayenne.reflect; public class TestFields { Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/TestJavaBean.java (from r479154, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/TestJavaBean.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/TestJavaBean.java?view=diff&rev=479155&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/TestJavaBean.java&r1=479154&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/TestJavaBean.java&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/property/TestJavaBean.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/reflect/TestJavaBean.java Sat Nov 25 09:58:07 2006 @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.property; +package org.apache.cayenne.reflect; public class TestJavaBean extends Object { Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceTst.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceTst.java?view=diff&rev=479155&r1=479154&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceTst.java Sat Nov 25 09:58:07 2006 @@ -23,8 +23,8 @@ import org.apache.cayenne.PersistenceState; import org.apache.cayenne.access.DataContext; -import org.apache.cayenne.property.ClassDescriptor; import org.apache.cayenne.query.SelectQuery; +import org.apache.cayenne.reflect.ClassDescriptor; import org.apache.cayenne.testdo.inherit.Department; import org.apache.cayenne.testdo.inherit.Employee; import org.apache.cayenne.testdo.inherit.Manager; Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/DeepMergeOperationTst.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/DeepMergeOperationTst.java?view=diff&rev=479155&r1=479154&r2=479155 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/DeepMergeOperationTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/DeepMergeOperationTst.java Sat Nov 25 09:58:07 2006 @@ -23,7 +23,7 @@ import org.apache.cayenne.DataObjectUtils; import org.apache.cayenne.PersistenceState; import org.apache.cayenne.access.DataContext; -import org.apache.cayenne.property.ClassDescriptor; +import org.apache.cayenne.reflect.ClassDescriptor; import org.apache.cayenne.unit.CayenneTestCase; import org.apache.cayenne.util.DeepMergeOperation;
