Index: unix_installer/upgrader-package/ant-scripts/tools.properties =================================================================== diff -u -r0965ee8a6bd49be2d53cad08225f707b32a61674 -rdfde3b7525955235b664ca801fdece4fb418b532 --- unix_installer/upgrader-package/ant-scripts/tools.properties (.../tools.properties) (revision 0965ee8a6bd49be2d53cad08225f707b32a61674) +++ unix_installer/upgrader-package/ant-scripts/tools.properties (.../tools.properties) (revision dfde3b7525955235b664ca801fdece4fb418b532) @@ -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 =================================================================== diff -u -r80349002d46efb898c06fc8835c074d6418be97e -rdfde3b7525955235b664ca801fdece4fb418b532 --- unix_installer/upgrader-package/ant-scripts/update-core-database.xml (.../update-core-database.xml) (revision 80349002d46efb898c06fc8835c074d6418be97e) +++ unix_installer/upgrader-package/ant-scripts/update-core-database.xml (.../update-core-database.xml) (revision dfde3b7525955235b664ca801fdece4fb418b532) @@ -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 =================================================================== diff -u -r80349002d46efb898c06fc8835c074d6418be97e -rdfde3b7525955235b664ca801fdece4fb418b532 --- unix_installer/upgrader-package/ant-scripts/update-deploy-tools.xml (.../update-deploy-tools.xml) (revision 80349002d46efb898c06fc8835c074d6418be97e) +++ unix_installer/upgrader-package/ant-scripts/update-deploy-tools.xml (.../update-deploy-tools.xml) (revision dfde3b7525955235b664ca801fdece4fb418b532) @@ -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 =================================================================== diff -u -r80349002d46efb898c06fc8835c074d6418be97e -rdfde3b7525955235b664ca801fdece4fb418b532 --- unix_installer/upgrader-package/ant-scripts/update-lams.xml (.../update-lams.xml) (revision 80349002d46efb898c06fc8835c074d6418be97e) +++ unix_installer/upgrader-package/ant-scripts/update-lams.xml (.../update-lams.xml) (revision dfde3b7525955235b664ca801fdece4fb418b532) @@ -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/build.xml =================================================================== diff -u -r80349002d46efb898c06fc8835c074d6418be97e -rdfde3b7525955235b664ca801fdece4fb418b532 --- unix_installer/upgrader-package/build.xml (.../build.xml) (revision 80349002d46efb898c06fc8835c074d6418be97e) +++ unix_installer/upgrader-package/build.xml (.../build.xml) (revision dfde3b7525955235b664ca801fdece4fb418b532) @@ -16,7 +16,7 @@ + output="${basedir}/database/dump.sql" failonerror="true"> @@ -113,6 +113,17 @@ + + + + + + + + + + + Index: unix_installer/upgrader-package/conf/mysql-ds.xml =================================================================== diff -u --- unix_installer/upgrader-package/conf/mysql-ds.xml (revision 0) +++ unix_installer/upgrader-package/conf/mysql-ds.xml (revision dfde3b7525955235b664ca801fdece4fb418b532) @@ -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/createPackage.sh =================================================================== diff -u -r80349002d46efb898c06fc8835c074d6418be97e -rdfde3b7525955235b664ca801fdece4fb418b532 --- unix_installer/upgrader-package/createPackage.sh (.../createPackage.sh) (revision 80349002d46efb898c06fc8835c074d6418be97e) +++ unix_installer/upgrader-package/createPackage.sh (.../createPackage.sh) (revision dfde3b7525955235b664ca801fdece4fb418b532) @@ -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/java/backup.java =================================================================== diff -u -r80349002d46efb898c06fc8835c074d6418be97e -rdfde3b7525955235b664ca801fdece4fb418b532 --- unix_installer/upgrader-package/java/backup.java (.../backup.java) (revision 80349002d46efb898c06fc8835c074d6418be97e) +++ unix_installer/upgrader-package/java/backup.java (.../backup.java) (revision dfde3b7525955235b664ca801fdece4fb418b532) @@ -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/lams.properties =================================================================== diff -u -r80349002d46efb898c06fc8835c074d6418be97e -rdfde3b7525955235b664ca801fdece4fb418b532 --- unix_installer/upgrader-package/lams.properties (.../lams.properties) (revision 80349002d46efb898c06fc8835c074d6418be97e) +++ unix_installer/upgrader-package/lams.properties (.../lams.properties) (revision dfde3b7525955235b664ca801fdece4fb418b532) @@ -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 =================================================================== diff -u -r39a8f5888da9f2827b9fc61bbbc02194dc4704e2 -rdfde3b7525955235b664ca801fdece4fb418b532 --- unix_installer/upgrader-package/readme (.../readme) (revision 39a8f5888da9f2827b9fc61bbbc02194dc4704e2) +++ unix_installer/upgrader-package/readme (.../readme) (revision dfde3b7525955235b664ca801fdece4fb418b532) @@ -3,8 +3,8 @@ This is an upgrader package for LAMS 2.0.4 to LAMS 2.1. Please read this document carefully before upgrading and make sure that you have a valid -installation of LAMS 2.0.4 on your machine. Please also ensure that you have read -and understood the terms of the license agreement. +installation of LAMS 2.0.4 on your machine. Please also ensure that you have +read and understood the terms of the license agreement. CONTENTS ======== @@ -21,10 +21,10 @@ 1. Required Software ==================== -You will require some software to be installed and/or running for LAMS 2.0 to +You will require some software to be installed and/or running for LAMS 2.1 to install and run properly. These are listed below -LAMS 2.0 +LAMS 2.0.4 JDK 1.5 or 1.6 JBOSS-4.0.2 (Must be 4.0.2, newer and older versions have problems running LAMS) MySql 5.0.x (Running) @@ -69,16 +69,21 @@ you backup LAMS before the upgrade, the upgrade script gives you this option, or you are also free to do so yourself. +NOTE: If you are installing an production server, It is strongly recommended that +you remove the jmx-console web applications as they can be a security risk. To do +so, remove the jboss-4.0.2/server/default/management directory and the +jboss-4.0.2/server/default/jmx-console.war diectory. + 3. Languages and Locales ======================== -In LAMS 2.0 you can set the defualt language of your server to be one of many +In LAMS 2.1 you can set the defualt language of your server to be one of many languages, and more to come, see http://lamscommunity.org Look out for unix language packs to add to your list of language locales -The locale options for LAMS-2.0 available are listed below, simply put in +The locale options for LAMS 2.1 available are listed below, simply put in your lams.properties file (under Installation Options): LOCALE - (locale) @@ -125,17 +130,17 @@ 5. Startup and Shutdown ======================= -To start LAMS 2.0 go to (jboss directory)/bin and type: +To start LAMS 2.1 go to (jboss directory)/bin and type: >sudo ./run-lams.sh -After a couple of minutes LAMS 2.0 will have started. In your browser type the +After a couple of minutes LAMS 2.1 will have started. In your browser type the server URL that you specified in the lams.configuration file, and you should be at the lams homepage. -To shutdown LAMS 2.0 go to (jboss directory)/bin and type; +To shutdown LAMS 2.1 go to (jboss directory)/bin and type; > sudo ./shutdown.sh -S -LAMS 2.0 will take a few moments to shut down. To check if LAMS 2.0 has shut +LAMS 2.1 will take a few moments to shut down. To check if LAMS 2.1 has shut down correctly, type the following on Linux: > ps -ef | grep java @@ -146,9 +151,9 @@ that gives and error 'ps: illegal option --f" then try the -A version. -If you can see the LAMS 2.0 process still running, type: +If you can see the LAMS 2.1 process still running, type: > sudo kill (pid) -Where pid is the process id listed next to the LAMS 2.0 process +Where pid is the process id listed next to the LAMS 2.1 process Be careful to type the correct (pid). If you type the wrong number, you will stop another process on your server, and as you are using sudo you could stop @@ -170,7 +175,7 @@ 4) Dump the database by executing the following command. Fill in your own backup directory -/mysqldump -u -p > /lams.dump +/mysqldump -u -p > /dump.sql 7. Web Resources @@ -180,19 +185,19 @@ http://wiki.lamsfoundation.org/display/lamsdocs/Unix+Installer+Help -LAMS 2.0 developer-oriented information +LAMS 2.1 developer-oriented information http://wiki.lamsfoundation.org/display/lams -LAMS 2.0 help documents +LAMS 2.1 help documents http://wiki.lamsfoundation.org/display/lamsdocs Educational and technical forums for help and discussion http://www.lamscommunity.org -LAMS 2.0 bug tracker +LAMS 2.1 bug tracker https://bugs.lamsfoundation.org Index: unix_installer/upgrader-package/sql-scripts/alter_21_engine.sql =================================================================== diff -u -r80349002d46efb898c06fc8835c074d6418be97e -rdfde3b7525955235b664ca801fdece4fb418b532 --- unix_installer/upgrader-package/sql-scripts/alter_21_engine.sql (.../alter_21_engine.sql) (revision 80349002d46efb898c06fc8835c074d6418be97e) +++ unix_installer/upgrader-package/sql-scripts/alter_21_engine.sql (.../alter_21_engine.sql) (revision dfde3b7525955235b664ca801fdece4fb418b532) @@ -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 =================================================================== diff -u -r80349002d46efb898c06fc8835c074d6418be97e -rdfde3b7525955235b664ca801fdece4fb418b532 --- unix_installer/upgrader-package/sql-scripts/alter_21_groupings_fckeditor.sql (.../alter_21_groupings_fckeditor.sql) (revision 80349002d46efb898c06fc8835c074d6418be97e) +++ unix_installer/upgrader-package/sql-scripts/alter_21_groupings_fckeditor.sql (.../alter_21_groupings_fckeditor.sql) (revision dfde3b7525955235b664ca801fdece4fb418b532) @@ -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 =================================================================== diff -u --- unix_installer/upgrader-package/sql-scripts/updateLocales.sql (revision 0) +++ unix_installer/upgrader-package/sql-scripts/updateLocales.sql (revision dfde3b7525955235b664ca801fdece4fb418b532) @@ -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 Index: unix_installer/upgrader-package/update-lams.sh =================================================================== diff -u -r80349002d46efb898c06fc8835c074d6418be97e -rdfde3b7525955235b664ca801fdece4fb418b532 --- unix_installer/upgrader-package/update-lams.sh (.../update-lams.sh) (revision 80349002d46efb898c06fc8835c074d6418be97e) +++ unix_installer/upgrader-package/update-lams.sh (.../update-lams.sh) (revision dfde3b7525955235b664ca801fdece4fb418b532) @@ -25,8 +25,8 @@ # The version of this LAMS updater LAMS_VERSION=2.1 -LAMS_SERVER_VERSION=2.1.200804291000 -LAMS_LANGUAGE_VERSION=2008-04-29 +LAMS_SERVER_VERSION=2.1.0.200806131057 +LAMS_LANGUAGE_VERSION=2008-06-13 REQ_LAMS_VERSION=2.0.4 JAVA_REQ_VERSION=1.5 @@ -40,11 +40,11 @@ # Invoked when the install is failed installfailed() { - echo "" + echo "" cp lams.properties docs/lams.properties.backup.exec cp docs/lams.properties.backup.orig lams.properties export JAVA_HOME=$ORIG_JAVA_HOME - exit 1 + exit 1 } # Invoked when the install is exited @@ -78,6 +78,7 @@ echo "LAMS_VERSION=2.1" >> lams.properties echo "LAMS_SERVER_VERSION=2.1.200804291000" >> lams.properties echo "LAMS_LANGUAGE_VERSION=2008-04-29" >> lams.properties + echo "SQL_PORT=3306" >> lams.properties echo "" >> lams.properties ############## End 2.1 Specific Code ################## @@ -189,9 +190,9 @@ $JAVA_HOME/bin/java -cp .:bin/:assembly/lams.ear/mysql-connector-java-3.1.12-bin.jar checkmysql "$SQL_URL" "$DB_USER" "$DB_PASS" "$REQ_LAMS_VERSION" if [ "$?" -ne "0" ] - then - installfailed - fi + then + installfailed + fi } getMysqlHost() @@ -300,7 +301,7 @@ printf "2) Backup $LAMS_DIR\n" printf "3) Backup /etc/lams2\n" printf "4) Dump the database by executing the following command. Fill in your own backup \ndirectory.\n" - printf "> $sqldir/mysqldump -u$dbuser -p$dbpass $dbname > (backup dir)/lams.dump\n" + printf "> $sqldir/mysqldump -u$dbuser -p$dbpass $dbname > (backup dir)/dump.sql\n" installexit ;; y) @@ -309,15 +310,15 @@ $JDK_DIR/bin/java -cp bin backup if [ "$?" -ne "0" ] then - echo "Update failed, please check that LAMS 2.0 is installed and your lams.properties file is correct." + echo "Update failed, please check that LAMS $REQ_LAMS_VERSION is installed and your lams.properties file is correct." installfailed fi chmod 755 bin/lamsdump.sql bin/lamsdump.sql if [ "$?" -ne "0" ] then - echo "Update failed, please check that LAMS 2.0 is installed and your lams.properties file is correct." + echo "Update failed, please check that LAMS $REQ_LAMS_VERSION is installed and your lams.properties file is correct." installfailed fi @@ -350,7 +351,7 @@ printf "2) Backup $LAMS_DIR\n" printf "3) Backup /etc/lams2\n" printf "4) Dump the database by executing the following command. Fill in your own backup \ndirectory.\n" -printf "> $sqldir/mysqldump -u$dbuser -p$dbpass $dbname > (backup dir)/lams.dump\n" +printf "> $sqldir/mysqldump -u$dbuser -p$dbpass $dbname > (backup dir)/dump.sql\n" printf "\n--------------------------------------------------------------------------------\n\n" getMysqlHost