You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by mi...@apache.org on 2009/03/23 00:45:35 UTC

svn commit: r757280 [22/23] - in /openjpa/branches/1.0.x: openjpa-examples/src/main/java/hellojpa/ openjpa-examples/src/main/java/relations/ openjpa-jdbc-5/src/main/java/org/apache/openjpa/jdbc/meta/strats/ openjpa-jdbc/src/main/java/org/apache/openjpa...

Modified: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAFacadeHelper.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAFacadeHelper.java?rev=757280&r1=757279&r2=757280&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAFacadeHelper.java (original)
+++ openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAFacadeHelper.java Sun Mar 22 23:45:15 2009
@@ -1,319 +1,319 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openjpa.persistence;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-
-import org.apache.openjpa.kernel.Broker;
-import org.apache.openjpa.kernel.BrokerFactory;
-import org.apache.openjpa.meta.ClassMetaData;
-import org.apache.openjpa.util.BigDecimalId;
-import org.apache.openjpa.util.BigIntegerId;
-import org.apache.openjpa.util.ByteId;
-import org.apache.openjpa.util.CharId;
-import org.apache.openjpa.util.DoubleId;
-import org.apache.openjpa.util.FloatId;
-import org.apache.openjpa.util.Id;
-import org.apache.openjpa.util.ImplHelper;
-import org.apache.openjpa.util.IntId;
-import org.apache.openjpa.util.LongId;
-import org.apache.openjpa.util.ObjectId;
-import org.apache.openjpa.util.OpenJPAId;
-import org.apache.openjpa.util.ShortId;
-import org.apache.openjpa.util.StringId;
-import org.apache.openjpa.lib.util.Localizer;
-
-/**
- * Helper class for switching between OpenJPA's JPA facade and the underlying
- * Broker kernel.
- *
- * @since 1.0.0
- * @nojavadoc
- */
-public class JPAFacadeHelper {
-
-    public static final String EM_KEY =
-        "org.apache.openjpa.persistence.EntityManager";
-    public static final String EMF_KEY =
-        "org.apache.openjpa.persistence.EntityManagerFactory";
-
-    private static final Localizer _loc =
-        Localizer.forPackage(JPAFacadeHelper.class);
-
-    public static OpenJPAEntityManagerFactory toEntityManagerFactory(
-        BrokerFactory factory) {
-        if (factory == null)
-            return null;
-
-        factory.lock();
-        try {
-            OpenJPAEntityManagerFactory emf = (OpenJPAEntityManagerFactory)
-                factory.getUserObject(EMF_KEY);
-            if (emf == null) {
-                emf = EntityManagerFactoryValue.newFactory(factory);
-                factory.putUserObject(EMF_KEY, emf);
-            }
-            return emf;
-        } catch (Exception e) {
-            throw PersistenceExceptions.toPersistenceException(e);
-        } finally {
-            factory.unlock();
-        }
-    }
-
-    /**
-     * Return the underlying broker factory for the given persistence manager
-     * factory facade.
-     */
-    public static BrokerFactory toBrokerFactory(EntityManagerFactory emf) {
-        if (emf == null)
-            return null;
-        if (!(emf instanceof EntityManagerFactoryImpl)) {
-            Class c = emf.getClass();
-            try {
-                // either cast here may fail
-                emf = (EntityManagerFactoryImpl) ((OpenJPAEntityManagerFactory)
-                    emf).getUserObject(EMF_KEY);
-            } catch (ClassCastException cce) {
-                throw new ArgumentException(_loc.get(
-                    "cant-convert-brokerfactory", c), null, null, false);
-            }
-        }
-        return ((EntityManagerFactoryImpl) emf).getBrokerFactory();
-    }
-
-    /**
-     * Return a persistence manager facade to the given broker retaining
-     * previously associated persistence context type.
-     */
-    public static OpenJPAEntityManager toEntityManager(Broker broker) {
-        if (broker == null)
-            return null;
-
-        broker.lock();
-        try {
-            OpenJPAEntityManager em = (OpenJPAEntityManager)
-                broker.getUserObject(EM_KEY);
-            if (em == null) {
-                EntityManagerFactoryImpl emf = (EntityManagerFactoryImpl)
-                    toEntityManagerFactory(broker.getBrokerFactory());
-                em = emf.newEntityManagerImpl(broker);
-                broker.putUserObject(EM_KEY, em);
-            }
-            return em;
-        } catch (Exception e) {
-            throw PersistenceExceptions.toPersistenceException(e);
-        } finally {
-            broker.unlock();
-        }
-    }
-
-    /**
-     * Return the underlying broker for the given entity manager facade.
-     */
-    public static Broker toBroker(EntityManager em) {
-        if (em == null)
-            return null;
-        if (!(em instanceof EntityManagerImpl)) {
-            Class c = em.getClass();
-            try {
-                // either cast here may fail
-                em = (EntityManagerImpl) ((OpenJPAEntityManager) em).
-                    getUserObject(EM_KEY);
-            } catch (ClassCastException cce) {
-                throw new ArgumentException(_loc.get("cant-convert-broker", c),
-                    null, null, false);
-            }
-        }
-        return ((EntityManagerImpl) em).getBroker();
-    }
-
-    /**
-     * Returns the {@link org.apache.openjpa.meta.ClassMetaData} associated with the
-     * persistent object <code>o</code>.
-     */
-    public static ClassMetaData getMetaData(Object o) {
-        if (o == null)
-            return null;
-        EntityManager em = OpenJPAPersistence.getEntityManager(o);
-        return (em == null) ? null : getMetaData(em,
-            ImplHelper.getManagedInstance(o).getClass());
-    }
-
-    /**
-     * Returns the {@link org.apache.openjpa.meta.ClassMetaData} associated
-     * with the persistent type <code>cls</code>.
-     */
-    public static ClassMetaData getMetaData(EntityManager em, Class cls) {
-        if (em == null)
-            throw new NullPointerException("em == null");
-
-        OpenJPAEntityManagerSPI kem = (OpenJPAEntityManagerSPI)
-            OpenJPAPersistence.cast(em);
-        try {
-            return kem.getConfiguration().getMetaDataRepositoryInstance().
-                getMetaData(cls, kem.getClassLoader(), false);
-        } catch (Exception e) {
-            throw PersistenceExceptions.toPersistenceException(e);
-        }
-    }
-
-    /**
-     * Returns the {@link org.apache.openjpa.meta.ClassMetaData} associated
-     * with the persistent type <code>cls</code>.
-     */
-    public static ClassMetaData getMetaData(EntityManagerFactory emf,
-        Class cls) {
-        if (emf == null)
-            throw new NullPointerException("emf == null");
-
-        OpenJPAEntityManagerFactorySPI emfSPI =
-            (OpenJPAEntityManagerFactorySPI) OpenJPAPersistence.cast(emf);
-        try {
-            return emfSPI.getConfiguration().getMetaDataRepositoryInstance().
-                getMetaData(cls, null, false);
-        } catch (Exception e) {
-            throw PersistenceExceptions.toPersistenceException(e);
-        }
-    }
-
-    /**
-     * Translate from a OpenJPA identity object to a Persistence one.
-     */
-    public static Object fromOpenJPAObjectId(Object oid) {
-        if (oid instanceof OpenJPAId)
-            return ((OpenJPAId) oid).getIdObject();
-        return oid;
-    }
-
-    /**
-     * Translate from a Persistence identity object to a OpenJPA one.
-     */
-    public static Object toOpenJPAObjectId(ClassMetaData meta, Object oid) {
-        if (oid == null || meta == null)
-            return null;
-
-        Class cls = meta.getDescribedType();
-        if (meta.getIdentityType() == ClassMetaData.ID_DATASTORE)
-            return new Id(cls, ((Number) oid).longValue());
-
-        if (oid instanceof Byte)
-            return new ByteId(cls, (Byte) oid);
-        if (oid instanceof Character)
-            return new CharId(cls, (Character) oid);
-        if (oid instanceof Double)
-            return new DoubleId(cls, (Double) oid);
-        if (oid instanceof Float)
-            return new FloatId(cls, (Float) oid);
-        if (oid instanceof Integer)
-            return new IntId(cls, (Integer) oid);
-        if (oid instanceof Long)
-            return new LongId(cls, (Long) oid);
-        if (oid instanceof Short)
-            return new ShortId(cls, (Short) oid);
-        if (oid instanceof String)
-            return new StringId(cls, (String) oid);
-        if (oid instanceof BigDecimal)
-            return new BigDecimalId(cls, (BigDecimal) oid);
-        if (oid instanceof BigInteger)
-            return new BigIntegerId(cls, (BigInteger) oid);
-        return new ObjectId(cls, oid);
-    }
-
-    /**
-     * Return an array of OpenJPA oids for the given native oid array.
-     */
-    public static Object[] toOpenJPAObjectIds(ClassMetaData meta,
-        Object... oids) {
-        if (oids == null || oids.length == 0)
-            return oids;
-
-        // since the class if fixed for all oids, we can tell if we have to
-        // translate the array based on whether the first oid needs translating
-        Object oid = toOpenJPAObjectId(meta, oids[0]);
-        if (oid == oids[0])
-            return oids;
-
-        Object[] copy = new Object[oids.length];
-        copy[0] = oid;
-        for (int i = 1; i < oids.length; i++)
-            copy[i] = toOpenJPAObjectId(meta, oids[i]);
-        return copy;
-    }
-
-    /**
-     * Return a collection of OpenJPA oids for the given native oid collection.
-     */
-    public static Collection toOpenJPAObjectIds(ClassMetaData meta,
-        Collection oids) {
-        if (oids == null || oids.isEmpty())
-            return oids;
-
-        // since the class if fixed for all oids, we can tell if we have to
-        // translate the array based on whether the first oid needs translating
-        Iterator itr = oids.iterator();
-        Object orig = itr.next();
-        Object oid = toOpenJPAObjectId(meta, orig);
-        if (oid == orig)
-            return oids;
-
-        Collection copy = new ArrayList(oids.size());
-        copy.add(oid);
-        while (itr.hasNext())
-            copy.add(toOpenJPAObjectId(meta, itr.next()));
-        return copy;
-    }
-
-    /**
-     * Translate from a OpenJPA identity class to a native one.
-     */
-    public static Class fromOpenJPAObjectIdClass(Class oidClass) {
-        if (oidClass == null)
-            return null;
-        if (oidClass == Id.class)
-            return Long.class;
-        if (oidClass == ByteId.class)
-            return Byte.class;
-        if (oidClass == CharId.class)
-            return Character.class;
-        if (oidClass == DoubleId.class)
-            return Double.class;
-        if (oidClass == FloatId.class)
-            return Float.class;
-        if (oidClass == IntId.class)
-            return Integer.class;
-        if (oidClass == LongId.class)
-            return Long.class;
-        if (oidClass == ShortId.class)
-            return Short.class;
-        if (oidClass == StringId.class)
-            return String.class;
-        if (oidClass == BigDecimalId.class)
-            return BigDecimal.class;
-        if (oidClass == BigIntegerId.class)
-            return BigInteger.class;
-        return oidClass;
-	}
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.persistence;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+
+import org.apache.openjpa.kernel.Broker;
+import org.apache.openjpa.kernel.BrokerFactory;
+import org.apache.openjpa.meta.ClassMetaData;
+import org.apache.openjpa.util.BigDecimalId;
+import org.apache.openjpa.util.BigIntegerId;
+import org.apache.openjpa.util.ByteId;
+import org.apache.openjpa.util.CharId;
+import org.apache.openjpa.util.DoubleId;
+import org.apache.openjpa.util.FloatId;
+import org.apache.openjpa.util.Id;
+import org.apache.openjpa.util.ImplHelper;
+import org.apache.openjpa.util.IntId;
+import org.apache.openjpa.util.LongId;
+import org.apache.openjpa.util.ObjectId;
+import org.apache.openjpa.util.OpenJPAId;
+import org.apache.openjpa.util.ShortId;
+import org.apache.openjpa.util.StringId;
+import org.apache.openjpa.lib.util.Localizer;
+
+/**
+ * Helper class for switching between OpenJPA's JPA facade and the underlying
+ * Broker kernel.
+ *
+ * @since 1.0.0
+ * @nojavadoc
+ */
+public class JPAFacadeHelper {
+
+    public static final String EM_KEY =
+        "org.apache.openjpa.persistence.EntityManager";
+    public static final String EMF_KEY =
+        "org.apache.openjpa.persistence.EntityManagerFactory";
+
+    private static final Localizer _loc =
+        Localizer.forPackage(JPAFacadeHelper.class);
+
+    public static OpenJPAEntityManagerFactory toEntityManagerFactory(
+        BrokerFactory factory) {
+        if (factory == null)
+            return null;
+
+        factory.lock();
+        try {
+            OpenJPAEntityManagerFactory emf = (OpenJPAEntityManagerFactory)
+                factory.getUserObject(EMF_KEY);
+            if (emf == null) {
+                emf = EntityManagerFactoryValue.newFactory(factory);
+                factory.putUserObject(EMF_KEY, emf);
+            }
+            return emf;
+        } catch (Exception e) {
+            throw PersistenceExceptions.toPersistenceException(e);
+        } finally {
+            factory.unlock();
+        }
+    }
+
+    /**
+     * Return the underlying broker factory for the given persistence manager
+     * factory facade.
+     */
+    public static BrokerFactory toBrokerFactory(EntityManagerFactory emf) {
+        if (emf == null)
+            return null;
+        if (!(emf instanceof EntityManagerFactoryImpl)) {
+            Class c = emf.getClass();
+            try {
+                // either cast here may fail
+                emf = (EntityManagerFactoryImpl) ((OpenJPAEntityManagerFactory)
+                    emf).getUserObject(EMF_KEY);
+            } catch (ClassCastException cce) {
+                throw new ArgumentException(_loc.get(
+                    "cant-convert-brokerfactory", c), null, null, false);
+            }
+        }
+        return ((EntityManagerFactoryImpl) emf).getBrokerFactory();
+    }
+
+    /**
+     * Return a persistence manager facade to the given broker retaining
+     * previously associated persistence context type.
+     */
+    public static OpenJPAEntityManager toEntityManager(Broker broker) {
+        if (broker == null)
+            return null;
+
+        broker.lock();
+        try {
+            OpenJPAEntityManager em = (OpenJPAEntityManager)
+                broker.getUserObject(EM_KEY);
+            if (em == null) {
+                EntityManagerFactoryImpl emf = (EntityManagerFactoryImpl)
+                    toEntityManagerFactory(broker.getBrokerFactory());
+                em = emf.newEntityManagerImpl(broker);
+                broker.putUserObject(EM_KEY, em);
+            }
+            return em;
+        } catch (Exception e) {
+            throw PersistenceExceptions.toPersistenceException(e);
+        } finally {
+            broker.unlock();
+        }
+    }
+
+    /**
+     * Return the underlying broker for the given entity manager facade.
+     */
+    public static Broker toBroker(EntityManager em) {
+        if (em == null)
+            return null;
+        if (!(em instanceof EntityManagerImpl)) {
+            Class c = em.getClass();
+            try {
+                // either cast here may fail
+                em = (EntityManagerImpl) ((OpenJPAEntityManager) em).
+                    getUserObject(EM_KEY);
+            } catch (ClassCastException cce) {
+                throw new ArgumentException(_loc.get("cant-convert-broker", c),
+                    null, null, false);
+            }
+        }
+        return ((EntityManagerImpl) em).getBroker();
+    }
+
+    /**
+     * Returns the {@link org.apache.openjpa.meta.ClassMetaData} associated with the
+     * persistent object <code>o</code>.
+     */
+    public static ClassMetaData getMetaData(Object o) {
+        if (o == null)
+            return null;
+        EntityManager em = OpenJPAPersistence.getEntityManager(o);
+        return (em == null) ? null : getMetaData(em,
+            ImplHelper.getManagedInstance(o).getClass());
+    }
+
+    /**
+     * Returns the {@link org.apache.openjpa.meta.ClassMetaData} associated
+     * with the persistent type <code>cls</code>.
+     */
+    public static ClassMetaData getMetaData(EntityManager em, Class cls) {
+        if (em == null)
+            throw new NullPointerException("em == null");
+
+        OpenJPAEntityManagerSPI kem = (OpenJPAEntityManagerSPI)
+            OpenJPAPersistence.cast(em);
+        try {
+            return kem.getConfiguration().getMetaDataRepositoryInstance().
+                getMetaData(cls, kem.getClassLoader(), false);
+        } catch (Exception e) {
+            throw PersistenceExceptions.toPersistenceException(e);
+        }
+    }
+
+    /**
+     * Returns the {@link org.apache.openjpa.meta.ClassMetaData} associated
+     * with the persistent type <code>cls</code>.
+     */
+    public static ClassMetaData getMetaData(EntityManagerFactory emf,
+        Class cls) {
+        if (emf == null)
+            throw new NullPointerException("emf == null");
+
+        OpenJPAEntityManagerFactorySPI emfSPI =
+            (OpenJPAEntityManagerFactorySPI) OpenJPAPersistence.cast(emf);
+        try {
+            return emfSPI.getConfiguration().getMetaDataRepositoryInstance().
+                getMetaData(cls, null, false);
+        } catch (Exception e) {
+            throw PersistenceExceptions.toPersistenceException(e);
+        }
+    }
+
+    /**
+     * Translate from a OpenJPA identity object to a Persistence one.
+     */
+    public static Object fromOpenJPAObjectId(Object oid) {
+        if (oid instanceof OpenJPAId)
+            return ((OpenJPAId) oid).getIdObject();
+        return oid;
+    }
+
+    /**
+     * Translate from a Persistence identity object to a OpenJPA one.
+     */
+    public static Object toOpenJPAObjectId(ClassMetaData meta, Object oid) {
+        if (oid == null || meta == null)
+            return null;
+
+        Class cls = meta.getDescribedType();
+        if (meta.getIdentityType() == ClassMetaData.ID_DATASTORE)
+            return new Id(cls, ((Number) oid).longValue());
+
+        if (oid instanceof Byte)
+            return new ByteId(cls, (Byte) oid);
+        if (oid instanceof Character)
+            return new CharId(cls, (Character) oid);
+        if (oid instanceof Double)
+            return new DoubleId(cls, (Double) oid);
+        if (oid instanceof Float)
+            return new FloatId(cls, (Float) oid);
+        if (oid instanceof Integer)
+            return new IntId(cls, (Integer) oid);
+        if (oid instanceof Long)
+            return new LongId(cls, (Long) oid);
+        if (oid instanceof Short)
+            return new ShortId(cls, (Short) oid);
+        if (oid instanceof String)
+            return new StringId(cls, (String) oid);
+        if (oid instanceof BigDecimal)
+            return new BigDecimalId(cls, (BigDecimal) oid);
+        if (oid instanceof BigInteger)
+            return new BigIntegerId(cls, (BigInteger) oid);
+        return new ObjectId(cls, oid);
+    }
+
+    /**
+     * Return an array of OpenJPA oids for the given native oid array.
+     */
+    public static Object[] toOpenJPAObjectIds(ClassMetaData meta,
+        Object... oids) {
+        if (oids == null || oids.length == 0)
+            return oids;
+
+        // since the class if fixed for all oids, we can tell if we have to
+        // translate the array based on whether the first oid needs translating
+        Object oid = toOpenJPAObjectId(meta, oids[0]);
+        if (oid == oids[0])
+            return oids;
+
+        Object[] copy = new Object[oids.length];
+        copy[0] = oid;
+        for (int i = 1; i < oids.length; i++)
+            copy[i] = toOpenJPAObjectId(meta, oids[i]);
+        return copy;
+    }
+
+    /**
+     * Return a collection of OpenJPA oids for the given native oid collection.
+     */
+    public static Collection toOpenJPAObjectIds(ClassMetaData meta,
+        Collection oids) {
+        if (oids == null || oids.isEmpty())
+            return oids;
+
+        // since the class if fixed for all oids, we can tell if we have to
+        // translate the array based on whether the first oid needs translating
+        Iterator itr = oids.iterator();
+        Object orig = itr.next();
+        Object oid = toOpenJPAObjectId(meta, orig);
+        if (oid == orig)
+            return oids;
+
+        Collection copy = new ArrayList(oids.size());
+        copy.add(oid);
+        while (itr.hasNext())
+            copy.add(toOpenJPAObjectId(meta, itr.next()));
+        return copy;
+    }
+
+    /**
+     * Translate from a OpenJPA identity class to a native one.
+     */
+    public static Class fromOpenJPAObjectIdClass(Class oidClass) {
+        if (oidClass == null)
+            return null;
+        if (oidClass == Id.class)
+            return Long.class;
+        if (oidClass == ByteId.class)
+            return Byte.class;
+        if (oidClass == CharId.class)
+            return Character.class;
+        if (oidClass == DoubleId.class)
+            return Double.class;
+        if (oidClass == FloatId.class)
+            return Float.class;
+        if (oidClass == IntId.class)
+            return Integer.class;
+        if (oidClass == LongId.class)
+            return Long.class;
+        if (oidClass == ShortId.class)
+            return Short.class;
+        if (oidClass == StringId.class)
+            return String.class;
+        if (oidClass == BigDecimalId.class)
+            return BigDecimal.class;
+        if (oidClass == BigIntegerId.class)
+            return BigInteger.class;
+        return oidClass;
+	}
+}

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAFacadeHelper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/KeyDependent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/KeyType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LRS.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LoadFetchGroup.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MetaDataParsers.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MetaDataTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NoResultException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NonUniqueResultException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactorySPI.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactorySPI.java?rev=757280&r1=757279&r2=757280&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactorySPI.java (original)
+++ openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactorySPI.java Sun Mar 22 23:45:15 2009
@@ -1,71 +1,71 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openjpa.persistence;
-
-import java.util.Map;
-
-import org.apache.openjpa.conf.OpenJPAConfiguration;
-
-public interface OpenJPAEntityManagerFactorySPI
-    extends OpenJPAEntityManagerFactory {
-
-    /**
-     * Register a listener for lifecycle-related events on the specified
-     * classes. If the classes are null, all events will be propagated to
-     * the listener. The listener will be passed on to all new entity
-     * managers. See the <code>org.apache.openjpa.event</code> package for
-     * listener types.
-     *
-     * @since 0.3.3
-     */
-    public void addLifecycleListener(Object listener, Class... classes);
-
-    /**
-     * Remove a listener for lifecycle-related events.
-     *
-     * @since 0.3.3
-     */
-    public void removeLifecycleListener (Object listener);
-
-    /**
-     * Register a listener for transaction-related events on the specified
-     * classes. The listener will be passed on to all new entity
-     * managers. See the <code>org.apache.openjpa.event</code> package for
-     * listener types.
-     *
-     * @since 1.0.0
-     */
-    public void addTransactionListener(Object listener);
-
-    /**
-     * Remove a listener for transaction-related events.
-     *
-     * @since 1.0.0
-     */
-    public void removeTransactionListener (Object listener);
-
-    /**
-     * Return the configuration for this factory.
-     */
-    public OpenJPAConfiguration getConfiguration();
-
-    public OpenJPAEntityManagerSPI createEntityManager();
-
-    public OpenJPAEntityManagerSPI createEntityManager(Map props);
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.persistence;
+
+import java.util.Map;
+
+import org.apache.openjpa.conf.OpenJPAConfiguration;
+
+public interface OpenJPAEntityManagerFactorySPI
+    extends OpenJPAEntityManagerFactory {
+
+    /**
+     * Register a listener for lifecycle-related events on the specified
+     * classes. If the classes are null, all events will be propagated to
+     * the listener. The listener will be passed on to all new entity
+     * managers. See the <code>org.apache.openjpa.event</code> package for
+     * listener types.
+     *
+     * @since 0.3.3
+     */
+    public void addLifecycleListener(Object listener, Class... classes);
+
+    /**
+     * Remove a listener for lifecycle-related events.
+     *
+     * @since 0.3.3
+     */
+    public void removeLifecycleListener (Object listener);
+
+    /**
+     * Register a listener for transaction-related events on the specified
+     * classes. The listener will be passed on to all new entity
+     * managers. See the <code>org.apache.openjpa.event</code> package for
+     * listener types.
+     *
+     * @since 1.0.0
+     */
+    public void addTransactionListener(Object listener);
+
+    /**
+     * Remove a listener for transaction-related events.
+     *
+     * @since 1.0.0
+     */
+    public void removeTransactionListener (Object listener);
+
+    /**
+     * Return the configuration for this factory.
+     */
+    public OpenJPAConfiguration getConfiguration();
+
+    public OpenJPAEntityManagerSPI createEntityManager();
+
+    public OpenJPAEntityManagerSPI createEntityManager(Map props);
+}

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactorySPI.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerSPI.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerSPI.java?rev=757280&r1=757279&r2=757280&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerSPI.java (original)
+++ openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerSPI.java Sun Mar 22 23:45:15 2009
@@ -1,104 +1,104 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openjpa.persistence;
-
-import java.util.EnumSet;
-
-import org.apache.openjpa.conf.OpenJPAConfiguration;
-import org.apache.openjpa.ee.ManagedRuntime;
-
-public interface OpenJPAEntityManagerSPI
-    extends OpenJPAEntityManager {
-
-    /**
-     * Return the configuration associated with this entity manager.
-     */
-    public OpenJPAConfiguration getConfiguration();
-
-    /**
-     * Return the managed runtime in use.
-     */
-    public ManagedRuntime getManagedRuntime();
-
-    //////////
-    // Events
-    //////////
-
-    /**
-     * Register a listener for transaction-related events.
-     */
-    public void addTransactionListener(Object listener);
-
-    /**
-     * Remove a listener for transaction-related events.
-     */
-    public void removeTransactionListener(Object listener);
-
-    /**
-     * The {@link CallbackMode} flags for handling transaction listener
-     * exceptions.
-     */
-    public EnumSet<CallbackMode> getTransactionListenerCallbackMode();
-
-    /**
-     * The {@link CallbackMode} flag for handling transaction listener
-     * exceptions. The flags provided here will entirely replace the
-     * previous settings.
-     */
-    public void setTransactionListenerCallbackMode(CallbackMode mode);
-
-    /**
-     * The {@link CallbackMode} flags for handling transaction listener
-     * exceptions. The flags provided here will entirely replace the
-     * previous settings.
-     */
-    public void setTransactionListenerCallbackMode(EnumSet<CallbackMode> modes);
-
-    /**
-     * Register a listener for lifecycle-related events on the specified
-     * classes. If the classes are null, all events will be propagated to
-     * the listener.
-     */
-    public void addLifecycleListener(Object listener, Class... classes);
-
-    /**
-     * Remove a listener for lifecycle-related events.
-     */
-    public void removeLifecycleListener(Object listener);
-
-    /**
-     * The {@link CallbackMode} flags for handling lifecycle listener
-     * exceptions.
-     */
-    public EnumSet<CallbackMode> getLifecycleListenerCallbackMode();
-
-    /**
-     * The {@link CallbackMode} flag for handling lifecycle listener
-     * exceptions. The flags provided here will entirely replace the
-     * previous settings.
-     */
-    public void setLifecycleListenerCallbackMode(CallbackMode mode);
-
-    /**
-     * The {@link CallbackMode} flags for handling lifecycle listener
-     * exceptions. The flags provided here will entirely replace the
-     * previous settings.
-     */
-    public void setLifecycleListenerCallbackMode(EnumSet<CallbackMode> modes);
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.persistence;
+
+import java.util.EnumSet;
+
+import org.apache.openjpa.conf.OpenJPAConfiguration;
+import org.apache.openjpa.ee.ManagedRuntime;
+
+public interface OpenJPAEntityManagerSPI
+    extends OpenJPAEntityManager {
+
+    /**
+     * Return the configuration associated with this entity manager.
+     */
+    public OpenJPAConfiguration getConfiguration();
+
+    /**
+     * Return the managed runtime in use.
+     */
+    public ManagedRuntime getManagedRuntime();
+
+    //////////
+    // Events
+    //////////
+
+    /**
+     * Register a listener for transaction-related events.
+     */
+    public void addTransactionListener(Object listener);
+
+    /**
+     * Remove a listener for transaction-related events.
+     */
+    public void removeTransactionListener(Object listener);
+
+    /**
+     * The {@link CallbackMode} flags for handling transaction listener
+     * exceptions.
+     */
+    public EnumSet<CallbackMode> getTransactionListenerCallbackMode();
+
+    /**
+     * The {@link CallbackMode} flag for handling transaction listener
+     * exceptions. The flags provided here will entirely replace the
+     * previous settings.
+     */
+    public void setTransactionListenerCallbackMode(CallbackMode mode);
+
+    /**
+     * The {@link CallbackMode} flags for handling transaction listener
+     * exceptions. The flags provided here will entirely replace the
+     * previous settings.
+     */
+    public void setTransactionListenerCallbackMode(EnumSet<CallbackMode> modes);
+
+    /**
+     * Register a listener for lifecycle-related events on the specified
+     * classes. If the classes are null, all events will be propagated to
+     * the listener.
+     */
+    public void addLifecycleListener(Object listener, Class... classes);
+
+    /**
+     * Remove a listener for lifecycle-related events.
+     */
+    public void removeLifecycleListener(Object listener);
+
+    /**
+     * The {@link CallbackMode} flags for handling lifecycle listener
+     * exceptions.
+     */
+    public EnumSet<CallbackMode> getLifecycleListenerCallbackMode();
+
+    /**
+     * The {@link CallbackMode} flag for handling lifecycle listener
+     * exceptions. The flags provided here will entirely replace the
+     * previous settings.
+     */
+    public void setLifecycleListenerCallbackMode(CallbackMode mode);
+
+    /**
+     * The {@link CallbackMode} flags for handling lifecycle listener
+     * exceptions. The flags provided here will entirely replace the
+     * previous settings.
+     */
+    public void setLifecycleListenerCallbackMode(EnumSet<CallbackMode> modes);
+}

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerSPI.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityTransaction.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityTransaction.java?rev=757280&r1=757279&r2=757280&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityTransaction.java (original)
+++ openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityTransaction.java Sun Mar 22 23:45:15 2009
@@ -1,71 +1,71 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openjpa.persistence;
-
-import javax.persistence.EntityTransaction;
-
-/**
- * Extension of the JPA {@link EntityTransaction} interface.
- *
- * @since 1.0.0
- * @published
- */
-public interface OpenJPAEntityTransaction
-    extends EntityTransaction {
-
-    /**
-     * Issue a commit and then start a new transaction. This is identical to:
-     * <pre> manager.commit (); manager.begin ();
-     * </pre> except that the entity manager's internal atomic lock is utilized,
-     * so this method can be safely executed from multiple threads.
-     *
-     * @see javax.persistence.EntityTransaction#commit()
-     * @see javax.persistence.EntityTransaction#begin()
-     */
-    public void commitAndResume();
-
-    /**
-     * Issue a rollback and then start a new transaction. This is identical to:
-     * <pre> manager.rollback (); manager.begin ();
-     * </pre> except that the entity manager's internal atomic lock is utilized,
-     * so this method can be safely executed from multiple threads.
-     *
-     * @see javax.persistence.EntityTransaction#rollback()
-     * @see javax.persistence.EntityTransaction#begin()
-     */
-    public void rollbackAndResume();
-
-    /**
-     * Mark the current transaction for rollback with the specified cause
-     * of the rollback.
-     *
-     * @since 0.9.7
-     */
-    public void setRollbackOnly(Throwable cause);
-
-    /**
-     * Returns the Throwable that caused the transaction to be
-     * marked for rollback.
-     *
-     * @return the Throwable, or null if none was given
-     *
-     * @since 0.9.7
-     */
-    public Throwable getRollbackCause();
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.persistence;
+
+import javax.persistence.EntityTransaction;
+
+/**
+ * Extension of the JPA {@link EntityTransaction} interface.
+ *
+ * @since 1.0.0
+ * @published
+ */
+public interface OpenJPAEntityTransaction
+    extends EntityTransaction {
+
+    /**
+     * Issue a commit and then start a new transaction. This is identical to:
+     * <pre> manager.commit (); manager.begin ();
+     * </pre> except that the entity manager's internal atomic lock is utilized,
+     * so this method can be safely executed from multiple threads.
+     *
+     * @see javax.persistence.EntityTransaction#commit()
+     * @see javax.persistence.EntityTransaction#begin()
+     */
+    public void commitAndResume();
+
+    /**
+     * Issue a rollback and then start a new transaction. This is identical to:
+     * <pre> manager.rollback (); manager.begin ();
+     * </pre> except that the entity manager's internal atomic lock is utilized,
+     * so this method can be safely executed from multiple threads.
+     *
+     * @see javax.persistence.EntityTransaction#rollback()
+     * @see javax.persistence.EntityTransaction#begin()
+     */
+    public void rollbackAndResume();
+
+    /**
+     * Mark the current transaction for rollback with the specified cause
+     * of the rollback.
+     *
+     * @since 0.9.7
+     */
+    public void setRollbackOnly(Throwable cause);
+
+    /**
+     * Returns the Throwable that caused the transaction to be
+     * marked for rollback.
+     *
+     * @return the Throwable, or null if none was given
+     *
+     * @since 0.9.7
+     */
+    public Throwable getRollbackCause();
+}

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityTransaction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistence.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuery.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuerySPI.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuerySPI.java?rev=757280&r1=757279&r2=757280&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuerySPI.java (original)
+++ openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuerySPI.java Sun Mar 22 23:45:15 2009
@@ -1,46 +1,46 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openjpa.persistence;
-
-import org.apache.openjpa.kernel.exps.FilterListener;
-import org.apache.openjpa.kernel.exps.AggregateListener;
-
-public interface OpenJPAQuerySPI
-    extends OpenJPAQuery {
-
-    /**
-     * Register a filter listener for the query.
-     */
-    public OpenJPAQuery addFilterListener(FilterListener listener);
-
-    /**
-     * Remove a filter listener from the query.
-     */
-    public OpenJPAQuery removeFilterListener(FilterListener listener);
-
-    /**
-     * Register an aggregate listener for the query.
-     */
-    public OpenJPAQuery addAggregateListener(AggregateListener listener);
-
-    /**
-     * Remove an aggregate listener from the query.
-     */
-    public OpenJPAQuery removeAggregateListener(AggregateListener listener);
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.persistence;
+
+import org.apache.openjpa.kernel.exps.FilterListener;
+import org.apache.openjpa.kernel.exps.AggregateListener;
+
+public interface OpenJPAQuerySPI
+    extends OpenJPAQuery {
+
+    /**
+     * Register a filter listener for the query.
+     */
+    public OpenJPAQuery addFilterListener(FilterListener listener);
+
+    /**
+     * Remove a filter listener from the query.
+     */
+    public OpenJPAQuery removeFilterListener(FilterListener listener);
+
+    /**
+     * Register an aggregate listener for the query.
+     */
+    public OpenJPAQuery addAggregateListener(AggregateListener listener);
+
+    /**
+     * Remove an aggregate listener from the query.
+     */
+    public OpenJPAQuery removeAggregateListener(AggregateListener listener);
+}

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuerySPI.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OptimisticLockException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceListenerAdapter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceStrategy.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Persistent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentCollection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentMap.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryOperationType.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryOperationType.java?rev=757280&r1=757279&r2=757280&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryOperationType.java (original)
+++ openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryOperationType.java Sun Mar 22 23:45:15 2009
@@ -1,59 +1,59 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openjpa.persistence;
-
-import org.apache.openjpa.kernel.QueryOperations;
-
-/**
- * The possible operations that a query can perform.
- *
- * @since 1.0.0
- * @published
- */
-public enum QueryOperationType {
-    SELECT(QueryOperations.OP_SELECT),
-    DELETE(QueryOperations.OP_DELETE),
-    UPDATE(QueryOperations.OP_UPDATE);
-
-    private final int queryOperationConstant;
-
-    private QueryOperationType(int value) {
-        queryOperationConstant = value;
-    }
-
-    int toKernelConstant() {
-        return queryOperationConstant;
-    }
-
-    static QueryOperationType fromKernelConstant(int kernelConstant) {
-        switch (kernelConstant) {
-            case QueryOperations.OP_SELECT:
-                return SELECT;
-
-            case QueryOperations.OP_UPDATE:
-                return UPDATE;
-
-            case QueryOperations.OP_DELETE:
-                return DELETE;
-
-            default:
-                throw new IllegalArgumentException(kernelConstant + "");
-        }
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.persistence;
+
+import org.apache.openjpa.kernel.QueryOperations;
+
+/**
+ * The possible operations that a query can perform.
+ *
+ * @since 1.0.0
+ * @published
+ */
+public enum QueryOperationType {
+    SELECT(QueryOperations.OP_SELECT),
+    DELETE(QueryOperations.OP_DELETE),
+    UPDATE(QueryOperations.OP_UPDATE);
+
+    private final int queryOperationConstant;
+
+    private QueryOperationType(int value) {
+        queryOperationConstant = value;
+    }
+
+    int toKernelConstant() {
+        return queryOperationConstant;
+    }
+
+    static QueryOperationType fromKernelConstant(int kernelConstant) {
+        switch (kernelConstant) {
+            case QueryOperations.OP_SELECT:
+                return SELECT;
+
+            case QueryOperations.OP_UPDATE:
+                return UPDATE;
+
+            case QueryOperations.OP_DELETE:
+                return DELETE;
+
+            default:
+                throw new IllegalArgumentException(kernelConstant + "");
+        }
+    }
+}

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryOperationType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryResultCache.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryResultCacheImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ReadOnly.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/RestoreStateType.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/RestoreStateType.java?rev=757280&r1=757279&r2=757280&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/RestoreStateType.java (original)
+++ openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/RestoreStateType.java Sun Mar 22 23:45:15 2009
@@ -1,60 +1,60 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openjpa.persistence;
-
-import org.apache.openjpa.kernel.RestoreState;
-
-/**
- * The possible settings for the restore behavior after transaction rollback
- * of an {@link OpenJPAEntityManager}.
- *
- * @since 1.0.0
- * @published
- */
-public enum RestoreStateType {
-    NONE(RestoreState.RESTORE_NONE),
-    IMMUTABLE(RestoreState.RESTORE_IMMUTABLE),
-    ALL(RestoreState.RESTORE_ALL);
-
-    private final int restoreStateConstant;
-
-    private RestoreStateType(int value) {
-        restoreStateConstant = value;
-    }
-
-    int toKernelConstant() {
-        return restoreStateConstant;
-    }
-
-    static RestoreStateType fromKernelConstant(int kernelConstant) {
-        switch (kernelConstant) {
-            case RestoreState.RESTORE_NONE:
-                return NONE;
-
-            case RestoreState.RESTORE_IMMUTABLE:
-                return IMMUTABLE;
-
-            case RestoreState.RESTORE_ALL:
-                return ALL;
-
-            default:
-                throw new IllegalArgumentException(kernelConstant + "");
-        }
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.persistence;
+
+import org.apache.openjpa.kernel.RestoreState;
+
+/**
+ * The possible settings for the restore behavior after transaction rollback
+ * of an {@link OpenJPAEntityManager}.
+ *
+ * @since 1.0.0
+ * @published
+ */
+public enum RestoreStateType {
+    NONE(RestoreState.RESTORE_NONE),
+    IMMUTABLE(RestoreState.RESTORE_IMMUTABLE),
+    ALL(RestoreState.RESTORE_ALL);
+
+    private final int restoreStateConstant;
+
+    private RestoreStateType(int value) {
+        restoreStateConstant = value;
+    }
+
+    int toKernelConstant() {
+        return restoreStateConstant;
+    }
+
+    static RestoreStateType fromKernelConstant(int kernelConstant) {
+        switch (kernelConstant) {
+            case RestoreState.RESTORE_NONE:
+                return NONE;
+
+            case RestoreState.RESTORE_IMMUTABLE:
+                return IMMUTABLE;
+
+            case RestoreState.RESTORE_ALL:
+                return ALL;
+
+            default:
+                throw new IllegalArgumentException(kernelConstant + "");
+        }
+    }
+}

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/RestoreStateType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/RollbackException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCache.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCacheImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TransactionRequiredException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Type.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/UpdateAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java
------------------------------------------------------------------------------
    svn:eol-style = native