Index: unix_installer/upgrader-package/build.xml =================================================================== RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/build.xml,v diff -u -r1.4 -r1.5 --- unix_installer/upgrader-package/build.xml 5 May 2008 06:04:01 -0000 1.4 +++ unix_installer/upgrader-package/build.xml 13 Jun 2008 07:11:37 -0000 1.5 @@ -16,7 +16,7 @@ + output="${basedir}/database/dump.sql" failonerror="true"> @@ -113,6 +113,17 @@ + + + + + + + + + + + Index: unix_installer/upgrader-package/createPackage.sh =================================================================== RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/createPackage.sh,v diff -u -r1.2 -r1.3 --- unix_installer/upgrader-package/createPackage.sh 5 May 2008 06:04:01 -0000 1.2 +++ unix_installer/upgrader-package/createPackage.sh 13 Jun 2008 07:11:37 -0000 1.3 @@ -10,4 +10,4 @@ tar -czf lams-unix-updater-$LAMS_VERSION.tar.gz lams-unix-updater-$LAMS_VERSION #Copying to test dir -cp -r lams-unix-updater-$LAMS_VERSION /home/lfoxton/workspace/test_installers/updater +#cp -r lams-unix-updater-$LAMS_VERSION /home/lfoxton/workspace/test_installers/updater Index: unix_installer/upgrader-package/lams.properties =================================================================== RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/lams.properties,v diff -u -r1.3 -r1.4 --- unix_installer/upgrader-package/lams.properties 5 May 2008 06:04:01 -0000 1.3 +++ unix_installer/upgrader-package/lams.properties 13 Jun 2008 07:11:37 -0000 1.4 @@ -81,6 +81,9 @@ # a separate server SQL_HOST=localhost +# The port that your MySql server is running through +SQL_PORT=3306 + # The URL that you jdbc driver will be running through SQL_URL=jdbc:mysql://${SQL_HOST}/${DB_NAME}?characterEncoding=utf8 Index: unix_installer/upgrader-package/readme =================================================================== RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/readme,v diff -u -r1.3 -r1.4 Binary files differ Index: unix_installer/upgrader-package/update-lams.sh =================================================================== RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/update-lams.sh,v diff -u -r1.5 -r1.6 Binary files differ Index: unix_installer/upgrader-package/ant-scripts/tools.properties =================================================================== RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/ant-scripts/tools.properties,v diff -u -r1.1 -r1.2 --- unix_installer/upgrader-package/ant-scripts/tools.properties 10 May 2007 04:28:57 -0000 1.1 +++ unix_installer/upgrader-package/ant-scripts/tools.properties 13 Jun 2008 07:11:08 -0000 1.2 @@ -8,7 +8,7 @@ db.username=${DB_USER} db.password=${DB_PASS} db.Driver=com.mysql.jdbc.Driver -db.url=jdbc:mysql://localhost/${db.name}?characterEncoding=utf8&zeroDateTimeBehaviour=convertToNull&autoReconnect=true&useUnicode=true +db.url=jdbc:mysql://localhost/${db.name}?characterEncoding=utf8&zeroDateTimeBehaviour=convertToNull&autoReconnect=true&useUnicode=true jboss.deploy=${instdir}/jboss-4.0.2/server/default/deploy/lams.ear/ deploy.tool.dir=../tools/ toolContext=/lams/tool/${signature} Index: unix_installer/upgrader-package/ant-scripts/update-core-database.xml =================================================================== RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/ant-scripts/update-core-database.xml,v diff -u -r1.3 -r1.4 --- unix_installer/upgrader-package/ant-scripts/update-core-database.xml 5 May 2008 06:04:03 -0000 1.3 +++ unix_installer/upgrader-package/ant-scripts/update-core-database.xml 13 Jun 2008 07:11:08 -0000 1.4 @@ -12,12 +12,26 @@ userid="${DB_USER}" password="${DB_PASS}" encoding="utf8" - onerror="continue" + onerror="abort" > - + + + + + The below script will fail if the database tables are already INNODB, this will not affect the update. + + + Index: unix_installer/upgrader-package/ant-scripts/update-deploy-tools.xml =================================================================== RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/ant-scripts/update-deploy-tools.xml,v diff -u -r1.3 -r1.4 --- unix_installer/upgrader-package/ant-scripts/update-deploy-tools.xml 5 May 2008 06:04:05 -0000 1.3 +++ unix_installer/upgrader-package/ant-scripts/update-deploy-tools.xml 13 Jun 2008 07:11:08 -0000 1.4 @@ -14,12 +14,33 @@ + +------------------------------------------+ - | Generate the deployment package. | - +------------------------------------------+ - Generating deploy.xml for ${signature} - ../tools/${prop.path}/build.properties + | Generate the deployment package. | + +------------------------------------------+ + Copying deploy.xml for ${signature} + + + + + + + + + + + + + + + + + + + + Deploy packaqe for ${signature} created. + + @@ -65,7 +86,7 @@ Deploy packaqe for ${signature} created. - + --> Index: unix_installer/upgrader-package/ant-scripts/update-lams.xml =================================================================== RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/ant-scripts/update-lams.xml,v diff -u -r1.6 -r1.7 --- unix_installer/upgrader-package/ant-scripts/update-lams.xml 5 May 2008 06:04:03 -0000 1.6 +++ unix_installer/upgrader-package/ant-scripts/update-lams.xml 13 Jun 2008 07:11:07 -0000 1.7 @@ -27,12 +27,15 @@ - + + + + - + --> + @@ -150,7 +153,8 @@ - + + @@ -212,6 +216,10 @@ + + + + @@ -256,6 +264,10 @@ + + + + @@ -302,6 +314,10 @@ + + + + @@ -318,6 +334,20 @@ + + + + + + + + + + + + + + Index: unix_installer/upgrader-package/conf/mysql-ds.xml =================================================================== RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/conf/Attic/mysql-ds.xml,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ unix_installer/upgrader-package/conf/mysql-ds.xml 13 Jun 2008 07:11:37 -0000 1.1 @@ -0,0 +1,65 @@ + + + + + + + + + jdbc/lams-ds + jdbc:mysql://@MYSQL_HOST@:@MYSQL_PORT@/@DB_NAME@ + com.mysql.jdbc.Driver + + + utf8 + convertToNull + + TRANSACTION_READ_COMMITTED + @DB_USER@ + @DB_PASS@ + + 64 + 0 + + 5 + + + + + jdbc/tool-ds + jdbc:mysql://@MYSQL_HOST@:@MYSQL_PORT@/@DB_NAME@ + com.mysql.jdbc.Driver + + + utf8 + convertToNull + + TRANSACTION_READ_COMMITTED + @DB_USER@ + @DB_PASS@ + + 64 + 0 + + 5 + + + + + jdbc/quartz-ds + jdbc:mysql://@MYSQL_HOST@:@MYSQL_PORT@/@DB_NAME@ + com.mysql.jdbc.Driver + utf8 + + TRANSACTION_READ_COMMITTED + @DB_USER@ + @DB_PASS@ + + 64 + 0 + + 5 + + Index: unix_installer/upgrader-package/java/backup.java =================================================================== RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/java/backup.java,v diff -u -r1.1 -r1.2 --- unix_installer/upgrader-package/java/backup.java 5 May 2008 06:04:17 -0000 1.1 +++ unix_installer/upgrader-package/java/backup.java 13 Jun 2008 07:11:37 -0000 1.2 @@ -196,7 +196,7 @@ { FileWriter outfile = new FileWriter("bin/lamsdump.sql"); - outfile.write(mysqldir+ "/mysqldump -u" +dbuser+ " -p" +dbpass+ " " +dbname+ " > " +backupdir+ "/lams.dump"); + outfile.write(mysqldir+ "/mysqldump -u" +dbuser+ " -p" +dbpass+ " " +dbname+ " > " +backupdir+ "/dump.sql"); outfile.close(); } catch (Exception e) Index: unix_installer/upgrader-package/sql-scripts/alter_21_engine.sql =================================================================== RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/sql-scripts/Attic/alter_21_engine.sql,v diff -u -r1.1 -r1.2 --- unix_installer/upgrader-package/sql-scripts/alter_21_engine.sql 5 May 2008 06:04:03 -0000 1.1 +++ unix_installer/upgrader-package/sql-scripts/alter_21_engine.sql 13 Jun 2008 07:11:37 -0000 1.2 @@ -1,6 +1,8 @@ -- LDEV-1511 +SET foreign_key_checks=0; + +-- LAMS Core Tables -- ALTER TABLE lams_configuration ENGINE=InnoDB; -ALTER TABLE lams_notebook_entry ENGINE=InnoDB; ALTER TABLE lams_qtz_BLOB_TRIGGERS ENGINE=InnoDB; ALTER TABLE lams_qtz_CALENDARS ENGINE=InnoDB; ALTER TABLE lams_qtz_CRON_TRIGGERS ENGINE=InnoDB; @@ -13,3 +15,94 @@ ALTER TABLE lams_qtz_SIMPLE_TRIGGERS ENGINE=InnoDB; ALTER TABLE lams_qtz_TRIGGERS ENGINE=InnoDB; ALTER TABLE lams_qtz_TRIGGER_LISTENERS ENGINE=InnoDB; + +ALTER TABLE lams_qtz_JOB_LISTENERS ADD FOREIGN KEY (JOB_NAME,JOB_GROUP) REFERENCES lams_qtz_JOB_DETAILS (JOB_NAME,JOB_GROUP); +ALTER TABLE lams_qtz_TRIGGERS ADD FOREIGN KEY (JOB_NAME,JOB_GROUP) REFERENCES lams_qtz_JOB_DETAILS (JOB_NAME,JOB_GROUP); +ALTER TABLE lams_qtz_SIMPLE_TRIGGERS ADD FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) REFERENCES lams_qtz_TRIGGERS (TRIGGER_NAME,TRIGGER_GROUP); +ALTER TABLE lams_qtz_CRON_TRIGGERS ADD FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) REFERENCES lams_qtz_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP); +ALTER TABLE lams_qtz_BLOB_TRIGGERS ADD FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) REFERENCES lams_qtz_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP); +ALTER TABLE lams_qtz_TRIGGER_LISTENERS ADD FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) REFERENCES lams_qtz_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP); + +-- Notebook -- +ALTER TABLE lams_notebook_entry ENGINE=InnoDB; +ALTER TABLE tl_lantbk11_attachment ENGINE=InnoDB; +ALTER TABLE tl_lantbk11_notebook ENGINE=InnoDB; +ALTER TABLE tl_lantbk11_session ENGINE=InnoDB; +ALTER TABLE tl_lantbk11_user ENGINE=InnoDB; + +ALTER TABLE tl_lantbk11_attachment ADD CONSTRAINT FK12090F57FC940906 FOREIGN KEY (notebook_uid) REFERENCES tl_lantbk11_notebook (uid); +ALTER TABLE tl_lantbk11_session ADD CONSTRAINT FKB7C198E2FC940906 FOREIGN KEY (notebook_uid) REFERENCES tl_lantbk11_notebook (uid); +ALTER TABLE tl_lantbk11_user ADD CONSTRAINT FKCB8A58FFA3B0FADF FOREIGN KEY (notebook_session_uid) REFERENCES tl_lantbk11_session (uid); + +-- Chat -- +ALTER TABLE tl_lachat11_attachment ENGINE=InnoDB; +ALTER TABLE tl_lachat11_chat ENGINE=InnoDB; +ALTER TABLE tl_lachat11_message ENGINE=InnoDB; +ALTER TABLE tl_lachat11_session ENGINE=InnoDB; +ALTER TABLE tl_lachat11_user ENGINE=InnoDB; + +alter table tl_lachat11_attachment add constraint FK9ED6CB2E1A3926E3 foreign key (chat_uid) references tl_lachat11_chat (uid); +alter table tl_lachat11_message add constraint FKCC08C1DC2AF61E05 foreign key (to_user_uid) references tl_lachat11_user (uid); +alter table tl_lachat11_message add constraint FKCC08C1DC9C8469FC foreign key (chat_session_uid) references tl_lachat11_session (uid); +alter table tl_lachat11_message add constraint FKCC08C1DCCF3BF9B6 foreign key (from_user_uid) references tl_lachat11_user (uid); +alter table tl_lachat11_session add constraint FK96E446B1A3926E3 foreign key (chat_uid) references tl_lachat11_chat (uid); +alter table tl_lachat11_user add constraint FK4EB82169C8469FC foreign key (chat_session_uid) references tl_lachat11_session (uid); + +-- Resources -- +ALTER TABLE tl_larsrc11_attachment ENGINE=InnoDB; +ALTER TABLE tl_larsrc11_item_instruction ENGINE=InnoDB; +ALTER TABLE tl_larsrc11_item_log ENGINE=InnoDB; +ALTER TABLE tl_larsrc11_resource ENGINE=InnoDB; +ALTER TABLE tl_larsrc11_resource_item ENGINE=InnoDB; +ALTER TABLE tl_larsrc11_session ENGINE=InnoDB; +ALTER TABLE tl_larsrc11_user ENGINE=InnoDB; + +alter table tl_larsrc11_attachment add constraint FK1E7009430E79035 foreign key (resource_uid) references tl_larsrc11_resource (uid); +alter table tl_larsrc11_item_instruction add constraint FKA5665013980570ED foreign key (item_uid) references tl_larsrc11_resource_item (uid); +alter table tl_larsrc11_resource add constraint FK89093BF758092FB foreign key (create_by) references tl_larsrc11_user (uid); +alter table tl_larsrc11_resource_item add constraint FKF52D1F93758092FB foreign key (create_by) references tl_larsrc11_user (uid); +alter table tl_larsrc11_resource_item add constraint FKF52D1F9330E79035 foreign key (resource_uid) references tl_larsrc11_resource (uid); +alter table tl_larsrc11_resource_item add constraint FKF52D1F93EC0D3147 foreign key (session_uid) references tl_larsrc11_session (uid); +alter table tl_larsrc11_item_log add constraint FK693580A438BF8DFE foreign key (resource_item_uid) references tl_larsrc11_resource_item (uid); +alter table tl_larsrc11_item_log add constraint FK693580A441F9365D foreign key (user_uid) references tl_larsrc11_user (uid); +alter table tl_larsrc11_session add constraint FK24AA78C530E79035 foreign key (resource_uid) references tl_larsrc11_resource (uid); +alter table tl_larsrc11_user add constraint FK30113BFCEC0D3147 foreign key (session_uid) references tl_larsrc11_session (uid); +alter table tl_larsrc11_user add constraint FK30113BFC309ED320 foreign key (resource_uid) references tl_larsrc11_resource (uid); + +-- Scribe -- +ALTER TABLE tl_lascrb11_attachment ENGINE=InnoDB; +ALTER TABLE tl_lascrb11_heading ENGINE=InnoDB; +ALTER TABLE tl_lascrb11_report_entry ENGINE=InnoDB; +ALTER TABLE tl_lascrb11_scribe ENGINE=InnoDB; +ALTER TABLE tl_lascrb11_session ENGINE=InnoDB; +ALTER TABLE tl_lascrb11_user ENGINE=InnoDB; + +alter table tl_lascrb11_attachment add constraint FK57953706B3FA1495 foreign key (scribe_uid) references tl_lascrb11_scribe (uid); +alter table tl_lascrb11_heading add constraint FK428A22FFB3FA1495 foreign key (scribe_uid) references tl_lascrb11_scribe (uid); +alter table tl_lascrb11_report_entry add constraint FK5439FACAEA50D086 foreign key (scribe_heading_uid) references tl_lascrb11_heading (uid); +alter table tl_lascrb11_report_entry add constraint FK5439FACA1C266FAE foreign key (scribe_session_uid) references tl_lascrb11_session (uid); +alter table tl_lascrb11_session add constraint FK89732793B3FA1495 foreign key (scribe_uid) references tl_lascrb11_scribe (uid); +alter table tl_lascrb11_session add constraint FK89732793E46919FF foreign key (appointed_scribe_uid) references tl_lascrb11_user (uid); +alter table tl_lascrb11_user add constraint FK187DAFEE1C266FAE foreign key (scribe_session_uid) references tl_lascrb11_session (uid); + +-- Survey -- +ALTER TABLE tl_lasurv11_answer ENGINE=InnoDB; +ALTER TABLE tl_lasurv11_attachment ENGINE=InnoDB; +ALTER TABLE tl_lasurv11_option ENGINE=InnoDB; +ALTER TABLE tl_lasurv11_question ENGINE=InnoDB; +ALTER TABLE tl_lasurv11_session ENGINE=InnoDB; +ALTER TABLE tl_lasurv11_survey ENGINE=InnoDB; +ALTER TABLE tl_lasurv11_user ENGINE=InnoDB; + +alter table tl_lasurv11_answer add constraint FK6DAAFE3BB1423DC1 foreign key (user_uid) references tl_lasurv11_user (uid); +alter table tl_lasurv11_answer add constraint FK6DAAFE3B25F3BB77 foreign key (question_uid) references tl_lasurv11_question (uid); +alter table tl_lasurv11_attachment add constraint FKD92A9120D14146E5 foreign key (survey_uid) references tl_lasurv11_survey (uid); +alter table tl_lasurv11_option add constraint FK85AB46F26966134F foreign key (question_uid) references tl_lasurv11_question (uid); +alter table tl_lasurv11_question add constraint FK872D4F23D14146E5 foreign key (survey_uid) references tl_lasurv11_survey (uid); +alter table tl_lasurv11_question add constraint FK872D4F23E4C99A5F foreign key (create_by) references tl_lasurv11_user (uid); +alter table tl_lasurv11_session add constraint FKF08793B9D14146E5 foreign key (survey_uid) references tl_lasurv11_survey (uid); +alter table tl_lasurv11_survey add constraint FK8CC465D7E4C99A5F foreign key (create_by) references tl_lasurv11_user (uid); +alter table tl_lasurv11_user add constraint FK633F25884F803F63 foreign key (session_uid) references tl_lasurv11_session (uid); +alter table tl_lasurv11_user add constraint FK633F2588D14146E5 foreign key (survey_uid) references tl_lasurv11_survey (uid); + +SET foreign_key_checks=1; \ No newline at end of file Index: unix_installer/upgrader-package/sql-scripts/alter_21_groupings_fckeditor.sql =================================================================== RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/sql-scripts/Attic/alter_21_groupings_fckeditor.sql,v diff -u -r1.1 -r1.2 --- unix_installer/upgrader-package/sql-scripts/alter_21_groupings_fckeditor.sql 5 May 2008 06:04:03 -0000 1.1 +++ unix_installer/upgrader-package/sql-scripts/alter_21_groupings_fckeditor.sql 13 Jun 2008 07:11:37 -0000 1.2 @@ -8,7 +8,6 @@ alter table lams_supported_locale ADD COLUMN fckeditor_code VARCHAR(10); - UPDATE lams_supported_locale SET fckeditor_code='en-au' WHERE language_iso_code='en' AND country_iso_code='AU'; UPDATE lams_supported_locale SET fckeditor_code='es' WHERE language_iso_code='es' AND country_iso_code='ES'; UPDATE lams_supported_locale SET fckeditor_code='en-au' WHERE language_iso_code='mi' AND country_iso_code='NZ'; Index: unix_installer/upgrader-package/sql-scripts/updateLocales.sql =================================================================== RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/sql-scripts/updateLocales.sql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ unix_installer/upgrader-package/sql-scripts/updateLocales.sql 13 Jun 2008 07:11:37 -0000 1.1 @@ -0,0 +1,27 @@ +-- Fixing Japanese language string. See LDEV-1702 +-- checks if the languages in the language pack exist +-- inserts rows into lams_supported_locale iff the languages dont exist +drop table if exists locale_temp; + +create table locale_temp ( + language_iso_code VARCHAR(2) NOT NULL + , country_iso_code VARCHAR(2) + , description VARCHAR(255) NOT NULL + , direction VARCHAR(3) NOT NULL + , combined VARCHAR(5) NOT NULL + , fckeditor_code VARCHAR(10) +)TYPE=InnoDB; + +-- the combined column must be 'language_iso_code,country_iso_code' or 'language_iso_code'. It must match the value +-- given by SELECT CONCAT_WS(',',l.language_iso_code,l.country_iso_code) FROM lams_supported_locale l +INSERT INTO locale_temp (language_iso_code, country_iso_code, description, direction, combined, fckeditor_code) VALUES ('ja','JP','日本語','LTR','ja,JP', 'ja'); + +INSERT INTO lams_supported_locale (language_iso_code, country_iso_code, description, direction, fckeditor_code) +(SELECT t.language_iso_code, t.country_iso_code, t.description, t.direction, t.fckeditor_code +FROM locale_temp t WHERE t.combined NOT IN +(SELECT CONCAT_WS(',',l.language_iso_code,l.country_iso_code) FROM lams_supported_locale l)); +drop table if exists locale_temp; + +-- Fixing Japanese language string. See LDEV-1702 +-- description description may be set to "Japanese (Japan)" +UPDATE lams_supported_locale SET description='日本語' WHERE language_iso_code='ja' AND country_iso_code='JP'; \ No newline at end of file