Cleaned up build.xml.

Changed the way the database is populated so that it works with a
password protected PostgreSQL installation.

diff --git a/build.xml b/build.xml
index d26d695..c68923d 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -62,20 +62,18 @@
 
 <!-- No customization required after this line -->
 
+  <property environment="env"/>
   <property name="dist.home"      value="${deploy.home}"/>
   <property name="deploy.webinf"  value="${deploy.home}/WEB-INF"/>
   <property name="deploy.classes" value="${deploy.webinf}/classes"/>
   <property name="dist.src"       value="${app.name}.jar"/>
   <property name="dist.war"       value="${app.name}.war"/>
   <property name="javadoc.home"   value="${deploy.home}/javadoc"/>
+  <property name="tomcat.home"    value="${env.TOMCAT_HOME}"/>
 
-  <!-- If you want to use the very good jikes compiler, uncomment this
-  <property name="build.compiler"   value="jikes"/>-->
+  <!-- If you want to use the very good jikes compiler, uncomment this 
+  <property name="build.compiler"   value="jikes"/> -->
 
-  <!-- The following 3 properties seem redundant -->
-  <property name="java.home"             value="/usr/lib/j2sdk1.3/"/>
-  <property name="java.localhome" value="/usr/share/java/"/>
-  <property name="tomcat.home"    value="/usr/share/tomcat/"/>
 
 
   <!-- Construct the classpath -->
@@ -86,15 +84,10 @@
     <fileset dir="lib">
       <include name="*.jar"/>
     </fileset>
-<!--    <fileset dir="${java.home}/lib">
-      <include name="tools.jar"/>
-      <include name="rt.jar"/>
-    </fileset>
-    <fileset dir="${java.localhome}">
-      <include name="*.jar"/>
-    </fileset>
     <pathelement path="${tomcat.home}/lib/tomcat.jar"/>
--->
+       <fileset dir="${tomcat.home}/lib/common">
+               <include name="*.jar" />
+       </fileset>
   </path>
 
 
@@ -192,9 +185,12 @@
     <copy   todir="${deploy.classes}/bundles">
       <fileset dir="bundles" includes="**/*.properties"/>
     </copy>
-  <!-- I really don't think this is needed by default. maybe make it a targe?
-    -mh -->
-       <!--<exec executable="./perms.sh"/>-->
+  </target>
+
+
+
+  <target name="perms">
+       <exec executable="./perms.sh"/>
   </target>
 
 

diff --git a/dbscripts/help_arttype.sql b/dbscripts/help_arttype.sql
index 2c7680b..a58ed98 100755 (executable)
--- a/dbscripts/help_arttype.sql
+++ b/dbscripts/help_arttype.sql
@@ -1,5 +1,5 @@
 UPDATE "pg_class" SET "reltriggers" = 0 WHERE "relname" !~ '^pg_';
-\connect - postgres
+-- \connect - postgres
 INSERT INTO "article_type" VALUES (0,'OpenPosting');
 INSERT INTO "article_type" VALUES (1,'Newswire');
 INSERT INTO "article_type" VALUES (2,'Feature');

diff --git a/dbscripts/help_imgcolor.sql b/dbscripts/help_imgcolor.sql
index d4d08fd..1f28846 100755 (executable)
--- a/dbscripts/help_imgcolor.sql
+++ b/dbscripts/help_imgcolor.sql
@@ -1,5 +1,5 @@
 UPDATE "pg_class" SET "reltriggers" = 0 WHERE "relname" !~ '^pg_';
-\connect - postgres
+-- \connect - postgres
 INSERT INTO "img_color" VALUES (0,'--');
 INSERT INTO "img_color" VALUES (3,'color (16)');
 INSERT INTO "img_color" VALUES (4,'color (256)');

diff --git a/dbscripts/help_imgform.sql b/dbscripts/help_imgform.sql
index 96e177c..e6f4343 100755 (executable)
--- a/dbscripts/help_imgform.sql
+++ b/dbscripts/help_imgform.sql
@@ -1,5 +1,5 @@
 UPDATE "pg_class" SET "reltriggers" = 0 WHERE "relname" !~ '^pg_';
-\connect - postgres
+-- \connect - postgres
 INSERT INTO "img_format" VALUES (0,'jpeg','jpg','image/jpg','jpeg nur vom original bearbeiten');
 INSERT INTO "img_format" VALUES (1,'gif','gif','image/gif',NULL);
 BEGIN TRANSACTION;

diff --git a/dbscripts/help_imglay.sql b/dbscripts/help_imglay.sql
index 9b7165f..7da0148 100755 (executable)
--- a/dbscripts/help_imglay.sql
+++ b/dbscripts/help_imglay.sql
@@ -1,5 +1,5 @@
 UPDATE "pg_class" SET "reltriggers" = 0 WHERE "relname" !~ '^pg_';
-\connect - postgres
+-- \connect - postgres
 INSERT INTO "img_layout" VALUES (0,'--');
 INSERT INTO "img_layout" VALUES (1,'quer');
 INSERT INTO "img_layout" VALUES (2,'hoch');

diff --git a/dbscripts/help_imgtype.sql b/dbscripts/help_imgtype.sql
index dc3c15a..4145c55 100755 (executable)
--- a/dbscripts/help_imgtype.sql
+++ b/dbscripts/help_imgtype.sql
@@ -1,5 +1,5 @@
 UPDATE "pg_class" SET "reltriggers" = 0 WHERE "relname" !~ '^pg_';
-\connect - postgres
+-- \connect - postgres
 INSERT INTO "img_type" VALUES (0,'--');
 INSERT INTO "img_type" VALUES (1,'Plakat');
 INSERT INTO "img_type" VALUES (2,'Photo');

diff --git a/dbscripts/help_lang.sql b/dbscripts/help_lang.sql
index ca3356c..3486bc0 100755 (executable)
--- a/dbscripts/help_lang.sql
+++ b/dbscripts/help_lang.sql
@@ -1,5 +1,5 @@
 UPDATE "pg_class" SET "reltriggers" = 0 WHERE "relname" !~ '^pg_';
-\connect - postgres
+-- \connect - postgres
 INSERT INTO "language" VALUES (0,'deutsch','de');
 INSERT INTO "language" VALUES (1,'english','en');
 BEGIN TRANSACTION;

diff --git a/dbscripts/help_rights.sql b/dbscripts/help_rights.sql
index ae5d787..851eb01 100755 (executable)
--- a/dbscripts/help_rights.sql
+++ b/dbscripts/help_rights.sql
@@ -1,5 +1,5 @@
 UPDATE "pg_class" SET "reltriggers" = 0 WHERE "relname" !~ '^pg_';
-\connect - postgres
+-- \connect - postgres
 INSERT INTO "rights" VALUES (0,'keine angabe',NULL);
 INSERT INTO "rights" VALUES (1,'indymedia','rechte liegen bei indymedia');
 INSERT INTO "rights" VALUES (2,'rechte bei autor/innen',NULL);

diff --git a/dbscripts/help_users.sql b/dbscripts/help_users.sql
index 42cb663..c46fddf 100755 (executable)
--- a/dbscripts/help_users.sql
+++ b/dbscripts/help_users.sql
@@ -1,5 +1,5 @@
 UPDATE "pg_class" SET "reltriggers" = 0 WHERE "relname" !~ '^pg_';
-\connect - postgres
+-- \connect - postgres
 INSERT INTO "webdb_users" VALUES (1,'open','','f');
 INSERT INTO "webdb_users" VALUES (2,'redaktion','indymedia','t');
 INSERT INTO "webdb_users" VALUES (3,'tollendorf','indymedia','t');

diff --git a/dbscripts/populate_mediatyp.sql b/dbscripts/populate_mediatyp.sql
index 4ca9fd6..55d61e4 100755 (executable)
--- a/dbscripts/populate_mediatyp.sql
+++ b/dbscripts/populate_mediatyp.sql
@@ -8,7 +8,8 @@
 --
 
 
-\connect - de_indy
+-- \connect - de_indy
+
 -- Disable triggers
 UPDATE "pg_class" SET "reltriggers" = 0 WHERE "relname" = 'media_type';