You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by th...@apache.org on 2003/03/16 11:03:08 UTC
cvs commit: db-ojb/src/test/org/apache/ojb/broker/metadata/auto AutoBuildDb.java Product.java
thma 2003/03/16 02:03:08
Modified: src/java/org/apache/ojb/odmg/oql OQLLexer.java
. .classpath
src/java/org/apache/ojb/broker/singlevm
PersistenceBrokerImpl.java
Removed: lib crossdb.jar
src/java/org/apache/ojb/broker/metadata/auto
AutoCreatorDb.java
src/test/org/apache/ojb/broker/metadata/auto
AutoBuildDb.java Product.java
Log:
remove the undocumented and buggy autobuild feature
Revision Changes Path
1.7 +11 -17 db-ojb/src/java/org/apache/ojb/odmg/oql/OQLLexer.java
Index: OQLLexer.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/oql/OQLLexer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- OQLLexer.java 15 Mar 2003 16:38:12 -0000 1.6
+++ OQLLexer.java 16 Mar 2003 10:03:08 -0000 1.7
@@ -40,32 +40,26 @@
*/
package org.apache.ojb.odmg.oql;
-import org.apache.ojb.broker.query.*;
-import java.util.*;
import java.io.InputStream;
-import antlr.TokenStreamException;
-import antlr.TokenStreamIOException;
-import antlr.TokenStreamRecognitionException;
-import antlr.CharStreamException;
-import antlr.CharStreamIOException;
-import antlr.ANTLRException;
import java.io.Reader;
import java.util.Hashtable;
-import antlr.CharScanner;
-import antlr.InputBuffer;
+
+import antlr.ANTLRHashString;
import antlr.ByteBuffer;
import antlr.CharBuffer;
-import antlr.Token;
-import antlr.CommonToken;
-import antlr.RecognitionException;
+import antlr.CharStreamException;
+import antlr.CharStreamIOException;
+import antlr.InputBuffer;
+import antlr.LexerSharedInputState;
import antlr.NoViableAltForCharException;
-import antlr.MismatchedCharException;
+import antlr.RecognitionException;
+import antlr.Token;
import antlr.TokenStream;
-import antlr.ANTLRHashString;
-import antlr.LexerSharedInputState;
+import antlr.TokenStreamException;
+import antlr.TokenStreamIOException;
+import antlr.TokenStreamRecognitionException;
import antlr.collections.impl.BitSet;
-import antlr.SemanticException;
public class OQLLexer extends antlr.CharScanner implements OQLLexerTokenTypes, TokenStream
{
1.17 +0 -1 db-ojb/.classpath
Index: .classpath
===================================================================
RCS file: /home/cvs/db-ojb/.classpath,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .classpath 3 Mar 2003 17:22:45 -0000 1.16
+++ .classpath 16 Mar 2003 10:03:08 -0000 1.17
@@ -13,7 +13,6 @@
<classpathentry kind="lib" path="lib/commons-collections-2.0.jar"/>
<classpathentry kind="lib" path="lib/commons-logging.jar"/>
<classpathentry kind="lib" path="lib/commons-pool.jar"/>
- <classpathentry kind="lib" path="lib/crossdb.jar"/>
<classpathentry kind="lib" path="lib/hsqldb.jar"/>
<classpathentry kind="lib" path="lib/jakarta-regexp-1.2.jar"/>
<classpathentry kind="lib" path="lib/jdo.jar"/>
1.144 +2 -16 db-ojb/src/java/org/apache/ojb/broker/singlevm/PersistenceBrokerImpl.java
Index: PersistenceBrokerImpl.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/singlevm/PersistenceBrokerImpl.java,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- PersistenceBrokerImpl.java 15 Mar 2003 16:59:06 -0000 1.143
+++ PersistenceBrokerImpl.java 16 Mar 2003 10:03:08 -0000 1.144
@@ -85,7 +85,6 @@
import org.apache.ojb.broker.metadata.FieldHelper;
import org.apache.ojb.broker.metadata.MetadataManager;
import org.apache.ojb.broker.metadata.ObjectReferenceDescriptor;
-import org.apache.ojb.broker.metadata.auto.AutoCreatorDb;
import org.apache.ojb.broker.metadata.fieldaccess.PersistentField;
import org.apache.ojb.broker.query.Criteria;
import org.apache.ojb.broker.query.MtoNQuery;
@@ -2259,20 +2258,7 @@
m_collectionProxyClass = config.getCollectionProxyClass();
// now build db if specified in config
- autoCreateDb(pConfig);
- }
- /**
- * runs auto create if specified in ojb props
- * todo: call this function only after each time the repos is read in, configure() gets called too often.
- *
- */
- private void autoCreateDb(Configuration config)
- {
- if(config.getBoolean("autobuild", false))
- {
- AutoCreatorDb.autoCreate(descriptorRepository, connectionManager);
- }
-
+ //autoCreateDb(pConfig);
}