shuber 2005/10/10 20:23:12 CEST
Modified files:
core maven.xml
core/src/java/org/jahia/bin JahiaConfigurationWizard.java
SpringHibernateConfigurator.java
core/src/webapp/WEB-INF/etc/spring
applicationcontext-hibernate.xml
core/src/webapp/WEB-INF/var/shared_templates
corporate_portal_templates.jar
core/src/webapp/jsp/jahia/css/images buttonShadow.gif
core/src/webapp/jsp/jahia/engines/css styles.css
Log:
- Update maven.xml reset:tomcat goal so that it also resets the Spring
configuration files that include markers
- Improve configuration wizard so that it works without Internet access
- Update button style.
Revision Changes Path
1.51 +2 -0 jahia/core/maven.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/maven.xml.diff?r1=1.50&r2=1.51&f=h
1.29 +5 -31
jahia/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java.diff?r1=1.28&r2=1.29&f=h
1.2 +15 -2
jahia/core/src/java/org/jahia/bin/SpringHibernateConfigurator.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/bin/SpringHibernateConfigurator.java.diff?r1=1.1&r2=1.2&f=h
1.8 +1 -1
jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-hibernate.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-hibernate.xml.diff?r1=1.7&r2=1.8&f=h
1.62 +1375 -1444
jahia/core/src/webapp/WEB-INF/var/shared_templates/corporate_portal_templates.jar
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/var/shared_templates/corporate_portal_templates.jar.diff?r1=1.61&r2=1.62&f=h
1.2 +4 -1
jahia/core/src/webapp/jsp/jahia/css/images/buttonShadow.gif
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/css/images/buttonShadow.gif.diff?r1=1.1&r2=1.2&f=h
1.11 +4 -2 jahia/core/src/webapp/jsp/jahia/engines/css/styles.css
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/css/styles.css.diff?r1=1.10&r2=1.11&f=h
Index: maven.xml
===================================================================
RCS file: /home/cvs/repository/jahia/core/maven.xml,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- maven.xml 22 Sep 2005 14:03:43 -0000 1.50
+++ maven.xml 10 Oct 2005 18:23:09 -0000 1.51
@@ -37,6 +37,8 @@
</j:choose>
<!-- Now let's reset all the files that contain markers that are
replaced during configuration wizard -->
<copy overwrite="true" file="${context_file}"
tofile="${context_dir}/jahia.xml"/>
+ <copy overwrite="true"
file="./src/webapp/WEB-INF/etc/spring/applicationcontext-manager.xml"
tofile="${deploy.war.dir}/${webapp.name}/WEB-INF/etc/spring/applicationcontext-manager.xml"/>
+ <copy overwrite="true"
file="./src/webapp/WEB-INF/etc/spring/applicationcontext-hibernate.xml"
tofile="${deploy.war.dir}/${webapp.name}/WEB-INF/etc/spring/applicationcontext-hibernate.xml"/>
<copy overwrite="true"
file="./src/webapp/WEB-INF/var/db/default.values"
tofile="${deploy.war.dir}/${webapp.name}/WEB-INF/var/db/default.values"/>
<copy overwrite="true"
file="./src/webapp/WEB-INF/var/db/default_corporate_portal_templates.values"
tofile="${deploy.war.dir}/${webapp.name}/WEB-INF/var/db/default_corporate_portal_templates.values"/>
<copy overwrite="true"
file="./src/webapp/WEB-INF/var/db/default_corporate_portal_templates_postgres.values"
tofile="${deploy.war.dir}/${webapp.name}/WEB-INF/var/db/default_corporate_portal_templates_postgres.values"/>
Index: JahiaConfigurationWizard.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- JahiaConfigurationWizard.java 7 Oct 2005 14:08:01 -0000 1.28
+++ JahiaConfigurationWizard.java 10 Oct 2005 18:23:09 -0000 1.29
@@ -1,4 +1,4 @@
-// $Id: JahiaConfigurationWizard.java,v 1.28 2005/10/07 14:08:01 shuber Exp $
+// $Id: JahiaConfigurationWizard.java,v 1.29 2005/10/10 18:23:09 shuber Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -69,6 +69,8 @@
import org.jahia.utils.*;
import org.jahia.utils.properties.PropertiesManager;
import org.jahia.utils.zip.JahiaArchiveFileHandler;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
@@ -505,6 +507,7 @@
if (request.getParameter("go").equals("back")) { // step back
requested...
displayTemplates(request, response);
+ return;
}
// by default, the user makes at least one error :o)
@@ -1314,7 +1317,6 @@
String pathToSpringServicesFile =
pathResolver.resolvePath("WEB-INF/etc/spring/applicationcontext-services.xml");
SpringServicesConfigurator.updateDataSourceConfiguration(pathToSpringServicesFile,pathToSpringServicesFile,
values);
- configureHibernateDialect(context, values);
// Copy slide files to default site
final ServletContext context = config.getServletContext();
final PathResolver pathResolver = new
WebAppPathResolver(context);
@@ -1388,7 +1390,7 @@
} catch (Exception e) {
- logger.debug("Exception", e);
+ logger.error("Exception", e);
msg = e.getMessage();
if (msg.length() == 0) {
msg = e.getClass().getName();
@@ -1397,34 +1399,6 @@
}
- private void configureHibernateDialect(final ServletContext context,
final HashMap values) {
- final String hibernateSpringFile =
context.getRealPath("/WEB-INF/etc/spring/applicationcontext-hibernate.xml");
-
- final SAXReader reader = new SAXReader();
- try {
- final Document document = reader.read(hibernateSpringFile);
-
- final Node node = document.selectSingleNode("//beans/[EMAIL
PROTECTED]'sessionFactory']/[EMAIL
PROTECTED]'hibernateProperties']/props/[EMAIL PROTECTED]'hibernate.dialect']");
-
- final String hibernateDialect = (String)
values.get("hibernate_dialect");
- if ((hibernateDialect != null) &&
(!"".equals(hibernateDialect))) {
- node.setText(hibernateDialect.trim());
- }
-
- // let's pretty print the modified document out to the same file
- final OutputFormat format = OutputFormat.createPrettyPrint();
- final XMLWriter writer = new XMLWriter(new
FileWriter(hibernateSpringFile), format);
- writer.write(document);
- writer.close();
-
- } catch (DocumentException e) {
- logger.error("Exception", e);
- } catch (IOException e) {
- logger.error("Exception", e);
- }
-
- }
-
/**
* This method display some errors during the save process.
*
Index: SpringHibernateConfigurator.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/bin/SpringHibernateConfigurator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SpringHibernateConfigurator.java 5 Oct 2005 13:49:11 -0000 1.1
+++ SpringHibernateConfigurator.java 10 Oct 2005 18:23:09 -0000 1.2
@@ -63,12 +63,19 @@
* SpringHibernateConfigurator
*
* @author <a href="mailto:[EMAIL PROTECTED]">Cedric Mailleux</a>
- * @version $Id: SpringHibernateConfigurator.java,v 1.1 2005/10/05 13:49:11
cmailleux Exp $
+ * @version $Id: SpringHibernateConfigurator.java,v 1.2 2005/10/10 18:23:09
shuber Exp $
*
* $Log: SpringHibernateConfigurator.java,v $
+ * Revision 1.2 2005/10/10 18:23:09 shuber
+ * - Update maven.xml reset:tomcat goal so that it also resets the Spring
configuration files that include markers
+ * - Improve configuration wizard so that it works without Internet access
+ * - Update button style.
+ *
* Revision 1.1 2005/10/05 13:49:11 cmailleux
- * Add some configuration behavior against choice of database (Quartz
locking for hypersonic, default Isolation Level for transaction (READ_COMMITTED
for mysql), Support of nested transaction (true for mysql))
- *
+ * Add some configuration behavior against choice of database (Quartz
locking for hypersonic, default Isolation Level for transaction (READ_COMMITTED
for mysql), Support of nested transaction (true for mysql))
+
+ *
+
* Allow now user to choose to store all files (DAV and Big Text) in
database (choice made in Advanced Settings).
*
*/
@@ -96,6 +103,12 @@
fileReader.close();
String fileContent = fileContentBuf.toString();
+
+ String hibernateDialect =
getValue(values,"jahia.database.hibernate.dialect");
+ if((hibernateDialect != null) &&
(!"".equals(hibernateDialect))) {
+ fileContent = fileContent.replaceAll("[EMAIL
PROTECTED]@", hibernateDialect);
+ }
+
String transactionIsolationLevel =
getValue(values,"jahia.nested_transaction_allowed");
if("".equals(transactionIsolationLevel)) {
transactionIsolationLevel = "false";
Index: applicationcontext-hibernate.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-hibernate.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- applicationcontext-hibernate.xml 7 Oct 2005 14:08:01 -0000 1.7
+++ applicationcontext-hibernate.xml 10 Oct 2005 18:23:09 -0000 1.8
@@ -115,7 +115,7 @@
</property>
<property name="hibernateProperties">
<props>
- <prop
key="hibernate.dialect">org.hibernate.dialect.MySQLDialect</prop>
+ <prop key="hibernate.dialect">@HIBERNATE_DIALECT@</prop>
<prop key="hibernate.hbm2ddl.auto">update</prop>
<prop key="hibernate.show_sql">false</prop>
<prop
key="hibernate.cache.provider_class">org.jahia.hibernate.cache.OSCacheProvider</prop>
Index: corporate_portal_templates.jar
===================================================================
<<Binary file>>
Index: buttonShadow.gif
===================================================================
<<Binary file>>
Index: styles.css
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/css/styles.css,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- styles.css 10 Oct 2005 15:11:20 -0000 1.10
+++ styles.css 10 Oct 2005 18:23:11 -0000 1.11
@@ -288,14 +288,16 @@
margin-left: 4px;
margin-top: 12px;
margin-bottom: 5px;
- padding: 1px;
+ padding: 0px;
float:left;
display: inline;
}
+/*
#wrapper .button a {
- padding: 1px 1px 1px 1px;
+ padding: 1px 1px 1px 1px;
}
+*/
#wrapper .button span.buttonlabel {
padding: 0 0.4em;
