Preparing 3.4.0s release

aoslee · Mar 26, 2008 · 6e3f51b · 6e3f51b
1 parent 9342811
commit 6e3f51b
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 16 deletions.
diff --git a/base/src/org/compiere/Adempiere.java b/base/src/org/compiere/Adempiere.java
@@ -58,11 +58,11 @@ public final class Adempiere
 	/** Main Version String         */
 	// Conventions for naming second number is even for stable, and odd for unstable
 	// the releases will have a suffix (b) for beta - (t) for trunk - and (s) for stable
-	static public final String	MAIN_VERSION	= "Release 3.3.1t";
+	static public final String	MAIN_VERSION	= "Release 3.4.0s";
 	/** Detail Version as date      Used for Client/Server		*/
-	static public final String	DATE_VERSION	= "2007-12-05";
+	static public final String	DATE_VERSION	= "2008-03-26";
 	/** Database Version as date    Compared with AD_System		*/
-	static public final String	DB_VERSION		= "2007-12-05";
+	static public final String	DB_VERSION		= "2008-03-26";
 
 	/** Product Name            */
 	static public final String	NAME 			= "Adempiere\u00AE";

diff --git a/launch/Adempiere.xml b/launch/Adempiere.xml
@@ -29,12 +29,12 @@
     <maxHeapSize>512</maxHeapSize>
   </jre>
   <versionInfo>
-    <fileVersion>3.3.1.0</fileVersion>
-    <txtFileVersion>Release 3.3.1b</txtFileVersion>
-    <fileDescription>Adempiere ERP &amp; CRM 3.3.1b</fileDescription>
+    <fileVersion>3.4.0.0</fileVersion>
+    <txtFileVersion>Release 3.4.0s</txtFileVersion>
+    <fileDescription>Adempiere ERP &amp; CRM 3.4.0s</fileDescription>
     <copyright>Adempiere</copyright>
-    <productVersion>3.3.1.0</productVersion>
-    <txtProductVersion>Release 3.3.1b</txtProductVersion>
+    <productVersion>3.4.0.0</productVersion>
+    <txtProductVersion>Release 3.4.0s</txtProductVersion>
     <productName>Adempier ERP &amp; CRM</productName>
     <companyName>Adempiere Bazaar</companyName>
     <internalName>Adempiere</internalName>

diff --git a/migration/331b-trunk/135_version340s.sql b/migration/331b-trunk/135_version340s.sql
@@ -0,0 +1,6 @@
+UPDATE AD_SYSTEM
+   SET releaseno = '340s',
+       VERSION = '2008-03-26'
+ WHERE ad_system_id = 0 AND ad_client_id = 0;
+
+COMMIT ;
diff --git a/migration/331b-trunk/postgresql/135_version340s.sql b/migration/331b-trunk/postgresql/135_version340s.sql
@@ -0,0 +1,6 @@
+UPDATE AD_SYSTEM
+   SET releaseno = '340s',
+       VERSION = '2008-03-26'
+ WHERE ad_system_id = 0 AND ad_client_id = 0;
+
+COMMIT ;
diff --git a/serverRoot/src/web/adempiere.html b/serverRoot/src/web/adempiere.html
@@ -96,7 +96,7 @@
         <tbody>
           <tr>
 
-            <td align="left" valign="middle"><font color="#ffffff" face="Arial, Helvetica, sans-serif" size="4">Welcome to the Adempiere 3.3.1b Home Page!<br>
+            <td align="left" valign="middle"><font color="#ffffff" face="Arial, Helvetica, sans-serif" size="4">Welcome to the Adempiere 3.4.0s Home Page!<br>
 
             </font></td>
 

diff --git a/serverRoot/src/web/adempiere.jnlp b/serverRoot/src/web/adempiere.jnlp
@@ -1,9 +1,9 @@
 <?xml version = "1.0" encoding = "UTF-8"?>
-<jnlp spec = "1.5+" version = "3.3.1b" 
+<jnlp spec = "1.5+" version = "3.4.0s" 
 	codebase = "$$context/adempiereHome" 
 	href = "$$context/adempiere.jnlp">  
 	<information>
-		<title>Adempiere Client 3.3.1b $$context</title>
+		<title>Adempiere Client 3.4.0s $$context</title>
 		<vendor>ADempiere, Inc.</vendor>
 		<homepage href = "http://www.adempiere.org"/>
 		<offline-allowed/>
@@ -14,7 +14,7 @@
 		<icon href = "$$context/C32.gif"/>
 		<shortcut online="true">
 			<desktop/>
-			<menu submenu="Adempiere 3.3.1b $$context"/>
+			<menu submenu="Adempiere 3.4.0s $$context"/>
 		</shortcut>
 	</information>  
 	<security>

diff --git a/utils/adempiereDirectTemplate.jnlp b/utils/adempiereDirectTemplate.jnlp
@@ -1,9 +1,9 @@
 <?xml version = "1.0" encoding = "UTF-8"?>
-<jnlp spec = "1.5+" version = "3.3.1b" 
+<jnlp spec = "1.5+" version = "3.4.0s" 
 	codebase = "http://@ADEMPIERE_APPS_SERVER@:@ADEMPIERE_WEB_PORT@/admin/adempiereHome" 
 	href = "http://@ADEMPIERE_APPS_SERVER@:@ADEMPIERE_WEB_PORT@/admin/adempiereHome/adempiereDirect.jnlp">  
 	<information>
-		<title>Adempiere Client 3.3.1b @ADEMPIERE_APPS_SERVER@ Direct</title>
+		<title>Adempiere Client 3.4.0s @ADEMPIERE_APPS_SERVER@ Direct</title>
 		<vendor>ADempiere, Inc.</vendor>
 		<homepage href = "http://www.adempiere.org"/>
 		<description>Adempiere ERP+CRM (local) - Smart Business Solution for Distribution and Service - globally</description>
@@ -13,7 +13,7 @@
 		<icon href = "http://@ADEMPIERE_APPS_SERVER@:@ADEMPIERE_WEB_PORT@/admin/C32.gif"/>
 		<shortcut online="true">
 			<desktop/>
-			<menu submenu="Adempiere 3.3.1b @ADEMPIERE_APPS_SERVER@ Direct"/>
+			<menu submenu="Adempiere 3.4.0s @ADEMPIERE_APPS_SERVER@ Direct"/>
 		</shortcut>
 	</information>  
 	<security>

diff --git a/utils_dev/build.properties b/utils_dev/build.properties
@@ -3,7 +3,7 @@ env.ADEMPIERE_ROOT=${env.ADEMPIERE_SOURCE}/adempiere
 env.ADEMPIERE_HOME=${env.ADEMPIERE_ROOT}/Adempiere
 env.ADEMPIERE_INSTALL=${env.ADEMPIERE_SOURCE}/adempiere/install
 env.ADEMPIERE_VERSION=ADempiere
-env.ADEMPIERE_VERSION_FILE=331b
+env.ADEMPIERE_VERSION_FILE=340s
 env.ADEMPIERE_VENDOR=ADempiere
 env.ENCODING=UTF-8
 env.XDOCLET_HOME=${env.ADEMPIERE_SOURCE}/tools
-Original file line number
+Diff line change
@@ Expand Up / @@ -96,7 +96,7 @@ @@
             <tbody>
               <tr>
-                <td align="left" valign="middle"><font color="#ffffff" face="Arial, Helvetica, sans-serif" size="4">Welcome to the Adempiere 3.3.1b Home Page!<br>
+                <td align="left" valign="middle"><font color="#ffffff" face="Arial, Helvetica, sans-serif" size="4">Welcome to the Adempiere 3.4.0s Home Page!<br>
                 </font></td>
@@ Expand Down @@