shuber 2005/07/29 17:20:13 CEST
Modified files:
core jahia.iml jahia.ipr project.xml
core/src/java/org/jahia/bin JahiaConfigurationWizard.java
core/src/webapp/WEB-INF/var/db/sql/schema/postgresql
security-schema.sql
Log:
Working on supporting PostgreSQL. Still some problems with transactions.
Revision Changes Path
1.5 +12 -12 jahia/core/jahia.iml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/jahia.iml.diff?r1=1.4&r2=1.5&f=h
1.3 +1 -0 jahia/core/jahia.ipr
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/jahia.ipr.diff?r1=1.2&r2=1.3&f=h
1.66 +2 -2 jahia/core/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/project.xml.diff?r1=1.65&r2=1.66&f=h
1.15 +9 -4
jahia/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java.diff?r1=1.14&r2=1.15&f=h
1.3 +2 -2
jahia/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/security-schema.sql
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/security-schema.sql.diff?r1=1.2&r2=1.3&f=h
Index: jahia.iml
===================================================================
RCS file: /home/cvs/repository/jahia/core/jahia.iml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jahia.iml 21 Jul 2005 15:07:21 -0000 1.4
+++ jahia.iml 29 Jul 2005 15:20:12 -0000 1.5
@@ -781,15 +781,6 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$maven-rep$/oscache/jars/oscache-2.0.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
<root url="jar://$maven-rep$/jmock/jars/jmock-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
@@ -1116,7 +1107,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="library" name="Tomcat"
level="application_server_libraries" />
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -1126,6 +1116,16 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="library" name="Tomcat"
level="application_server_libraries" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$maven-rep$/oscache/jars/oscache-2.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="WebModuleBuildComponent">
@@ -1565,8 +1565,8 @@
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/oscache-2.0.1.jar" />
- <url>jar://$maven-rep$/oscache/jars/oscache-2.0.1.jar!/</url>
+ <attribute name="URI" value="/WEB-INF/lib/oscache-2.1.jar" />
+ <url>jar://$maven-rep$/oscache/jars/oscache-2.1.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
Index: jahia.ipr
===================================================================
RCS file: /home/cvs/repository/jahia/core/jahia.ipr,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jahia.ipr 21 Jul 2005 15:07:21 -0000 1.2
+++ jahia.ipr 29 Jul 2005 15:20:12 -0000 1.3
@@ -194,6 +194,7 @@
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/jahia.iml"
filepath="$PROJECT_DIR$/jahia.iml" />
+ <module fileurl="file://$PROJECT_DIR$/../jahia-api/jahia-api.iml"
filepath="$PROJECT_DIR$/../jahia-api/jahia-api.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" assert-keyword="true"
jdk-15="true" project-jdk-name="java version "1.4.2_05"" />
Index: project.xml
===================================================================
RCS file: /home/cvs/repository/jahia/core/project.xml,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- project.xml 29 Jul 2005 12:21:23 -0000 1.65
+++ project.xml 29 Jul 2005 15:20:12 -0000 1.66
@@ -410,9 +410,9 @@
</properties>
</dependency>
<dependency>
- <groupId>maven-plugins</groupId>
+ <groupId>torque</groupId>
<artifactId>maven-torque-plugin</artifactId>
- <version>3.2</version>
+ <version>3.2-rc1</version>
<type>plugin</type>
</dependency>
<dependency>
Index: JahiaConfigurationWizard.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JahiaConfigurationWizard.java 5 Jul 2005 18:20:27 -0000 1.14
+++ JahiaConfigurationWizard.java 29 Jul 2005 15:20:12 -0000 1.15
@@ -1,4 +1,4 @@
-// $Id: JahiaConfigurationWizard.java,v 1.14 2005/07/05 18:20:27 shuber Exp $
+// $Id: JahiaConfigurationWizard.java,v 1.15 2005/07/29 15:20:12 shuber Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -1682,9 +1682,14 @@
try {
db.query( line );
} catch (Exception e) {
- logger.error("Error while trying to execute query : " + line
+ " from script " + script.toString());
- // continue to propagate the exception upwards.
- throw e;
+ // first let's check if it is a DROP TABLE query, if it is,
+ // we will just fail silently.
+ String upperCaseLine = line.toUpperCase().trim();
+ if (!upperCaseLine.startsWith("DROP TABLE")) {
+ logger.error("Error while trying to execute query : " +
line + " from script " + script.toString());
+ // continue to propagate the exception upwards.
+ throw e;
+ }
}
}
Index: security-schema.sql
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/security-schema.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- security-schema.sql 8 Jul 2005 16:12:43 -0000 1.2
+++ security-schema.sql 29 Jul 2005 15:20:13 -0000 1.3
@@ -97,8 +97,8 @@
SITE_ID integer NOT NULL,
NAME varchar (254) NOT NULL,
URL varchar (254) NOT NULL,
- ALLOW_USER_SET boolean default 0,
- REQUIRES_CERTIFICATE boolean default 0,
+ ALLOW_USER_SET boolean default '0',
+ REQUIRES_CERTIFICATE boolean default '0',
PRIMARY KEY (SITE_ID),
CONSTRAINT UIX_SITE_URL UNIQUE (URL)
);
