Author: bpapez
Date: Fri Jun 15 14:33:31 2007
New Revision: 17577
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17577&repname=
=3Djahia
Log:
[no jira] remove unneeded db_support_embedded_select_statement option
Modified:
trunk/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java
trunk/core/src/java/org/jahia/settings/SettingsBean.java
trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton
trunk/core/src/webapp/jsp/jahia/configuration_wizard/adv_settings.jsp
trunk/core/src/webapp/jsp/jahia/configuration_wizard/header.inc
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=3D17577&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 Fri Jun=
15 14:33:31 2007
@@ -959,7 +959,6 @@
values.put("database_url", request.getParameter("dburl").trim());
values.put("database_user", request.getParameter("user").trim());
values.put("database_pwd", request.getParameter("pwd").trim());
- values.put("database_support_embedded_select_statement", request.=
getParameter("database_support_embedded_select_statement").trim());
values.put("db_starthsqlserver", request.getParameter("starthsqls=
erver").trim());
values.put("datasource.name", request.getParameter("datasource").=
trim());
values.put("hibernate_dialect", request.getParameter("hibernate_d=
ialect").trim());
@@ -1802,7 +1801,6 @@
properties.setProperty("db_username", (String) values.get("databas=
e_user"));
properties.setProperty("db_password", (String) values.get("databas=
e_pwd"));
properties.setProperty("db_transactions", (String) values.get("dat=
abase_transactions"));
- properties.setProperty("db_support_embedded_select_statement", (St=
ring) values.get("database_support_embedded_select_statement"));
properties.setProperty("db_starthsqlserver", (String) values.get("=
db_starthsqlserver"));
properties.setProperty("datasource.name", (String) values.get("dat=
asource.name"));
String utf8Encoding =3D (String) values.get("utf8Encoding");
@@ -1890,7 +1888,6 @@
values.put("database_user", properties.getProperty("db_usernam=
e").trim());
values.put("database_pwd", properties.getProperty("db_password=
").trim());
values.put("database_transactions", properties.getProperty("db=
_transactions").trim());
- values.put("database_support_embedded_select_statement", prope=
rties.getProperty("db_support_embedded_select_statement").trim());
values.put("utf8Encoding", properties.getProperty("utf8Encodin=
g").trim());
values.put("database_custom", Boolean.FALSE);
values.put("database_requested", Boolean.FALSE);
@@ -1910,7 +1907,6 @@
values.put("database_user", ((String) curDatabaseH=
ash.get("jahia.database.user")).trim());
values.put("database_pwd", ((String) curDatabaseHa=
sh.get("jahia.database.pass")).trim());
values.put("database_transactions", ((String) curD=
atabaseHash.get("jahia.database.transactions")).trim());
- values.put("database_support_embedded_select_state=
ment", ((String) curDatabaseHash.get("jahia.database.support_embedded_selec=
t_statement")).trim());
copyStringSetting(curDatabaseHash, "jahia.database=
.datasource", values, "datasource.name", "");
copyStringSetting(curDatabaseHash, "jahia.database=
.starthsqlserver", values, "db_starthsqlserver", "false");
copyStringSetting(curDatabaseHash, "jahia.database=
.hibernate.dialect", values, "hibernate_dialect", "");
Modified: trunk/core/src/java/org/jahia/settings/SettingsBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/settings/SettingsBean.java&rev=3D17577&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/settings/SettingsBean.java (original)
+++ trunk/core/src/java/org/jahia/settings/SettingsBean.java Fri Jun 15 14:=
33:31 2007
@@ -126,7 +126,6 @@
private boolean db_waitIfBusy;
private boolean db_verbose;
private boolean db_veryVerbose;
- private boolean db_support_embedded_select_statement;
=
// Characters encoding
private boolean utf8Encoding;
@@ -524,7 +523,6 @@
db_waitIfBusy =3D getBoolean ("db_waitIfBusy");
db_verbose =3D getBoolean ("db_verbose");
db_veryVerbose =3D getBoolean("db_veryVerbose", false);
- db_support_embedded_select_statement =3D getBoolean("db_suppor=
t_embedded_select_statement", false);
=
// chars encoding
utf8Encoding =3D getBoolean("utf8Encoding");
@@ -1641,11 +1639,6 @@
public boolean isDb_waitIfBusy() {
return db_waitIfBusy;
}
-
- public boolean isDb_support_embedded_select_statement() {
- return db_support_embedded_select_statement;
- }
-
public String getClassDiskPath() {
return classDiskPath;
}
Modified: trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/etc/config/jahia.skeleton&rev=3D17577&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/etc/config/jahia.skeleton (original)
+++ trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton Fri Jun 15 14:3=
3:31 2007
@@ -122,7 +122,6 @@
db_username =3D sa
db_password =3D
db_transactions =3D false
-db_support_embedded_select_statement =3D true
db_starthsqlserver =3D true
db_min_connections =3D 10
db_max_connections =3D 50
Modified: trunk/core/src/webapp/jsp/jahia/configuration_wizard/adv_settings=
.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/configuration_wizard/adv_settings.jsp&rev=3D17577&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/jsp/jahia/configuration_wizard/adv_settings.jsp (=
original)
+++ trunk/core/src/webapp/jsp/jahia/configuration_wizard/adv_settings.jsp F=
ri Jun 15 14:33:31 2007
@@ -85,8 +85,6 @@
</td>
</tr>
</table>
- <input type=3D"hidden" name=3D"database_support_embedded_select_statem=
ent"
- value=3D'<%=3Dvalues.get("database_support_embedded_select_stat=
ement")%>' />
<input type=3D"hidden" name=3D"starthsqlserver" value=3D'<%=3Dvalues.g=
et("db_starthsqlserver")%>' />
<input type=3D"hidden" name=3D"datasource" value=3D'<%=3Dvalues.get("d=
atasource.name")%>' />
<input type=3D"hidden" name=3D"hibernate_dialect" value=3D'<%=3Dvalues=
.get("hibernate_dialect")%>' />
Modified: trunk/core/src/webapp/jsp/jahia/configuration_wizard/header.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/configuration_wizard/header.inc&rev=3D17577&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/jsp/jahia/configuration_wizard/header.inc (origin=
al)
+++ trunk/core/src/webapp/jsp/jahia/configuration_wizard/header.inc Fri Jun=
15 14:33:31 2007
@@ -87,7 +87,6 @@
document.mainForm.dburl.value =3D '<%=3DJahiaTools.replace=
Pattern((String)js.get("jahia.database.url"), "\\", "\\\\")%>';
document.mainForm.user.value =3D '<%=3Djs.get("jahia.datab=
ase.user")%>';
document.mainForm.pwd.value =3D '<%=3Djs.get("jahia.databa=
se.pass")%>';
- document.mainForm.database_support_embedded_select_stateme=
nt.value =3D '<%=3Djs.get("jahia.database.support_embedded_select_statement=
")%>';
document.mainForm.starthsqlserver.value =3D '<%=3Djs.get("=
jahia.database.starthsqlserver")%>';
document.mainForm.datasource.value =3D '<%=3Djs.get("jahia=
.database.datasource")%>';
document.mainForm.hibernate_dialect.value =3D '<%=3Djs.get=
("jahia.database.hibernate.dialect")%>';
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
