* adjust the sae package.

Makefile

@@ -69,8 +69,9 @@ build4sae:
 	sed -e 's/..\/framework/framework/g' zentaopms/install.php |sed -e "s/dirname(//" |sed -e 's/)))/))/' >zentaopms/install.php.new
 	sed -e 's/..\/framework/framework/g' zentaopms/upgrade.php |sed -e "s/dirname(//" |sed -e 's/)))/))/' >zentaopms/upgrade.php.new
 	mv zentaopms/index.php.new zentaopms/index.php
-	mv zentaopms/install.php.new zentaopms/install.php
 	mv zentaopms/upgrade.php.new zentaopms/upgrade.php
+	cat zentaopms/install.php.new |grep -v 'setDebug' > zentaopms/install.php
+	rm -fr zentaopms/install.php.new
 	# replace the error_log to sae_debug
 	sed -e 's/error_log/sae_debug/g' zentaopms/framework/router.class.php | sed -e "s/saveSQL/saveSQL4SAE/" >zentaopms/framework/router.class.php.new
 	mv zentaopms/framework/router.class.php.new zentaopms/framework/router.class.php
@@ -79,18 +80,17 @@ build4sae:
 	sed -e 's/\$$app->getTmpRoot/"saemc:\/\/" . \$$app\-\>getTmpRoot/g' zentaopms/framework/helper.class.php >zentaopms/framework/helper.class.new
 	mv zentaopms/framework/helper.class.new zentaopms/framework/helper.class.php
 	# touch the my.php.
-	touch zentaopms/config/my.php
+	cp build/sae/my.php zentaopms/config/my.php
+	cp build/sae/sae_app_wizard.xml zentaopms/
 	# get the extension files.
 	svn export https://svn.cnezsoft.com/easysoft/trunk/zentaoext/sae
 	mv sae/lib/saestorage zentaopms/lib/
 	cp -fr sae/* zentaopms/module/
 	# create the package.
-	mkdir 10
-	mv zentaopms 10/code
-	cp build/sae/config.yaml 10/
-	zip -r -9 ZenTaoPMS.$(VERSION).sae.zip 10
+	cp build/sae/config.yaml zentaopms/
+	cd zentaopms && zip -r -9 ../ZenTaoPMS.$(VERSION).sae.zip * && cd -
 	rm -fr sae
-	rm -fr 10
+	rm -fr zentaopms
 build4linux:	
 	unzip ZenTaoPMS.$(VERSION).zip
 	rm -fr ZenTaoPMS.$(VERSION).zip

build/sae/config.yaml

@@ -1,7 +1,7 @@
 name: zentao
 version: 1
 cron:
-  - description: cron test
+  - description: cron
     url: project-computeburn-admin.html
     schedule: every day of month 00:00
     timezone: Beijing
@@ -15,4 +15,3 @@ handle:
   - expire: if(path ~ "\.png$") time 360000
   - expire: if(path ~ "\.ico$") time 360000
   - expire: if(path ~ "\.jpg$") time 360000
-

build/sae/my.php

@@ -0,0 +1,31 @@
+<?php
+$config->installed   = false;
+$config->debug       = false;
+$config->requestType = 'PATH_INFO';
+
+$config->db->host        = SAE_MYSQL_HOST_M;
+$config->db->slaveHost   = SAE_MYSQL_HOST_S;
+$config->db->port        = SAE_MYSQL_PORT;
+$config->db->name        = SAE_MYSQL_DB;
+$config->db->user        = SAE_MYSQL_USER;
+$config->db->password    = SAE_MYSQL_PASS;
+$config->db->prefix      = 'zt_';
+$config->db->checkCentOS = false;
+
+$config->slaveDB->host        = SAE_MYSQL_HOST_S;
+$config->slaveDB->port        = SAE_MYSQL_PORT;
+$config->slaveDB->name        = SAE_MYSQL_DB;
+$config->slaveDB->user        = SAE_MYSQL_USER;
+$config->slaveDB->password    = SAE_MYSQL_PASS;
+$config->slaveDB->checkCentOS = false;
+
+$config->webRoot         = '/';
+$config->default->domain = $_SERVER['HTTP_HOST'];
+$config->default->lang   = 'zh-cn';
+
+$config->sae->storage->domain = 'zentao';
+
+$saeDB  = new saemysql();
+$saeSQL = "SELECT COUNT(`id`) FROM `" . $config->db->prefix . "config` WHERE 1 LIMIT 0,10";
+if($saeDB->getData($saeSQL)) $config->installed = true;
+$saeDB->closeDb();

build/sae/sae_app_wizard.xml

@@ -0,0 +1,47 @@
+<appwizard>
+    <introduction> 
+        <name>禅道项目管理软件SAE版本</name>
+        <author>青岛易软天创网络科技有限公司</author>
+        <icon>default_app_icon</icon>
+        <homepage>http://www.zentao.net/</homepage>
+        <description>
+        <![CDATA[
+        <p>禅道项目管理软件(ZenTaoPMS)是一款国产的，基于LGPL协议，开源免费的项目管理软件，它集产品管理、项目管理、测试管理于一体，同时还包含了事务管理、组织管理等诸多功能，是中小型企业项目管理的首选。禅道项目管理软件使用PHP + MySQL开发，基于自主的PHP开发框架──ZenTaoPHP而成。第三方开发者或者企业可以非常方便的开发插件或者进行定制。</p>
+        ]]>
+        </description>
+    </introduction>
+    <platform> 
+        <services> 
+            <service name="zentao"  params="禅道数据存储">Storage</service>
+            <service size="12M">Memcache</service>
+            <service>Mysql</service> 
+        </services>
+        <appconfig> 
+            <tpl>
+            <![CDATA[
+name: <<appname>>
+version: <<version>>
+cron:
+  - description: cron
+    url: project-computeburn-admin.html
+    schedule: every day of month 00:00
+    timezone: Beijing
+handle:
+  - rewrite: if(!is_dir() && !is_file()) goto "index.php/%{REQUEST_URI}"
+  - compress: if(out_header["Content-Type"] ~ "text") compress
+  - compress: if(out_header["Content-Type"] ~ "javascript") compress
+  - expire: if(path ~ "\.js$") time 360000
+  - expire: if(path ~ "\.css$") time 360000
+  - expire: if(path ~ "\.gif$") time 360000
+  - expire: if(path ~ "\.png$") time 360000
+  - expire: if(path ~ "\.ico$") time 360000
+  - expire: if(path ~ "\.jpg$") time 360000
+            ]]>
+            </tpl>
+        </appconfig>
+    </platform>
+    <code> 
+    <initScript>index.php</initScript>
+    </code>
+</appwizard>
+

config/config.php

@@ -12,7 +12,7 @@
  * @link        http://www.zentao.net
  */
 /* Basic settings. */
-$config->version     = '3.0.stable';      // The version of zentaopms. Don't change it.
+$config->version     = '3.0';             // The version of zentaopms. Don't change it.
 $config->encoding    = 'UTF-8';           // The encoding of znetaopms.
 $config->cookieLife  = time() + 2592000;  // The cookie life time.
 $config->timezone    = 'Asia/Shanghai';   // The time zone setting, for more see http://www.php.net/manual/en/timezones.php

module/project/css/manageproducts.css

@@ -1 +0,0 @@
-span{display:block; float:left; width:200px}

module/upgrade/lang/en.php

@@ -59,3 +59,4 @@ $lang->upgrade->fromVersions['2_2']       = '2.2';
 $lang->upgrade->fromVersions['2_3']       = '2.3';
 $lang->upgrade->fromVersions['2_4']       = '2.4';
 $lang->upgrade->fromVersions['3_0_beta1'] = '3.0.beta1';
+$lang->upgrade->fromVersions['3_0_beta2'] = '3.0.beta2';

module/upgrade/lang/zh-cn.php

@@ -59,3 +59,4 @@ $lang->upgrade->fromVersions['2_2']       = '2.2';
 $lang->upgrade->fromVersions['2_3']       = '2.3';
 $lang->upgrade->fromVersions['2_4']       = '2.4';
 $lang->upgrade->fromVersions['3_0_beta1'] = '3.0.beta1';
+$lang->upgrade->fromVersions['3_0_beta2'] = '3.0.beta2';

module/upgrade/lang/zh-tw.php

@@ -59,3 +59,4 @@ $lang->upgrade->fromVersions['2_2']       = '2.2';
 $lang->upgrade->fromVersions['2_3']       = '2.3';
 $lang->upgrade->fromVersions['2_4']       = '2.4';
 $lang->upgrade->fromVersions['3_0_beta1'] = '3.0.beta1';
+$lang->upgrade->fromVersions['3_0_beta2'] = '3.0.beta2';