Author: sshyrkov
Date: Tue Jun 19 15:56:02 2007
New Revision: 17643
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17643&repname=
=3Djahia
Log:
Rollback changes deone in JAHIA-1985 to the Jahia indexing tables
Modified:
trunk/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaIndexJob=
ServerPK.java
trunk/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaIndexing=
Job.java
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema=
.sql
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schema.sql
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mysql-tx/jahia-schema.s=
ql
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schema.sql
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/oracle/jahia-schema.sql
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-schema=
.sql
Modified: trunk/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaIn=
dexJobServerPK.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/model/indexingjob/JahiaIndexJobServerPK.java&rev=3D17643=
&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/indexingjob/JahiaIndexJob=
ServerPK.java (original)
+++ trunk/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaIndexJob=
ServerPK.java Tue Jun 19 15:56:02 2007
@@ -37,7 +37,7 @@
}
=
/**
- * @hibernate.property column=3D"server_id"
+ * @hibernate.property column=3D"serverid"
* length=3D"200"
*/
public String getServerId() {
@@ -50,7 +50,7 @@
}
=
/**
- * @hibernate.property column=3D"indexingjob_id"
+ * @hibernate.property column=3D"indexingjobid"
* length=3D"50"
*/
public String getIndexingJobId() {
Modified: trunk/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaIn=
dexingJob.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/model/indexingjob/JahiaIndexingJob.java&rev=3D17643&repn=
ame=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/indexingjob/JahiaIndexing=
Job.java (original)
+++ trunk/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaIndexing=
Job.java Tue Jun 19 15:56:02 2007
@@ -32,7 +32,7 @@
* Time: 12:53:53
* To change this template use File | Settings | File Templates.
*
- * @hibernate.class table=3D"jahia_indexingjob"
+ * @hibernate.class table=3D"jahia_indexingjobs"
* @hibernate.discriminator column=3D"classname_indexingjob"
* @hibernate.cache usage=3D"nonstrict-read-write"
*/
Modified: trunk/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-=
schema.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema.sql&rev=3D17643&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/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema=
.sql (original)
+++ trunk/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema=
.sql Tue Jun 19 15:56:02 2007
@@ -1210,19 +1210,19 @@
=
CREATE TABLE jahia_indexingjobsserver
(
- indexingjob_id VARCHAR(50) NOT NULL,
- server_id VARCHAR(50) NOT NULL,
+ indexingjobid VARCHAR(50) NOT NULL,
+ serverid VARCHAR(50) NOT NULL,
indexing_date BIGINT NOT NULL,
- PRIMARY KEY(indexingjob_id,server_id)
+ PRIMARY KEY(indexingjobid,serverid)
);
=
-CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (=
indexingjob_id, server_id);
+CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (=
indexingjobid, serverid);
--------------------------------------------------------------------------=
---
--- jahia_indexingjob
+-- jahia_indexingjobs
--------------------------------------------------------------------------=
---
-drop table jahia_indexingjob if exists;
+drop table jahia_indexingjobs if exists;
=
-CREATE TABLE jahia_indexingjob
+CREATE TABLE jahia_indexingjobs
(
id_indexingjob VARCHAR(50) NOT NULL,
classname_indexingjob VARCHAR(150) NOT NULL,
@@ -1237,4 +1237,4 @@
PRIMARY KEY(id_indexingjob)
);
=
-CREATE INDEX jahia_indexingjob_index ON jahia_indexingjob (id_indexingjob=
);
+CREATE INDEX jahia_indexingjobs_index ON jahia_indexingjobs (id_indexingj=
ob);
Modified: trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schem=
a.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/var/db/sql/schema/mssql/jahia-schema.sql&rev=3D17643&repname=3Djah=
ia
=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/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schema.sql =
(original)
+++ trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schema.sql =
Tue Jun 19 15:56:02 2007
@@ -103,7 +103,7 @@
drop table jahia_grps;
drop table jahia_homepages;
drop table jahia_homepages_prop;
-drop table jahia_indexingjob;
+drop table jahia_indexingjobs;
drop table jahia_indexingjobsserver;
drop table jahia_link;
drop table jahia_link_metadata;
@@ -470,7 +470,7 @@
value_homepages_prop NVARCHAR(255) null,
primary key (id_jahia_homepages, sitekey_homepages_prop, name_homepage=
s_prop)
);
-create table jahia_indexingjob (
+create table jahia_indexingjobs (
id_indexingjob NVARCHAR(50) not null,
classname_indexingjob NVARCHAR(255) not null,
date_indexingjob numeric(19,0) null,
@@ -484,8 +484,8 @@
primary key (id_indexingjob)
);
create table jahia_indexingjobsserver (
- indexingjob_id NVARCHAR(50) not null,
- server_id NVARCHAR(255) null,
+ indexingjobid NVARCHAR(50) not null,
+ serverid NVARCHAR(255) null,
indexing_date numeric(19,0) null
);
create table jahia_link (
@@ -1022,8 +1022,8 @@
references jahia_homepages;
alter table jahia_indexingjobsserver
add constraint FK83742F90F50744
- foreign key (indexingjob_id)
- references jahia_indexingjob;
+ foreign key (indexingjobid)
+ references jahia_indexingjobs;
alter table jahia_markup_set
add constraint FK9140E0E11CF7BDC1
foreign key (markupdef_id)
Modified: trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mysql-tx/jahia-sc=
hema.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/var/db/sql/schema/mysql-tx/jahia-schema.sql&rev=3D17643&repname=3D=
jahia
=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/webapp/WEB-INF/var/db/sql/schema/mysql-tx/jahia-schema.s=
ql (original)
+++ trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mysql-tx/jahia-schema.s=
ql Tue Jun 19 15:56:02 2007
@@ -1299,20 +1299,20 @@
=
CREATE TABLE jahia_indexingjobsserver
(
- indexingjob_id VARCHAR(50) NOT NULL,
- server_id VARCHAR(50) NOT NULL,
+ indexingjobid VARCHAR(50) NOT NULL,
+ serverid VARCHAR(50) NOT NULL,
indexing_date BIGINT NOT NULL,
- PRIMARY KEY(indexingjob_id,server_id),
- INDEX jahia_indexingjobsserver_index (indexingjob_id, server_id));
+ PRIMARY KEY(indexingjobid,serverid),
+ INDEX jahia_indexingjobsserver_index (indexingjobid, serverid));
=
ALTER TABLE jahia_indexingjobsserver TYPE=3DInnoDB; =
=
# -----------------------------------------------------------------------
-# jahia_indexingjob
+# jahia_indexingjobs
# -----------------------------------------------------------------------
-drop table if exists jahia_indexingjob;
+drop table if exists jahia_indexingjobs;
=
-CREATE TABLE jahia_indexingjob
+CREATE TABLE jahia_indexingjobs
(
id_indexingjob VARCHAR(50) NOT NULL,
classname_indexingjob VARCHAR(150) NOT NULL,
@@ -1325,9 +1325,9 @@
pageid_indexingjob INTEGER,
fieldid_indexingjob INTEGER,
PRIMARY KEY(id_indexingjob),
- INDEX jahia_indexingjob_index (id_indexingjob));
+ INDEX jahia_indexingjobs_index (id_indexingjob));
=
-ALTER TABLE jahia_indexingjob TYPE=3DInnoDB; =
+ALTER TABLE jahia_indexingjobs TYPE=3DInnoDB; =
=
=
=
Modified: trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schem=
a.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/var/db/sql/schema/mysql/jahia-schema.sql&rev=3D17643&repname=3Djah=
ia
=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/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schema.sql =
(original)
+++ trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schema.sql =
Tue Jun 19 15:56:02 2007
@@ -1191,18 +1191,18 @@
=
CREATE TABLE jahia_indexingjobsserver
(
- indexingjob_id VARCHAR(50) NOT NULL,
- server_id VARCHAR(50) NOT NULL,
+ indexingjobid VARCHAR(50) NOT NULL,
+ serverid VARCHAR(50) NOT NULL,
indexing_date BIGINT NOT NULL,
- PRIMARY KEY(indexingjob_id,server_id),
- INDEX jahia_indexingjobsserver_index (indexingjob_id, server_id));
+ PRIMARY KEY(indexingjobid,serverid),
+ INDEX jahia_indexingjobsserver_index (indexingjobid, serverid));
=
# -----------------------------------------------------------------------
-# jahia_indexingjob
+# jahia_indexingjobs
# -----------------------------------------------------------------------
-drop table if exists jahia_indexingjob;
+drop table if exists jahia_indexingjobs;
=
-CREATE TABLE jahia_indexingjob
+CREATE TABLE jahia_indexingjobs
(
id_indexingjob VARCHAR(50) NOT NULL,
classname_indexingjob VARCHAR(150) NOT NULL,
@@ -1215,4 +1215,4 @@
pageid_indexingjob INTEGER,
fieldid_indexingjob INTEGER,
PRIMARY KEY(id_indexingjob),
- INDEX jahia_indexingjob_index (id_indexingjob));
+ INDEX jahia_indexingjobs_index (id_indexingjob));
Modified: trunk/core/src/webapp/WEB-INF/var/db/sql/schema/oracle/jahia-sche=
ma.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/var/db/sql/schema/oracle/jahia-schema.sql&rev=3D17643&repname=3Dja=
hia
=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/webapp/WEB-INF/var/db/sql/schema/oracle/jahia-schema.sql=
(original)
+++ trunk/core/src/webapp/WEB-INF/var/db/sql/schema/oracle/jahia-schema.sql=
Tue Jun 19 15:56:02 2007
@@ -36,7 +36,7 @@
drop table jahia_grps cascade constraints;
drop table jahia_homepages cascade constraints;
drop table jahia_homepages_prop cascade constraints;
-drop table jahia_indexingjob cascade constraints;
+drop table jahia_indexingjobs cascade constraints;
drop table jahia_indexingjobsserver cascade constraints;
drop table jahia_link cascade constraints;
drop table jahia_link_metadata cascade constraints;
@@ -394,7 +394,7 @@
value_homepages_prop varchar2(255),
primary key (id_jahia_homepages, sitekey_homepages_prop, name_homepage=
s_prop)
);
-create table jahia_indexingjob (
+create table jahia_indexingjobs (
id_indexingjob varchar2(50) not null,
classname_indexingjob varchar2(255) not null,
date_indexingjob number(19,0),
@@ -408,8 +408,8 @@
primary key (id_indexingjob)
);
create table jahia_indexingjobsserver (
- indexingjob_id varchar2(50) not null,
- server_id varchar2(255),
+ indexingjobid varchar2(50) not null,
+ serverid varchar2(255),
indexing_date number(19,0)
);
create table jahia_link (
@@ -909,8 +909,8 @@
references jahia_homepages;
alter table jahia_indexingjobsserver
add constraint FK83742F90F50744
- foreign key (indexingjob_id)
- references jahia_indexingjob;
+ foreign key (indexingjobid)
+ references jahia_indexingjobs;
alter table jahia_markup_set
add constraint FK9140E0E11CF7BDC1
foreign key (markupdef_id)
@@ -1140,4 +1140,4 @@
CREATE INDEX jahia_users_index ON jahia_users (name_jahia_users, siteid_ja=
hia_users);
CREATE INDEX jahia_users_index2 ON jahia_users (siteid_jahia_users);
=
-CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjob_id, server_id);
+CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjobid, serverid);
Modified: trunk/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-=
schema.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/var/db/sql/schema/postgresql/jahia-schema.sql&rev=3D17643&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/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-schema=
.sql (original)
+++ trunk/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-schema=
.sql Tue Jun 19 15:56:02 2007
@@ -1314,24 +1314,24 @@
=
CREATE TABLE jahia_indexingjobsserver
(
- indexingjob_id VARCHAR(50) NOT NULL,
- server_id VARCHAR(50) NOT NULL,
+ indexingjobid VARCHAR(50) NOT NULL,
+ serverid VARCHAR(50) NOT NULL,
indexing_date INT8 NOT NULL,
- PRIMARY KEY (indexingjob_id,server_id)
+ PRIMARY KEY (indexingjobid,serverid)
);
-CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjob_id, server_id);
+CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjobid, serverid);
=
=
=
=
--------------------------------------------------------------------------=
---
--- jahia_indexingjob
+-- jahia_indexingjobs
--------------------------------------------------------------------------=
---
-DROP TABLE jahia_indexingjob CASCADE;
+DROP TABLE jahia_indexingjobs CASCADE;
=
=
=
-CREATE TABLE jahia_indexingjob
+CREATE TABLE jahia_indexingjobs
(
id_indexingjob VARCHAR(50) NOT NULL,
classname_indexingjob VARCHAR(150) NOT NULL,
@@ -1345,7 +1345,7 @@
fieldid_indexingjob INTEGER,
PRIMARY KEY (id_indexingjob)
);
-CREATE INDEX jahia_indexingjob_index ON jahia_indexingjob (id_indexingjob);
+CREATE INDEX jahia_indexingjobs_index ON jahia_indexingjobs (id_indexingjo=
b);
=
=
----------------------------------------------------------------------
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
