Author: cmailleux
Date: Thu Jul 12 17:20:52 2007
New Revision: 17970
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17970&repname=
=3Djahia
Log:
Port of commit [17214] [17215] Missing DB for URLKeys
Added:
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema=
-index.sql
- copied unchanged from r17214, branches/JAHIA-5-0-SP-BRANCH/core/src=
/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema-index.sql
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schema-inde=
x.sql
- copied unchanged from r17214, branches/JAHIA-5-0-SP-BRANCH/core/src=
/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schema-index.sql
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mysql-tx/jahia-schema-i=
ndex.sql
- copied unchanged from r17214, branches/JAHIA-5-0-SP-BRANCH/core/src=
/webapp/WEB-INF/var/db/sql/schema/mysql-tx/jahia-schema-index.sql
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schema-inde=
x.sql
- copied unchanged from r17214, branches/JAHIA-5-0-SP-BRANCH/core/src=
/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schema-index.sql
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/oracle/jahia-schema-ind=
ex.sql
- copied unchanged from r17214, branches/JAHIA-5-0-SP-BRANCH/core/src=
/webapp/WEB-INF/var/db/sql/schema/oracle/jahia-schema-index.sql
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-schema=
-index.sql
- copied unchanged from r17214, branches/JAHIA-5-0-SP-BRANCH/core/src=
/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-schema-index.sql
Modified:
trunk/core/src/java/org/jahia/admin/database/DatabaseScripts.java
trunk/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java
trunk/core/src/java/org/jahia/hibernate/model/JahiaLink.java
Modified: trunk/core/src/java/org/jahia/admin/database/DatabaseScripts.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/admin/database/DatabaseScripts.java&rev=3D17970&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/admin/database/DatabaseScripts.java (orig=
inal)
+++ trunk/core/src/java/org/jahia/admin/database/DatabaseScripts.java Thu J=
ul 12 17:20:52 2007
@@ -29,15 +29,12 @@
import java.io.FileInputStream;
import java.io.FileReader;
import java.io.IOException;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Properties;
-import java.util.Vector;
=
import javax.servlet.ServletContext;
=
import org.jahia.bin.Jahia;
-import java.util.ArrayList;
+
+import java.util.*;
import java.io.FilenameFilter;
import org.jahia.utils.PathResolver;
=
@@ -251,9 +248,19 @@
}
}
});
-
+ List indexFiles =3D new ArrayList();
for (int i=3D0; i < schemaFiles.length; i++) {
- ArrayList curFileSQL =3D getScriptFileStatements(schemaFiles[i=
]);
+ File sqlFile =3D schemaFiles[i];
+ if(sqlFile.getName().endsWith("index.sql")) {
+ indexFiles.add(sqlFile);
+ } else {
+ ArrayList curFileSQL =3D getScriptFileStatements(sqlFile);
+ result.addAll(curFileSQL);
+ }
+ }
+ for (int i =3D 0; i < indexFiles.size(); i++) {
+ File indexFile =3D (File) indexFiles.get(i);
+ ArrayList curFileSQL =3D getScriptFileStatements(indexFile);
result.addAll(curFileSQL);
}
return result;
Modified: trunk/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/bin/JahiaConfigurationWizard.java&rev=3D17970&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java (origin=
al)
+++ trunk/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java Thu Jul=
12 17:20:52 2007
@@ -1600,10 +1600,13 @@
// first let's check if it is a DROP TABLE query, if it is,
// we will just fail silently.
String upperCaseLine =3D line.toUpperCase().trim();
- if (!upperCaseLine.startsWith("DROP TABLE") && !upperCaseL=
ine.startsWith("ALTER TABLE")) {
+ if (!upperCaseLine.startsWith("DROP") && !upperCaseLine.st=
artsWith("ALTER TABLE")
+ && !upperCaseLine.startsWith("CREATE INDEX")) {
logger.error("Error while trying to execute query : " =
+ line + " from script " + script.toString());
// continue to propagate the exception upwards.
throw e;
+ } else {
+ logger.warn("Error while trying to execute query : " +=
line + " from script " + script.toString());
}
}
}
Modified: trunk/core/src/java/org/jahia/hibernate/model/JahiaLink.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/model/JahiaLink.java&rev=3D17970&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/hibernate/model/JahiaLink.java (original)
+++ trunk/core/src/java/org/jahia/hibernate/model/JahiaLink.java Thu Jul 12=
17:20:52 2007
@@ -119,7 +119,7 @@
=
/**
* @hibernate.property column=3D"left_oid"
- * length=3D"255"
+ * length=3D"100"
*/
public String getLeftOid() {
return this.leftOid;
@@ -131,7 +131,7 @@
=
/**
* @hibernate.property column=3D"right_oid"
- * length=3D"255"
+ * length=3D"100"
*/
public String getRightOid() {
return this.rightOid;
@@ -143,7 +143,7 @@
=
/**
* @hibernate.property column=3D"type"
- * length=3D"255"
+ * length=3D"100"
*/
public String getType() {
return this.type;
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
