pvollenweider 2005/05/24 14:44:31 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/jahia/bin JahiaConfigurationWizard.java
JahiaInterface.java
Log:
Add a PATCH_STRING. Next version will be jahia-4.1.0_01
Revision Changes Path
1.55.2.2.2.3 +2 -2
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.2.2.2&r2=1.55.2.2.2.3&f=h
1.3592.2.68.2.30 +2 -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.68.2.29&r2=1.3592.2.68.2.30&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.2.2.2
retrieving revision 1.55.2.2.2.3
diff -u -r1.55.2.2.2.2 -r1.55.2.2.2.3
--- JahiaConfigurationWizard.java 20 May 2005 09:35:25 -0000
1.55.2.2.2.2
+++ JahiaConfigurationWizard.java 24 May 2005 12:44:29 -0000
1.55.2.2.2.3
@@ -1,4 +1,4 @@
-// $Id: JahiaConfigurationWizard.java,v 1.55.2.2.2.2 2005/05/20 09:35:25
pvollenweider Exp $
+// $Id: JahiaConfigurationWizard.java,v 1.55.2.2.2.3 2005/05/24 12:44:29
pvollenweider Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -1846,7 +1846,7 @@
// find release number...
String release = new Double(Jahia.RELEASE_NUMBER).toString() + "." +
new Integer(Jahia.SERVICE_PACK_NUMBER).toString();
if (! "".equals(Jahia.PATCH_NUMBER)) {
- release = release + "." + Jahia.PATCH_NUMBER;
+ release = release + "_" + Jahia.PATCH_STRING;
}
// set new values in the PropertiesManager...
Index: JahiaInterface.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/bin/Attic/JahiaInterface.java,v
retrieving revision 1.3592.2.68.2.29
retrieving revision 1.3592.2.68.2.30
diff -u -r1.3592.2.68.2.29 -r1.3592.2.68.2.30
--- JahiaInterface.java 20 May 2005 09:35:26 -0000 1.3592.2.68.2.29
+++ JahiaInterface.java 24 May 2005 12:44:30 -0000 1.3592.2.68.2.30
@@ -23,7 +23,7 @@
public interface JahiaInterface {
// DO NOT CHANGE THIS VALUE
- public static final int BUILD_NUMBER = 6051; // DO
NOT CHANGE THIS VALUE
+ public static final int BUILD_NUMBER = 6052; // DO
NOT CHANGE THIS VALUE
/** Jahia server release number */
public static final double RELEASE_NUMBER = 4.1;
@@ -32,7 +32,7 @@
public static final int SERVICE_PACK_NUMBER = 0;
/** Jahia server patch number */
- public static final String PATCH_NUMBER = "A";
+ public static final String PATCH_STRING = "01";
/** Jahia core mode */
public static final int CORE_MODE = 2;