You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by bl...@apache.org on 2001/01/10 23:07:06 UTC
cvs commit: xml-cocoon/src/org/apache/cocoon/components/datasource DataSourceComponent.java J2eeDataSource.java JdbcDataSource.java
bloritsch 01/01/10 14:07:06
Modified: src/org/apache/cocoon/acting Tag: xml-cocoon2
AddEmployeeAction.java
src/org/apache/cocoon/components/datasource Tag: xml-cocoon2
DataSourceComponent.java J2eeDataSource.java
JdbcDataSource.java
Log:
Fixed AddEmployeeAction. We have the beginnings of something really cool here....
Revision Changes Path
No revision
No revision
1.1.2.5 +16 -16 xml-cocoon/src/org/apache/cocoon/acting/Attic/AddEmployeeAction.java
Index: AddEmployeeAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/AddEmployeeAction.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- AddEmployeeAction.java 2001/01/10 19:31:39 1.1.2.4
+++ AddEmployeeAction.java 2001/01/10 22:07:00 1.1.2.5
@@ -34,7 +34,7 @@
/**
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/01/10 19:31:39 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/01/10 22:07:00 $
*/
public class AddEmployeeAction extends ComposerAction {
@@ -50,6 +50,7 @@
ComponentSelector selector = (ComponentSelector) this.manager.lookup(Roles.DB_CONNECTION);
this.datasource = (DataSourceComponent) selector.select(connElement.getValue());
} catch (ComponentManagerException cme) {
+ log.error("Could not get the DataSourceComponent", cme);
throw new ConfigurationException("Could not get the DataSource Component", cme);
}
}
@@ -75,40 +76,39 @@
Connection conn = null;
PreparedStatement ps = null;
ResultSet rs = null;
- boolean returnValue = false;
+ boolean returnValue = true;
try {
conn = datasource.getConnection();
conn.setAutoCommit(false);
- rs = conn.createStatement().executeQuery("SELECT Max(id) AS maxid FROM employee_table;");
+ rs = conn.createStatement().executeQuery("SELECT Max(id) AS maxid FROM employee_table");
int maxid = -1;
if (rs.next() == true) {
- maxid = rs.getInt("maxid");
+ maxid = rs.getInt("maxid") + 1;
ps = conn.prepareStatement("INSERT INTO employee_table (id, name, department_id) VALUES (?, ?, ?)");
ps.setInt(1, maxid);
ps.setString(2, name);
ps.setString(3, department);
- returnValue = ps.execute();
+ ps.executeUpdate();
+ returnValue = true;
+ conn.commit();
+ } else {
+ returnValue = false;
+ conn.rollback();
}
} catch (SQLException se) {
- // returnValue = false;
+ log.error("There was a SQL error", se);
} finally {
try {
- if (returnValue = false) {
- conn.rollback();
- } else {
- conn.commit();
- }
-
- ps.close();
- rs.close();
- rs.getStatement().close();
+ if (ps != null) ps.close();
+ if (rs != null) rs.close();
+ if (rs.getStatement() != null) rs.getStatement().close();
conn.close();
} catch (Exception e) {
- // we should never be here
+ log.error("We should never be in this clause", e);
}
}
No revision
No revision
1.1.2.3 +3 -2 xml-cocoon/src/org/apache/cocoon/components/datasource/Attic/DataSourceComponent.java
Index: DataSourceComponent.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/datasource/Attic/DataSourceComponent.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- DataSourceComponent.java 2001/01/08 20:20:46 1.1.2.2
+++ DataSourceComponent.java 2001/01/10 22:07:02 1.1.2.3
@@ -9,6 +9,7 @@
import org.apache.avalon.Component;
import org.apache.avalon.Configurable;
+import org.apache.avalon.ThreadSafe;
import java.sql.Connection;
import java.sql.SQLException;
@@ -17,9 +18,9 @@
* The standard interface for DataSources in Cocoon.
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/01/08 20:20:46 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/01/10 22:07:02 $
*/
-public interface DataSourceComponent extends Component, Configurable {
+public interface DataSourceComponent extends Component, Configurable, ThreadSafe {
/**
* Gets the Connection to the database
*/
1.1.2.2 +2 -3 xml-cocoon/src/org/apache/cocoon/components/datasource/Attic/J2eeDataSource.java
Index: J2eeDataSource.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/datasource/Attic/J2eeDataSource.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- J2eeDataSource.java 2001/01/10 15:21:01 1.1.2.1
+++ J2eeDataSource.java 2001/01/10 22:07:03 1.1.2.2
@@ -9,7 +9,6 @@
import org.apache.avalon.Configuration;
import org.apache.avalon.ConfigurationException;
-import org.apache.avalon.ThreadSafe;
import org.apache.log.LogKit;
import org.apache.log.Logger;
@@ -26,9 +25,9 @@
* J2EE container pools the datasources properly.
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/01/10 15:21:01 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/01/10 22:07:03 $
*/
-public class J2eeDataSource implements DataSourceComponent, ThreadSafe {
+public class J2eeDataSource implements DataSourceComponent {
final static String JDBC_NAME = "java:comp/env/jdbc/";
Logger log = LogKit.getLoggerFor("cocoon");
DataSource ds = null;
1.1.2.6 +2 -3 xml-cocoon/src/org/apache/cocoon/components/datasource/Attic/JdbcDataSource.java
Index: JdbcDataSource.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/datasource/Attic/JdbcDataSource.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- JdbcDataSource.java 2001/01/10 13:44:00 1.1.2.5
+++ JdbcDataSource.java 2001/01/10 22:07:04 1.1.2.6
@@ -10,7 +10,6 @@
import org.apache.avalon.Configuration;
import org.apache.avalon.ConfigurationException;
import org.apache.avalon.Disposable;
-import org.apache.avalon.ThreadSafe;
import org.apache.log.LogKit;
import org.apache.log.Logger;
@@ -23,9 +22,9 @@
* <code>java.sql.DriverManager</code>.
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/01/10 13:44:00 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/01/10 22:07:04 $
*/
-public class JdbcDataSource implements DataSourceComponent, ThreadSafe {
+public class JdbcDataSource implements DataSourceComponent {
Logger log = LogKit.getLoggerFor("cocoon");
JdbcConnectionPool pool = null;