baliuka 02/03/14 07:44:03
Modified: simplestore/src/conf MANIFEST.MF
simplestore/src/java/org/apache/commons/simplestore/jdbc
DriverDataSource.java
simplestore/src/java/org/apache/commons/simplestore/persistence/impl
AbstractStorage.java DBStorage.java
MetaClassImpl.java PersistentProxy.java
simplestore/src/test/org/apache/commons/simplestore
TestAll.java
Added: simplestore/src/java/org/apache/commons/simplestore/persistence
SimplestoreException.java
Log:
Added simplestore runtime exception type
Revision Changes Path
1.4 +2 -2 jakarta-commons-sandbox/simplestore/src/conf/MANIFEST.MF
Index: MANIFEST.MF
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/simplestore/src/conf/MANIFEST.MF,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MANIFEST.MF 15 Jan 2002 19:56:50 -0000 1.3
+++ MANIFEST.MF 14 Mar 2002 15:44:02 -0000 1.4
@@ -1,6 +1,6 @@
-Extension-Name: @name@
+Extension-Name: commons-simplestore
Specification-Vendor: Apache Software Foundation
Specification-Version: 1.0
Implementation-Vendor: Apache Software Foundation
-Implementation-Version: @version@
+Implementation-Version: 0.95
1.7 +5 -3
jakarta-commons-sandbox/simplestore/src/java/org/apache/commons/simplestore/jdbc/DriverDataSource.java
Index: DriverDataSource.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/simplestore/src/java/org/apache/commons/simplestore/jdbc/DriverDataSource.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DriverDataSource.java 9 Mar 2002 19:07:49 -0000 1.6
+++ DriverDataSource.java 14 Mar 2002 15:44:02 -0000 1.7
@@ -54,6 +54,8 @@
*/
package org.apache.commons.simplestore.jdbc;
+
+
import java.io.PrintWriter;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy;
@@ -71,11 +73,11 @@
import javax.sql.DataSource;
-
+import org.apache.commons.simplestore.persistence.SimplestoreException;
/**
*@author Juozas Baliuka <a href="mailto:[EMAIL PROTECTED]";>
* [EMAIL PROTECTED]</a>
- *@version $Id: DriverDataSource.java,v 1.6 2002/03/09 19:07:49 baliuka Exp $
+ *@version $Id: DriverDataSource.java,v 1.7 2002/03/14 15:44:02 baliuka Exp $
*
*/
public class DriverDataSource implements DataSource {
@@ -173,7 +175,7 @@
this.driver = (Driver) Class.forName(driver).newInstance();
} catch (Exception e) {
e.printStackTrace();
- throw new RuntimeException(e.getMessage());
+ throw new SimplestoreException(e.getMessage());
}
}
1.1
jakarta-commons-sandbox/simplestore/src/java/org/apache/commons/simplestore/persistence/SimplestoreException.java
Index: SimplestoreException.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache Cocoon" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INToutUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.commons.simplestore.persistence;
/**
* Meta data
*
*@author Juozas Baliuka <a href="mailto:[EMAIL PROTECTED]";>
* [EMAIL PROTECTED]</a>
*@version $Id: SimplestoreException.java,v 1.1 2002/03/14 15:44:02 baliuka Exp $
*/
public class SimplestoreException extends java.lang.RuntimeException {
/**
* Creates a new instance of <code>SimplestoreException</code> without detail
message.
*/
public SimplestoreException() {
}
/**
* Constructs an instance of <code>SimplestoreException</code> with the
specified detail message.
* @param msg the detail message.
*/
public SimplestoreException(String msg) {
super(msg);
}
}
1.7 +5 -4
jakarta-commons-sandbox/simplestore/src/java/org/apache/commons/simplestore/persistence/impl/AbstractStorage.java
Index: AbstractStorage.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/simplestore/src/java/org/apache/commons/simplestore/persistence/impl/AbstractStorage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractStorage.java 11 Mar 2002 15:40:53 -0000 1.6
+++ AbstractStorage.java 14 Mar 2002 15:44:02 -0000 1.7
@@ -59,6 +59,7 @@
import org.apache.commons.simplestore.persistence.Storage;
import org.apache.commons.simplestore.persistence.StorageException;
import org.apache.commons.simplestore.persistence.TransactionManager;
+import org.apache.commons.simplestore.persistence.SimplestoreException;
import java.util.HashMap;
import java.util.Iterator;
@@ -68,7 +69,7 @@
/**
*@author Juozas Baliuka <a href="mailto:[EMAIL PROTECTED]";>
* [EMAIL PROTECTED]</a>
- *@version $Id: AbstractStorage.java,v 1.6 2002/03/11 15:40:53 baliuka Exp $
+ *@version $Id: AbstractStorage.java,v 1.7 2002/03/14 15:44:02 baliuka Exp $
*/
public abstract class AbstractStorage
@@ -99,7 +100,7 @@
internalBegin();
} catch (Throwable t) {
t.printStackTrace();
- throw new RuntimeException(t.getClass() + ":" + t.getMessage());
+ throw new SimplestoreException(t.getClass() + ":" + t.getMessage());
}
}
@@ -122,7 +123,7 @@
internalRollback();
} catch (Throwable t) {
- throw new RuntimeException(t.getClass() + ":" + t.getMessage());
+ throw new SimplestoreException(t.getClass() + ":" + t.getMessage());
}
}
@@ -160,7 +161,7 @@
internalCommit();
} catch (Throwable t) {
t.printStackTrace();
- throw new RuntimeException(t.getMessage() + " " + pp);
+ throw new SimplestoreException(t.getMessage() + " " + pp);
}
}
1.10 +5 -5
jakarta-commons-sandbox/simplestore/src/java/org/apache/commons/simplestore/persistence/impl/DBStorage.java
Index: DBStorage.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/simplestore/src/java/org/apache/commons/simplestore/persistence/impl/DBStorage.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DBStorage.java 11 Mar 2002 15:40:53 -0000 1.9
+++ DBStorage.java 14 Mar 2002 15:44:02 -0000 1.10
@@ -85,7 +85,7 @@
/**
*@author Juozas Baliuka <a href="mailto:[EMAIL PROTECTED]";>
* [EMAIL PROTECTED]</a>
- *@version $Id: DBStorage.java,v 1.9 2002/03/11 15:40:53 baliuka Exp $
+ *@version $Id: DBStorage.java,v 1.10 2002/03/14 15:44:02 baliuka Exp $
*/
public class DBStorage extends AbstractStorage implements
org.apache.commons.simplestore.tools.Constants {
@@ -313,7 +313,7 @@
try {
- Connection connection = (Connection) getTransaction().getAttribute(
CONNECTION );
+ Connection connection = (Connection)
context.getTransactionManager().getTransaction().getAttribute( CONNECTION );
if (connection != null) {
connection.close();
}
@@ -403,7 +403,7 @@
protected void internalBegin() throws StorageException {
try {
Connection connection = ds.getConnection();
- getTransaction().setAttribute(CONNECTION, connection);
+
context.getTransactionManager().getTransaction().setAttribute(CONNECTION, connection);
} catch (SQLException se) {
throw new StorageException(se.getMessage(), se);
@@ -412,7 +412,7 @@
private Connection getConnection() {
- Connection connection = (Connection)
getTransaction().getAttribute(CONNECTION);
+ Connection connection = (Connection)
context.getTransactionManager().getTransaction().getAttribute(CONNECTION);
if (connection == null) {
throw new IllegalStateException("Transaction not Started");
@@ -430,7 +430,7 @@
", * FROM " + mClass.getName() +
" WHERE " + mClass.getPropertyName(index) + "=?";
- java.util.Collection tObjects = getTransaction().getTransactionalObjects();
+ java.util.Collection tObjects =
context.getTransactionManager().getTransaction().getTransactionalObjects();
for( java.util.Iterator i = tObjects.iterator(); i.hasNext(); ){
MetaObject mo = (MetaObject)i.next();
if( mo.getPersistentClass().equals(clasz) &&
mo.getProperty(index).equals(value) ){
1.9 +12 -8
jakarta-commons-sandbox/simplestore/src/java/org/apache/commons/simplestore/persistence/impl/MetaClassImpl.java
Index: MetaClassImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/simplestore/src/java/org/apache/commons/simplestore/persistence/impl/MetaClassImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MetaClassImpl.java 11 Mar 2002 09:53:07 -0000 1.8
+++ MetaClassImpl.java 14 Mar 2002 15:44:02 -0000 1.9
@@ -65,7 +65,7 @@
*
*@author Juozas Baliuka <a href="mailto:[EMAIL PROTECTED]";>
* [EMAIL PROTECTED]</a>
- *@version $Id: MetaClassImpl.java,v 1.8 2002/03/11 09:53:07 baliuka Exp $
+ *@version $Id: MetaClassImpl.java,v 1.9 2002/03/14 15:44:02 baliuka Exp $
*/
public class MetaClassImpl implements MetaClass,
org.apache.commons.simplestore.tools.Constants {
@@ -97,7 +97,7 @@
return field;
}
}
- throw new RuntimeException("property " + id + " not found");
+ throw new SimplestoreException("property " + id + " not found");
} else return field;
}
@@ -295,7 +295,7 @@
public MetaClass forClass(Class clasz) {
MetaClassImpl mc = (MetaClassImpl)persitentClasses.get(clasz.getName());
if( mc == null ){
- throw new RuntimeException("Not persistent Class " + clasz.getName());
+ throw new SimplestoreException("Not persistent Class " +
clasz.getName());
// mc = new MetaClassImpl(clasz);
// System.out.println("create " + clasz.getName());
// persitentClasses.put(clasz.getName(),mc);
@@ -384,16 +384,15 @@
}
}catch( java.lang.Throwable t ){
- //TODO :
t.printStackTrace();
- throw new java.lang.RuntimeException(t.getLocalizedMessage());
+ throw new SimplestoreException(t.getMessage());
}
}
private void indexMethods(){
- throw new Error("indexMethods");
+ // throw new Error("indexMethods");
// indexMethodsFromMetaData();
}
@@ -618,12 +617,17 @@
public static void parse(String resName) throws SAXException,
javax.xml.parsers.ParserConfigurationException, java.io.IOException {
- StorageParser.parse(new InputSource(
+ parse(
Thread.currentThread().getContextClassLoader().getResourceAsStream(resName)
- ), new StorageHandlerImpl());
+ );
}
+ public static void parse(java.io.InputStream is) throws SAXException,
javax.xml.parsers.ParserConfigurationException, java.io.IOException {
+ StorageParser.parse(new InputSource(is), new StorageHandlerImpl());
+ }
+
+
public Validator getValidator(int index) {
return getField(descriptors[ index ].getName()).getValidator();
1.16 +3 -2
jakarta-commons-sandbox/simplestore/src/java/org/apache/commons/simplestore/persistence/impl/PersistentProxy.java
Index: PersistentProxy.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/simplestore/src/java/org/apache/commons/simplestore/persistence/impl/PersistentProxy.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- PersistentProxy.java 11 Mar 2002 10:37:22 -0000 1.15
+++ PersistentProxy.java 14 Mar 2002 15:44:02 -0000 1.16
@@ -60,6 +60,7 @@
import org.apache.commons.simplestore.persistence.Context;
import org.apache.commons.simplestore.persistence.Validator;
import org.apache.commons.simplestore.persistence.ValidationException;
+import org.apache.commons.simplestore.persistence.SimplestoreException;
import org.apache.commons.simplestore.persistence.TypeConverter;
import org.apache.commons.simplestore.tools.*;
@@ -77,7 +78,7 @@
* [EMAIL PROTECTED]</a>
*@author Gerhard Froehlich <a href="mailto:[EMAIL PROTECTED]";>
* [EMAIL PROTECTED]</a>
- *@version $Id: PersistentProxy.java,v 1.15 2002/03/11 10:37:22 baliuka Exp $
+ *@version $Id: PersistentProxy.java,v 1.16 2002/03/14 15:44:02 baliuka Exp $
*/
public class PersistentProxy
implements MetaObject, org.apache.commons.simplestore.tools.Constants ,
@@ -384,7 +385,7 @@
public void handle( java.lang.reflect.Method m, java.lang.Throwable e ){
System.out.println("Error in " + m.getName());
e.printStackTrace();
- throw new java.lang.RuntimeException(e.toString());
+ throw new SimplestoreException(e.toString());
}
static {
1.10 +2 -2
jakarta-commons-sandbox/simplestore/src/test/org/apache/commons/simplestore/TestAll.java
Index: TestAll.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/simplestore/src/test/org/apache/commons/simplestore/TestAll.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TestAll.java 4 Mar 2002 22:11:40 -0000 1.9
+++ TestAll.java 14 Mar 2002 15:44:03 -0000 1.10
@@ -59,7 +59,7 @@
/**
*@author Gerhard Froehlich <a href="mailto:[EMAIL PROTECTED]";>
* [EMAIL PROTECTED]</a>
- *@version $Id: TestAll.java,v 1.9 2002/03/04 22:11:40 baliuka Exp $
+ *@version $Id: TestAll.java,v 1.10 2002/03/14 15:44:03 baliuka Exp $
*/
public class TestAll extends TestCase {
public TestAll(String testName) {
@@ -69,7 +69,7 @@
public static Test suite() {
TestSuite suite = new TestSuite();
suite.addTest(TestSample.suite());
- suite.addTest(TestEnhancer.suite());
+ //suite.addTest(TestEnhancer.suite());
return suite;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
