svn commit: r434303 - /incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java

[pp...@apache.org]

Author: ppoddar
Date: Wed Aug 23 22:13:20 2006
New Revision: 434303

URL: http://svn.apache.org/viewvc?rev=434303&view=rev
Log:
Modified to ignore p-aware classes.

Modified:
    incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java

Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java?rev=434303&r1=434302&r2=434303&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java Wed Aug 23 22:13:20 2006
@@ -51,7 +51,14 @@
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.lib.util.Options;
 import org.apache.openjpa.lib.util.Services;
-import org.apache.openjpa.meta.*;
+import org.apache.openjpa.meta.ClassMetaData;
+import org.apache.openjpa.meta.FieldMetaData;
+import org.apache.openjpa.meta.JavaTypes;
+import org.apache.openjpa.meta.MetaDataFactory;
+import org.apache.openjpa.meta.MetaDataModes;
+import org.apache.openjpa.meta.QueryMetaData;
+import org.apache.openjpa.meta.SequenceMetaData;
+import org.apache.openjpa.meta.ValueStrategies;
 import org.apache.openjpa.util.GeneralException;
 import org.apache.openjpa.util.InternalException;
 import org.apache.openjpa.util.MetaDataException;
@@ -636,7 +643,9 @@
 
         _flush = true;
         _flushSchema = true;
-        getMapping(cls);
+        MappingRepository repos = getRepository();
+        repos.setStrategyInstaller(new MappingStrategyInstaller(repos));
+        getMapping(repos, cls);
     }
 
     /**
@@ -673,7 +682,9 @@
 
         _flush = true;
         _flushSchema = true;
-        getMapping(cls);
+        MappingRepository repos = getRepository();
+        repos.setStrategyInstaller(new RefreshStrategyInstaller(repos));
+        getMapping(repos, cls);
     }
 
     /**
@@ -685,7 +696,9 @@
 
         _flushSchema = !SCHEMA_ACTION_NONE.equals(_schemaAction)
             && !SchemaTool.ACTION_ADD.equals(_schemaAction);
-        getMapping(cls);
+        MappingRepository repos = getRepository();
+        repos.setStrategyInstaller(new RuntimeStrategyInstaller(repos));
+        getMapping(repos, cls);
     }
 
     /**
@@ -696,7 +709,9 @@
             return;
 
         _flushSchema = true;
-        if (!getMapping(cls))
+        MappingRepository repos = getRepository();
+        repos.setStrategyInstaller(new RuntimeStrategyInstaller(repos));
+        if (!getMapping(repos, cls))
         	return;
 
         // set any logical pks to non-logical so they get flushed
@@ -727,21 +742,19 @@
      * 
      * @return true if the mapping of the class is found, false otherwise.
      */
-    boolean getMapping(Class cls) {
-    	MappingRepository repos = getRepository();
-    	repos.setStrategyInstaller(new RuntimeStrategyInstaller(repos));
+    boolean getMapping(MappingRepository repos, Class cls) {
     	try {
     		repos.getMapping(cls, null, true);
     	} catch (MetaDataException mex) {
     		if (!mex.isFatal()) {
-    			if (_log != null && _log.isWarnEnabled()) {
-    				_log.warn(_loc.get("no-mapping-aware",cls));
-    			}
-    			return false;
+				if (_log != null && _log.isWarnEnabled()) {
+					_log.warn(_loc.get("no-mapping-aware",cls));
+				}
+				return false;
     		} else {
     			throw mex;
     		}
-    	}
+	    }
     	return true;
     }
     /**
@@ -993,9 +1006,6 @@
                 parsed = classParser.parseTypes(args[i]);
                 classes.addAll(Arrays.asList(parsed));
             }
-            PersistenceAwareClass[] pawares = conf.getMappingRepositoryInstance().getPersistenceAwareClasses();
-            for (int i=0; i<pawares.length; i++)
-            	classes.remove(pawares[i].getDescribedType());
         }
 
         Class[] act = (Class[]) classes.toArray(new Class[classes.size()]);