Changeset 339

Timestamp:

04/22/02 14:57:50 (10 years ago)

Author:

team4

Message:

*** empty log message ***

Location:

branches/release-0_71-bugfixes/Rapla

Files:

• INSTALL.txt (modified) (5 diffs)
• build.xml (modified) (13 diffs)
• src/org/rapla/storage/dbsql/DBOperator.java (modified) (5 diffs)
• src/org/rapla/storage/dbsql/EntityStorage.java (modified) (5 diffs)
• src/org/rapla/storage/dbsql/LinkStorage.java (modified) (2 diffs)
• src/org/rapla/storage/dbsql/RaplaSQL.java (modified) (2 diffs)

branches/release-0_71-bugfixes/Rapla/INSTALL.txt

@@ -1 @@
-This is the INSTALLING-GUIDE for the Rapla-BINARY-DISTRIBUTION, 
-if you have downloaded the SOURCE-DISTRIBUTION you have to
-!! BUILD A BINARY-DISTRIBUTION first !! For more information read README.txt.
+This is the INSTALLING-GUIDE for the Rapla-Binary-Distribution, if you have downloaded the 
+source-distribution read README.txt first.
 
 Requirements:
 - JDK 1.2.2 (1.3 recommended)
-
-- For multi-user support: MySQL or PostgreSQL (may work with other SQL-DBs
-  but has not been tested yet.  put the driver in your lib directory
-  and configure rapla.properties and the Batch-Scripts start.sh,
-  start.bat)
+- MySQL or PostgreSQL (may work with other SQL-DBs but has not been tested yet. 
+  put the driver in your lib directory and  configure rapla.properties 
+  and the Batch-Scripts start.sh, start.bat)
 
 If you only want to test the Rapla-Functionaliy and don't want to
@@ -23 +20 @@
 some appropriate values.
 
-A) Create Mysql DB:
+Create Mysql DB:
 
 1. Create a new Database. You can do this in the mysql client with 
-   the following Command CREATE DATABASE your_db_name; 
-   (Note: If you need full UNICODE-Support you are better of
-   with Postgres).
+   the following Command CREATE DATABASE your_db_name;
 
 2. To create the Schema, you have to dump the rapladb.sql file into 
@@ -56 +51 @@
 
 
-B) Create PostgreSQL DB:
+Create PostgreSQL DB:
 
 1. First you have to login as postgres user.
    Then you can create a new database with
-   createdb your_db_name -E UNICODE
-   (Note: We strongly recommend using UNICODE as encoding for your database. 
-   If your postgres-version doesn't support unicode you might try your
-   local encoding e.g. LATIN_1)
-   
-   And also a new user with
-   createuser db_user -P
+   createdb your_db_name -E LATIN1
+   (Note: Currently only the LATIN1 encoding is tested in 
+   combination with Rapla.)
 
 2. To create the Schema, you have to dump the rapladb.sql file into 
@@ -99 +90 @@
 To fill the database with the the sample-values you can 
 import the data.xml with the following command: 
-    start.sh rapla.properties xml2sql  (UNIX)
-    start.bat rapla.properties xml2sql (WINDOWS)
+    start.sh xml2sql  (UNIX)
+    start.bat xml2sql (WINDOWS)
 Warning: All the data in your_db_name will be lost.
 
@@ -121 +112 @@
 STARTING RAPLA:
 
-If the .jar extension is associated to you JavaRuntimeEnviroment you
-can double-click on the rapla.jar (rapla.jar is located in the lib
-subfolder of your binary-distribution)
+If the .jar extension is associated to you JRE you can
+double-click on the rapla.jar.
 
 To start Rapla from the command-line, you
-have to set java in your PATH (if its not already there),  
+have to set java in your PATH (if its not allready there),  
 Example:
 setenv PATH $PATH:/usr/local/java/bin  (Unix)

branches/release-0_71-bugfixes/Rapla/build.xml

@@ -83 +83 @@
 
 <!-- Rapla build-file
-Copyright (C) 2001-2002 Christopher Kohlhaas                                  
+Copyright (C) 2001 Christopher Kohlhaas                                  
                                                                          
 This programm is free software; you can redistribute it and/or modify    
@@ -109 +109 @@
   <property name="bin-lib0" value="${main.lib}" />
   <property name="bin-lib1" value="crimson.jar"/>
-  <property name="bin-lib2" value="jing.jar"/>
-  <property name="bin-lib3" value="saxon.jar"/>
-  <!--property name="bin-lib2" value="mm.mysql-2.0.8-bin.jar"/-->
+  <property name="bin-lib2" value="mm.mysql-2.0.8-bin.jar"/>
   <property name="bin-lib3" value="jdbc7.1-1.2.jar"/>
 
@@ -143 +141 @@
 
       <property name="name"     value="rapla"/>
-      <property name="version"  value="0.8dev"/>
-      <property name="year"     value="2000-2002"/>
+      <property name="version"  value="0.71"/>
+      <property name="year"     value="2000-2001"/>
       <property name="copyright"  value="Rapla Team"/>
 
@@ -153 +151 @@
       <property name="deprecation"    value="on"/>
       <property name="verbose"        value="no"/>
-      <property name="packages"       value="org.*"/>
+      <property name="packages"       value="org.rapla.*"/>
 
       <!-- The rapla-directories -->
@@ -202 +200 @@
       <property name="libs-win" value=".\lib\${bin-lib0};.\lib\${bin-lib1};.\lib\${bin-lib2};.\lib\${bin-lib3}"/>
       <property name="libs-applet" value="${bin-lib0},${bin-lib1},${bin-lib2},${bin-lib3}"/>
-      <property name="libs-jar" value="${bin-lib0} ${bin-lib1} ${bin-lib2} ${bin-lib3} ../"/>
+      <property name="libs-jar" value="${bin-lib0} ${bin-lib1} ../"/>
       <!-- This complex Property is for the rapla.jnpl file -->
       <property name="lib_jnlp_0" value="&lt;jar href=&quot;${bin-lib0}&quot;/&gt;"/>
@@ -255 +253 @@
         <classpath refid="classpath"/>
         <exclude name="**/RaplaResources*.java" />
-        <exclude name="**/PrintServicePrinter.java" />
+        <!--exclude name="**/dbsql/*.java" /-->
     </javac>
-    <!-- The gifs,license,xsl and rng files must be in the correct classpath  -->
+    <!-- The gifs must be in the correct classpath  -->
     <copy todir="${build.dest}">
         <fileset dir="${src.dir}">
-          <include name="**/images/*"/>
-          <include name="**/dbfile/*.xsl"/>
-          <include name="**/dbfile/*.rng"/>
-        </fileset>
-     </copy>
+          <include name="**/*.gif"/>
+        </fileset>
+    </copy>
   </target>
 
@@ -314 +310 @@
          <fileset dir="${build.dir}/classes">
             <include name="**/*.class" />
-            <include name="**/*.xsl" />
-            <include name="**/*.rng" />
-            <include name="**/images/*" />
+            <include name="**/*.gif" />
          </fileset>
     </jar> 
@@ -347 +341 @@
        <mapper type="glob" from="template_*" to="start.*"/>
     </copy>
-
-    <fixcrlf srcdir="${dist-bin.dir}" eol="crlf">
-       <include name="*.bat" />
-    </fixcrlf>
 
     <copy todir="${dist-bin.dir}" >
@@ -368 +358 @@
           </fileset>
     </chmod>
-  </target>
-
-  <target name="start" depends="compile,compile-resources" 
-     description="Use this during development to quick-launch rapla.">
-     <copy todir="${test.dir}">
-       <fileset dir="${main.dir}">
-         <include name="rapla.properties" />
-         <include name="data.xml" />
-       </fileset>
-     </copy>
-     <java classname="${start.class}" 
-        failonerror="yes"
-        fork="no"
-        dir="${main.dir}">
-        <classpath>
-          <pathelement path="${build.dest}" />
-          <fileset dir="${main.dir}/lib">
-            <patternset refid="bin-libraries" />
-            <include name="gnujpdf.jar"/>
-            <include name="${main.lib}"/>
-          </fileset>
-        </classpath>
-        <arg value="-c"/> 
-        <arg value="${test.dir}/rapla.properties"/> 
-        <arg value="build-script"/> 
-     </java>
   </target>
 
@@ -407 +371 @@
           </fileset>
         </classpath>
-        <arg value="-c"/> 
-        <arg value="rapla.properties"/> 
      </java>
   </target>
@@ -536 +498 @@
            <exclude name="CVS" />
            <exclude name="xalan*.jar" />
+           <exclude name="saxon*.jar" />
         </fileset>
     </copy>
@@ -770 +733 @@
 
  <!-- =================================================================== -->
- <!-- Rebuilds website,javadocs, but not the applet                       -->
- <!-- =================================================================== -->
-
-  <target name="rebuild-site" depends="clean,javadocs,site"
-          description="Rebuild the complete site">
+ <!-- Rebuilds website, includes tarballs,javadocs, but not the applet    -->
+ <!-- =================================================================== -->
+
+  <target name="rebuild-site" depends="clean,javadocs,cleansite,site"
+          description="Rebuild the complete site (very long)">
      <mkdir dir="${website.dir}/doc/javadocs"/>
      <mkdir dir="${website.dir}/download"/>
+     <mkdir dir="${website.dir}/demo"/>
      <copy todir="${website.dir}/doc/javadocs">
          <fileset dir="${build.dir}/javadocs"/> 
+     </copy>
+     <copy todir="${website.dir}/download">
+        <fileset dir="${dist.dir}"> 
+          <include name="*.zip"/>
+          <include name="*.tar.gz"/>
+       </fileset> 
+     </copy>
+     <copy todir="${website.dir}/demo">
+        <fileset dir="${dist-webapp.dir}"/> 
      </copy>
   </target>
@@ -925 +898 @@
           <include name="**/*Test.class" />
           <exclude name="**/storage/dbsql/*.class" />
-          <exclude name="**/storage/dbfile/*.class" />
           <exclude name="**/AllTest.class" />
           <exclude name="**/*$$*Test.class" />

branches/release-0_71-bugfixes/Rapla/src/org/rapla/storage/dbsql/DBOperator.java

@@ -85 +85 @@
         Connection con = null;
         Connection idcon = null;
+        boolean bAutoCommit = true;
         boolean bFailed = true;
         try {
@@ -90 +91 @@
                 con = openConnection();
                 idcon = openConnection();
-                con.setAutoCommit(false);
+                try {
+                    con.setAutoCommit(false);
+                    // Check if autocommit is disabled (Transaction Support)
+                    bAutoCommit = con.getAutoCommit();
+                } catch (SQLException ex) {
+                    config.getLog().log(3,"No Transaction support");
+                }
                 for (int i=0;i<obj.length;i++) 
                     raplaSQL.store(con,idcon,obj[i]);
@@ -96 +103 @@
                 bFailed = false;
             } finally {
-                if (bFailed && (con != null)) {
+                if (bFailed && (con != null) && !bAutoCommit) {
                     con.rollback();
                     config.getLog().log(4,"Doing rollback");
                 }
-                if (!bFailed && (con != null)) {
+                if (!bFailed && (con != null) && !bAutoCommit) {
                     con.commit();
                     config.getLog().log(4,"Commiting");
@@ -117 +124 @@
         checkNoDependencies(obj);
         Connection con = null;
+        boolean bAutoCommit = true;
         boolean bFailed = true;
         try {
             try {
                 con = openConnection();
-                con.setAutoCommit(false);
+                try {
+                    con.setAutoCommit(false);
+                    // Check if autocommit is disabled
+                    bAutoCommit = con.getAutoCommit();
+                } catch (SQLException ex) {
+                    config.getLog().log(3,"No Transaction support");
+                }
                 for (int i=0;i<obj.length;i++) {
                     raplaSQL.remove(con,obj[i]);
@@ -128 +142 @@
                 bFailed = false;
             } finally {
-                if (bFailed && (con != null)) {
+                if (bFailed && (con != null) && !bAutoCommit) {
                     con.rollback();
                     config.getLog().log(4,"Doing rollback");
                 }
-                if (!bFailed && (con != null)) {
+                if (!bFailed && (con != null) && !bAutoCommit) {
                     con.commit();
                     config.getLog().log(4,"Commiting");

branches/release-0_71-bugfixes/Rapla/src/org/rapla/storage/dbsql/EntityStorage.java

@@ -195 +195 @@
         PreparedStatement stmt = null;
         try {
+            if ( config.getLog().enabled(6)) {
+                config.getLog().log(6,"  Executing SQL: " + sql 
+                                    + " {" + id + "}");
+            }
             stmt = con.prepareStatement(sql);
             stmt.setInt(1,id.intValue());
@@ -272 +276 @@
         try {
             stmt = idcon.prepareStatement(updateIdSql);
+            if ( config.getLog().enabled(7)) {
+                config.getLog().log(7," Requesting ID: " + updateIdSql  
+                                    + "{" + requestedIds + "},{" + sessionId + "}" );
+            }
             stmt.setInt(1,requestedIds);
             stmt.setInt(2,sessionId);
@@ -383 +391 @@
                 entity.setId(requestId(1));
                 stmt = con.prepareStatement(insertSql);
+                if ( config.getLog().enabled(7)) {
+                    config.getLog().log(7,"  Preparing sql-insert: " + insertSql  );
+                }
             } else {
                 String query = updateSql;
                 stmt = con.prepareStatement(query);
-                stmt.setInt(count(query,'?'),(entity.getId().intValue()));
+                int id = entity.getId().intValue();
+                if ( config.getLog().enabled(7)) {
+                    config.getLog().log(7,"  Preparing sql-update: " + updateSql 
+                                        + "{" + id + "}");
+                }
+                stmt.setInt(count(query,'?'),id);
             }
             write(stmt, entity);
@@ -397 +413 @@
     public void delete(Entity entity) throws SQLException {
         checkOldSchema();
+        /* Serious BUG in Version 0.71
         Iterator it = subStores.iterator();
         while (it.hasNext()) {
             ((Storage) it.next()).deleteAll();
         }
-
+        */
         PreparedStatement stmt = null;
         try {
@@ -407 +424 @@
                 return;
             stmt = con.prepareStatement(deleteSql);
-            stmt.setInt(1,entity.getId().intValue());
+            int id = entity.getId().intValue();
+            stmt.setInt(1,id);
+            if ( config.getLog().enabled(7)) {
+                config.getLog().log(7,"  Executing sql-delete: " + deleteSql 
+                                    + "{" + id + "}");
+            }
             stmt.executeUpdate();
         } finally {

branches/release-0_71-bugfixes/Rapla/src/org/rapla/storage/dbsql/LinkStorage.java

@@ -78 +78 @@
 
     void delete(Integer leftId) throws SQLException {
+        int id = leftId.intValue();
+        if (config.getLog().enabled(6)) {
+            config.getLog().log(6,"Executing delete-sql " + delete
+                                + " {" + id + "}");
+        }
         PreparedStatement stmt = null;
         try {
             stmt = con.prepareStatement(delete);
-            stmt.setInt(1,leftId.intValue());
+            stmt.setInt(1,id);
             stmt.executeUpdate();
         } finally {
@@ -90 +95 @@
 
     public void deleteAll() throws SQLException {
+        config.getLog().log(3,"Executing DeleteAll SQL: " + deleteAll);
         EntityStorage.executeBatchedStatement(con,deleteAll);
     }

branches/release-0_71-bugfixes/Rapla/src/org/rapla/storage/dbsql/RaplaSQL.java

@@ -456 +456 @@
 
     public void delete(Entity entity) throws SQLException {
+        if ( config.getLog().enabled(4)) 
+            config.getLog().log(4,"  Deleting Reservation with id: " + entity.getId());
         reservationPerson.delete(entity.getId());
         allocationStorage.delete(entity.getId());
@@ -559 +561 @@
                 stmt.close();
         }
+        if ( config.getLog().enabled(5)) 
+            config.getLog().log(5,"  Deleting Allocations for Reservation with id: " + reservationId);
         execute("DELETE FROM TERMIN WHERE RESERVID = ?",reservationId);
     }