pvollenweider 2005/06/09 12:27:44 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/java/org/jahia/bin JahiaConfigurationWizard.java
JahiaInterface.java
src/java/org/jahia/services/mail MailService.java
Log:
Add SERVICE_PACK_NUMBER to version
Revision Changes Path
1.55.2.5 +18 -11
jahia/src/java/org/jahia/bin/JahiaConfigurationWizard.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/bin/JahiaConfigurationWizard.java.diff?r1=1.55.2.4&r2=1.55.2.5&f=h
1.3592.2.84 +5 -2 jahia/src/java/org/jahia/bin/JahiaInterface.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/bin/JahiaInterface.java.diff?r1=1.3592.2.83&r2=1.3592.2.84&f=h
1.4.4.2 +1 -1
jahia/src/java/org/jahia/services/mail/MailService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/mail/MailService.java.diff?r1=1.4.4.1&r2=1.4.4.2&f=h
Index: JahiaConfigurationWizard.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/bin/Attic/JahiaConfigurationWizard.java,v
retrieving revision 1.55.2.4
retrieving revision 1.55.2.5
diff -u -r1.55.2.4 -r1.55.2.5
--- JahiaConfigurationWizard.java 7 Jun 2005 12:17:56 -0000 1.55.2.4
+++ JahiaConfigurationWizard.java 9 Jun 2005 10:27:42 -0000 1.55.2.5
@@ -1,4 +1,4 @@
-// $Id: JahiaConfigurationWizard.java,v 1.55.2.4 2005/06/07 12:17:56 shuber
Exp $
+// $Id: JahiaConfigurationWizard.java,v 1.55.2.5 2005/06/09 10:27:42
pvollenweider Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -336,17 +336,21 @@
// set browser response content type
String contentTypeStr = "text/html;charset=";
- String acceptCharset = request.getHeader("accept-charset");
- boolean acceptsUTF8 = false;
- if (acceptCharset != null) {
- if (acceptCharset.toLowerCase().indexOf("utf-8") != -1) {
- acceptsUTF8 = true;
- }
- }
- if (acceptsUTF8) {
- contentTypeStr = contentTypeStr + "UTF-8";
+ if (defaultLocale.toString().substring(0,2).equals("zh")) {
+ contentTypeStr = contentTypeStr + "GBK";
} else {
- contentTypeStr = contentTypeStr + "ISO8859-1";
+ String acceptCharset = request.getHeader("accept-charset");
+ boolean acceptsUTF8 = false;
+ if (acceptCharset != null) {
+ if (acceptCharset.toLowerCase().indexOf("utf-8") != -1) {
+ acceptsUTF8 = true;
+ }
+ }
+ if (acceptsUTF8) {
+ contentTypeStr = contentTypeStr + "UTF-8";
+ } else {
+ contentTypeStr = contentTypeStr + "ISO8859-1";
+ }
}
request.setAttribute("content-type", contentTypeStr);
@@ -1840,7 +1844,10 @@
}
// find release number...
- String release = new Double(Jahia.RELEASE_NUMBER).toString() + "." +
new Integer(Jahia.PATCH_NUMBER).toString();
+ String release = new Double(Jahia.RELEASE_NUMBER).toString() + "." +
new Integer(Jahia.SERVICE_PACK_NUMBER).toString();
+ if (! "".equals(Jahia.PATCH_STRING)) {
+ release = release + "_" + Jahia.PATCH_STRING;
+ }
// set new values in the PropertiesManager...
properties.setProperty("release", release );
Index: JahiaInterface.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/bin/Attic/JahiaInterface.java,v
retrieving revision 1.3592.2.83
retrieving revision 1.3592.2.84
diff -u -r1.3592.2.83 -r1.3592.2.84
--- JahiaInterface.java 29 Apr 2005 09:45:54 -0000 1.3592.2.83
+++ JahiaInterface.java 9 Jun 2005 10:27:43 -0000 1.3592.2.84
@@ -23,13 +23,16 @@
public interface JahiaInterface {
// DO NOT CHANGE THIS VALUE
- public static final int BUILD_NUMBER = 6045; // DO
NOT CHANGE THIS VALUE
+ public static final int BUILD_NUMBER = 6050; // DO
NOT CHANGE THIS VALUE
/** Jahia server release number */
public static final double RELEASE_NUMBER = 4.0;
/** Jahia server patch number */
- public static final int PATCH_NUMBER = 6;
+ public static final int SERVICE_PACK_NUMBER = 6;
+
+ /** Jahia server patch number */
+ public static final String PATCH_STRING = "01";
/** Jahia core mode */
public static final int CORE_MODE = 2;
Index: MailService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/mail/Attic/MailService.java,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -u -r1.4.4.1 -r1.4.4.2
--- MailService.java 29 Apr 2005 08:59:53 -0000 1.4.4.1
+++ MailService.java 9 Jun 2005 10:27:44 -0000 1.4.4.2
@@ -330,7 +330,7 @@
private String from;
private String mailhost;
private String mailer = "Jahia Server v." +
JahiaInterface.RELEASE_NUMBER +
- "." + JahiaInterface.PATCH_NUMBER +
+ "." + JahiaInterface.SERVICE_PACK_NUMBER +
" build " + JahiaInterface.BUILD_NUMBER;
static private MailService singletonInstance = null;
