Permalink
Browse files

fixed mysql installation

  • Loading branch information...
1 parent 1142d0a commit 63f6ad659c17424947056800eafa5263a0f5feb7 @anti43 committed Feb 20, 2013
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,5 +1,6 @@
annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false
+annotation.processing.processors.list=
annotation.processing.run.all.processors=true
ant.customtasks.libs=JWSAntTasks
application.desc=Yet another business software
@@ -39,7 +40,6 @@ file.reference.derbyclient.jar=lib/derbyclient.jar
file.reference.derbynet.jar=lib/derbynet.jar
file.reference.DTAus.jar=lib/DTAus.jar
file.reference.frame4j.jar=lib/frame4j.jar
-file.reference.google-api-translate-java-0.92.jar=lib/google-api-translate-java-0.92.jar
file.reference.groovy-all-1.8.4.jar=lib/groovy-all-1.8.4.jar
file.reference.httpcore-4.0.1.jar=lib/httpcore-4.0.1.jar
file.reference.httpcore-nio-4.0.1.jar=lib/httpcore-nio-4.0.1.jar
@@ -56,8 +56,9 @@ file.reference.jut.jar=lib/ooo/jut.jar
file.reference.l2fprod-common-all.jar=lib/l2fprod-common-all.jar
file.reference.mail.jar=lib/mail.jar
file.reference.microba-0.4.4.2.jar=lib/microba-0.4.4.2.jar
+file.reference.microsoft-translator-java-api-0.6.1-jar-with-dependencies.jar=lib/microsoft-translator-java-api-0.6.1-jar-with-dependencies.jar
file.reference.MPCalendar.jar=lib/MPCalendar.jar
-file.reference.mysql-connector-java-5.1.14-bin.jar=lib/mysql-connector-java-5.1.14-bin.jar
+file.reference.mysql-connector-java-5.1.23-bin.jar=lib/mysql-connector-java-5.1.23-bin.jar
file.reference.nativeunix.zip=lib/ooo/nativeunix.zip
file.reference.noa-libre.jar=lib/noa-libre.jar
file.reference.officebean.jar=lib/ooo/officebean.jar
@@ -100,16 +101,16 @@ javac.classpath=\
${file.reference.microba-0.4.4.2.jar}:\
${file.reference.ybsaf.jar}:\
${file.reference.iText-2.1.7.jar}:\
- ${file.reference.mysql-connector-java-5.1.14-bin.jar}:\
${file.reference.ws-commons-util-1.0.2.jar}:\
+ ${file.reference.mysql-connector-java-5.1.23-bin.jar}:\
${file.reference.commons-logging-1.1.jar}:\
${file.reference.httpcore-4.0.1.jar}:\
${file.reference.httpcore-nio-4.0.1.jar}:\
${file.reference.commons-codec-1.3.jar}:\
${file.reference.vcard4j-1_1_3.jar}:\
${file.reference.derbyclient.jar}:\
- ${file.reference.google-api-translate-java-0.92.jar}:\
${file.reference.DTAus.jar}:\
+ ${file.reference.microsoft-translator-java-api-0.6.1-jar-with-dependencies.jar}:\
${file.reference.bcprov-jdk16-145.jar}:\
${file.reference.PDFRenderer.jar}:\
${file.reference.derbynet.jar}:\
@@ -178,7 +179,7 @@ jnlp.mixed.code=default
jnlp.offline-allowed=true
jnlp.signed=true
jnlp.signing=generated
-jnlp.signing.alias=
+jnlp.signing.alias=openyabs
jnlp.signing.keystore=
main.class=mpv5.Main
manifest.file=manifest.mf
@@ -111,7 +111,7 @@ public boolean connect(String predefinedDriver, String user, String password, St
DriverManager.registerDriver((Driver) Class.forName(getCtype().getDriver()).newInstance());
Log.Debug(this, "Driver: " + getCtype().getDriver());
} catch (Exception ex) {
- Log.Debug(this, ex.getMessage());
+ Log.Debug(this, ex);
}
return reconnect(create);
@@ -126,35 +126,35 @@ public boolean reconnect(boolean create) throws SQLException {
try {
Log.Debug(this, "RECONNECT::Datenbankverbindung: " + getCtype().getConnectionString(create));
conn = DriverManager.getConnection(getCtype().getConnectionString(create), user, password);
- conn.setAutoCommit(true);
+ boolean result = true;
if (conn != null //&& conn.isValid(10)//does not work with MySQL Connector/J 5.0
- ) {//mysql (and others) need explicit create database, derby does it by itself
+ ) {//mysql (and others) need explicit create database, derby does it by itself
+ conn.setAutoCommit(true);
if (create && ConnectionTypeHandler.getDriverType() != ConnectionTypeHandler.DERBY) {
stmt = conn.createStatement();
- conn.setCatalog(ConnectionTypeHandler.getDBNAME());
if (User.PROPERTIES_OVERRIDE.hasProperty("drop_database_on_create")) {
try {
sql = "DROP DATABASE "
- + ConnectionTypeHandler.getDBNAME()
- + ";";
+ + ConnectionTypeHandler.getDBNAME()
+ + ";";
stmt.execute(sql);
} catch (SQLException ex) {
- Log.Debug(this, "Database Error Cleaing of old DB failed!");
+ Log.Debug(this, "Database Error cleaning of old DB failed!");
}
}
try {
sql = "CREATE DATABASE "
- + ConnectionTypeHandler.getDBNAME()
- + " ;";
+ + ConnectionTypeHandler.getDBNAME()
+ + " ;";
stmt.execute(sql);
} catch (SQLException ex) {
- Popup.OK_dialog(Messages.CREATE_DATABASE_OWN.toString(), "Database Creation");
- return false;
+ Log.Debug(ex);
+ result = Popup.OK_dialog("Could not create database " + ConnectionTypeHandler.getDBNAME() + ", did you already create it?", "Database Creation");
}
-
}
+ conn.setCatalog(ConnectionTypeHandler.getDBNAME());
connector = this;
- return true;
+ return result;
} else {
throw new RuntimeException("Could not create connection: " + getCtype().getConnectionString(create));
}
@@ -209,7 +209,7 @@ public static void shutdown() {
if (ConnectionTypeHandler.getDriverType() == ConnectionTypeHandler.DERBY) {
try {
DriverManager.getConnection(
- DatabaseConnection.instanceOf().getCtype().getConnectionString(false) + "shutdown=true;", user, password);
+ DatabaseConnection.instanceOf().getCtype().getConnectionString(false) + "shutdown=true;", user, password);
} catch (Exception ex) {
Log.Debug(DatabaseConnection.class, ex.getLocalizedMessage());
}
@@ -262,7 +262,7 @@ public boolean runQueries(String[] queries) throws SQLException {
}
return true;
} catch (Exception sQLException) {
- Log.Debug(this, sQLException.getMessage());
+ Log.Debug(this, "-----------> "+sQLException.getMessage());
return false;
} finally {
if (prog != null) {
@@ -19,7 +19,6 @@ wizard_DBSettings_1.jPanel1.border.title=OpenOffice 3
wizard_DBSettings_1.jPanel2.border.title=Database
wizard_DBSettings_2.jPanel1.border.title=Finish
wizard_DBSettings_3.jLabel1.text=jLabel1
-wizard_DBSettings_1.jPanel3.border.title=Information
ContactsList.jPanel1.border.title=Contacts List
ContactsList.jCheckBox1.text=Customers
ContactsList.jLabel1.text=Show:
@@ -230,7 +229,6 @@ AddressPanel.jButton1.toolTipText=Remove
JournalPanel.jPanel1.border.title=Journal
ContactPanel.jButton2.text=History
wizard_DBSettings_1.labeledTextField3._Label=Database
-wizard_DBSettings_1.jCheckBox1.text=Use existing data (do upgrade)
ControlPanel_Accounts.classv._Label=Class
MPBabelFish.jMenuItem4.text=Open language file..
ControlPanel_Local.jPanel4.border.title=Database settings
@@ -1153,7 +1151,6 @@ wizard_DBSettings_simple_1.labeledTextField2._Label=Port
wizard_DBSettings_simple_1.border.title=Specify initial settings
wizard_DBSettings_simple_1.jPanel1.border.title=OpenOffice 3
wizard_DBSettings_simple_1.jTextArea1.text=This will install a local database into your home directory. \nIf you need to change the location or or want to use a dedicated database server please click on "Advanced".\n\nYou can configure the OpenOffice connection later within the YaBS control panel.
-wizard_DBSettings_1.jTextArea1.text=This will install a local database into your home directory. \nIf you need to change the location or or want to use a dedicated database server please click on "Advanced".\n\nYou can configure the OpenOffice connection later within the YaBS control panel.
wizard_DBSettings_simple_1.jPanel3.border.title=Information
wizard_DBSettings_simple_1.jButton1.text=Advanced..
ContactsList.jButton1.text=Customer
@@ -2059,3 +2056,4 @@ ControlPanel_Userproperties.noblank.text=Do not blank unused fields
ControlPanel_Userproperties.remoteurl.text=Load remote office docs by url
ControlPanel_Userproperties.resolv.text=Resolve full products in xtable
ControlPanel_Userproperties.nocount.text=Hide count for text items
+wizard_DBSettings_1.existingData.text=Use existing data (do upgrade)
Oops, something went wrong.

0 comments on commit 63f6ad6

Please sign in to comment.