Index: /trunk/INSTALL/expressoInstall.sh
===================================================================
--- /trunk/INSTALL/expressoInstall.sh	(revision 7503)
+++ /trunk/INSTALL/expressoInstall.sh	(revision 7619)
@@ -35,5 +35,5 @@
 # Variaveis globais
 ARQS="arquivos"
-VERSAO="2.4.0"
+VERSAO="2.5.0"
 # Inclusao dos scripts de apoio
 . $ARQS/scripts/aux.sh
Index: /trunk/INSTALL/arquivos/scripts/http.sh
===================================================================
--- /trunk/INSTALL/arquivos/scripts/http.sh	(revision 7503)
+++ /trunk/INSTALL/arquivos/scripts/http.sh	(revision 7619)
@@ -55,4 +55,8 @@
 		php5 php5-common php5-dev php5-gd php5-imap php5-ldap php5-pgsql php5-cgi php5-cli php5-curl php5-xmlrpc php5-memcache php5-pspell \
 		libgv-php5 zip unzip memcached
+
+	# para que o yuicompressor funcione
+	apt-get install -y openjdk-6-jre-headless
+
 	# Copia os arquivos do Expresso Livre
 	cpexpresso "/var/www"
@@ -108,5 +112,9 @@
 		php php-cli php-ldap php-pgsql php-imap php-mbstring php-gd php-xml \
 		php-pecl-memcache graphviz-php php-pspell \
-		unzip zip memcached libmemcached
+		unzip zip memcached libmemcached \
+		php-soap php-process # para o zpush
+
+	# para que o yuicompressor funcione
+	yum -y install java-1.6.0-openjdk
 
 	cpexpresso "/var/www/html"
Index: /trunk/zpush/states/.htaccess
===================================================================
--- /trunk/zpush/states/.htaccess	(revision 7619)
+++ /trunk/zpush/states/.htaccess	(revision 7619)
@@ -0,0 +1,1 @@
+Options -Indexes
Index: /trunk/zpush/logs/.htaccess
===================================================================
--- /trunk/zpush/logs/.htaccess	(revision 7619)
+++ /trunk/zpush/logs/.htaccess	(revision 7619)
@@ -0,0 +1,1 @@
+Options -Indexes
Index: unk/zpush/config.php~
===================================================================
--- /trunk/zpush/config.php~	(revision 7589)
+++ 	(revision )
@@ -1,280 +1,0 @@
-<?php
-/***********************************************
-* File      :   config.php
-* Project   :   Z-Push
-* Descr     :   Main configuration file
-*
-* Created   :   01.10.2007
-*
-* Copyright 2007 - 2012 Zarafa Deutschland GmbH
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License, version 3,
-* as published by the Free Software Foundation with the following additional
-* term according to sec. 7:
-*
-* According to sec. 7 of the GNU Affero General Public License, version 3,
-* the terms of the AGPL are supplemented with the following terms:
-*
-* "Zarafa" is a registered trademark of Zarafa B.V.
-* "Z-Push" is a registered trademark of Zarafa Deutschland GmbH
-* The licensing of the Program under the AGPL does not imply a trademark license.
-* Therefore any rights, title and interest in our trademarks remain entirely with us.
-*
-* However, if you propagate an unmodified version of the Program you are
-* allowed to use the term "Z-Push" to indicate that you distribute the Program.
-* Furthermore you may use our trademarks where it is necessary to indicate
-* the intended purpose of a product or service provided you use it in accordance
-* with honest practices in industrial or commercial matters.
-* If you want to propagate modified versions of the Program under the name "Z-Push",
-* you may only do so if you have a written permission by Zarafa Deutschland GmbH
-* (to acquire a permission please contact Zarafa at trademark@zarafa.com).
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* Consult LICENSE file for details
-************************************************/
-
-/**********************************************************************************
- *  Default settings
- */
-    // Defines the default time zone, change e.g. to "Europe/London" if necessary
-    define('TIMEZONE', '');
-
-    // Defines the base path on the server
-    define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']). '/');
-
-    // Try to set unlimited timeout
-    define('SCRIPT_TIMEOUT', 0);
-
-    //Max size of attachments to display inline. Default is 2 MB
-    define('MAX_EMBEDDED_SIZE', 2097152);
-
-
-/**********************************************************************************
- *  Default FileStateMachine settings
- */
-    define('STATE_DIR', '/home/cristiano/z-push/states/');
-
-
-/**********************************************************************************
- *  Logging settings
- *  Possible LOGLEVEL and LOGUSERLEVEL values are:
- *  LOGLEVEL_OFF            - no logging
- *  LOGLEVEL_FATAL          - log only critical errors
- *  LOGLEVEL_ERROR          - logs events which might require corrective actions
- *  LOGLEVEL_WARN           - might lead to an error or require corrective actions in the future
- *  LOGLEVEL_INFO           - usually completed actions
- *  LOGLEVEL_DEBUG          - debugging information, typically only meaningful to developers
- *  LOGLEVEL_WBXML          - also prints the WBXML sent to/from the device
- *  LOGLEVEL_DEVICEID       - also prints the device id for every log entry
- *  LOGLEVEL_WBXMLSTACK     - also prints the contents of WBXML stack
- *
- *  The verbosity increases from top to bottom. More verbose levels include less verbose
- *  ones, e.g. setting to LOGLEVEL_DEBUG will also output LOGLEVEL_FATAL, LOGLEVEL_ERROR,
- *  LOGLEVEL_WARN and LOGLEVEL_INFO level entries.
- */
-    define('LOGFILEDIR', '/home/cristiano/expresso/zpush/logs/');
-    define('LOGFILE', LOGFILEDIR . 'z-push.log');
-    define('LOGERRORFILE', LOGFILEDIR . 'z-push-error.log');
-    define('LOGLEVEL', LOGLEVEL_DEBUG);
-    define('LOGAUTHFAIL', false);
-
-
-    // To save e.g. WBXML data only for selected users, add the usernames to the array
-    // The data will be saved into a dedicated file per user in the LOGFILEDIR
-    define('LOGUSERLEVEL', LOGLEVEL_DEVICEID);
-    $specialLogUsers = array();
-
-
-/**********************************************************************************
- *  Mobile settings
- */
-    // Device Provisioning
-    define('PROVISIONING', true);
-
-    // This option allows the 'loose enforcement' of the provisioning policies for older
-    // devices which don't support provisioning (like WM 5 and HTC Android Mail) - dw2412 contribution
-    // false (default) - Enforce provisioning for all devices
-    // true - allow older devices, but enforce policies on devices which support it
-    define('LOOSE_PROVISIONING', false);
-
-    // Default conflict preference
-    // Some devices allow to set if the server or PIM (mobile)
-    // should win in case of a synchronization conflict
-    //   SYNC_CONFLICT_OVERWRITE_SERVER - Server is overwritten, PIM wins
-    //   SYNC_CONFLICT_OVERWRITE_PIM    - PIM is overwritten, Server wins (default)
-    define('SYNC_CONFLICT_DEFAULT', SYNC_CONFLICT_OVERWRITE_PIM);
-
-    // Global limitation of items to be synchronized
-    // The mobile can define a sync back period for calendar and email items
-    // For large stores with many items the time period could be limited to a max value
-    // If the mobile transmits a wider time period, the defined max value is used
-    // Applicable values:
-    //   SYNC_FILTERTYPE_ALL (default, no limitation)
-    //   SYNC_FILTERTYPE_1DAY, SYNC_FILTERTYPE_3DAYS, SYNC_FILTERTYPE_1WEEK, SYNC_FILTERTYPE_2WEEKS,
-    //   SYNC_FILTERTYPE_1MONTH, SYNC_FILTERTYPE_3MONTHS, SYNC_FILTERTYPE_6MONTHS
-    define('SYNC_FILTERTIME_MAX', SYNC_FILTERTYPE_ALL);
-
-    // Interval in seconds before checking if there are changes on the server when in Ping.
-    // It means the highest time span before a change is pushed to a mobile. Set it to
-    // a higher value if you have a high load on the server.
-    define('PING_INTERVAL', 30);
-
-    // Interval in seconds to force a re-check of potentially missed notifications when
-    // using a changes sink. Default are 300 seconds (every 5 min).
-    // This can also be disabled by setting it to false
-    define('SINK_FORCERECHECK', 300);
-
-    // Set the fileas (save as) order for contacts in the webaccess/webapp/outlook.
-    // It will only affect new/modified contacts on the mobile which then are synced to the server.
-    // Possible values are:
-    // SYNC_FILEAS_FIRSTLAST    - fileas will be "Firstname Middlename Lastname"
-    // SYNC_FILEAS_LASTFIRST    - fileas will be "Lastname, Firstname Middlename"
-    // SYNC_FILEAS_COMPANYONLY  - fileas will be "Company"
-    // SYNC_FILEAS_COMPANYLAST  - fileas will be "Company (Lastname, Firstname Middlename)"
-    // SYNC_FILEAS_COMPANYFIRST - fileas will be "Company (Firstname Middlename Lastname)"
-    // SYNC_FILEAS_LASTCOMPANY  - fileas will be "Lastname, Firstname Middlename (Company)"
-    // SYNC_FILEAS_FIRSTCOMPANY - fileas will be "Firstname Middlename Lastname (Company)"
-    // The company-fileas will only be set if a contact has a company set. If one of
-    // company-fileas is selected and a contact doesn't have a company set, it will default
-    // to SYNC_FILEAS_FIRSTLAST or SYNC_FILEAS_LASTFIRST (depending on if last or first
-    // option is selected for company).
-    // If SYNC_FILEAS_COMPANYONLY is selected and company of the contact is not set
-    // SYNC_FILEAS_LASTFIRST will be used
-    define('FILEAS_ORDER', SYNC_FILEAS_LASTFIRST);
-
-    // Amount of items to be synchronized per request
-    // Normally this value is requested by the mobile. Common values are 5, 25, 50 or 100.
-    // Exporting too much items can cause mobile timeout on busy systems.
-    // Z-Push will use the lowest value, either set here or by the mobile.
-    // default: 100 - value used if mobile does not limit amount of items
-    define('SYNC_MAX_ITEMS', 100);
-
-/**********************************************************************************
- *  Backend settings
- */
-    // The data providers that we are using (see configuration below)
-    define('BACKEND_PROVIDER', "BackendExpresso");
-
-
-    //Expresso location
-    define('EXPRESSO_PATH', '/home/douglas/expressobranchteste');
-
-
-    // ************************
-    //  BackendZarafa settings
-    // ************************
-    // Defines the server to which we want to connect
-    define('MAPI_SERVER', 'file:///var/run/zarafa');
-
-
-    // ************************
-    //  BackendIMAP settings
-    // ************************
-    // Defines the server to which we want to connect
-    define('IMAP_SERVER', 'localhost');
-    // connecting to default port (143)
-    define('IMAP_PORT', 143);
-    // best cross-platform compatibility (see http://php.net/imap_open for options)
-    define('IMAP_OPTIONS', '/notls/norsh');
-    // overwrite the "from" header if it isn't set when sending emails
-    // options: 'username'    - the username will be set (usefull if your login is equal to your emailaddress)
-    //        'domain'    - the value of the "domain" field is used
-    //        '@mydomain.com' - the username is used and the given string will be appended
-    define('IMAP_DEFAULTFROM', '');
-    // copy outgoing mail to this folder. If not set z-push will try the default folders
-    define('IMAP_SENTFOLDER', '');
-    // forward messages inline (default false - as attachment)
-    define('IMAP_INLINE_FORWARD', false);
-    // use imap_mail() to send emails (default) - if false mail() is used
-    define('IMAP_USE_IMAPMAIL', true);
-
-
-    // ************************
-    //  BackendMaildir settings
-    // ************************
-    define('MAILDIR_BASE', '/tmp');
-    define('MAILDIR_SUBDIR', 'Maildir');
-
-    // **********************
-    //  BackendVCardDir settings
-    // **********************
-    define('VCARDDIR_DIR', '/home/%u/.kde/share/apps/kabc/stdvcf');
-
-
-/**********************************************************************************
- *  Search provider settings
- *
- *  Alternative backend to perform SEARCH requests (GAL search)
- *  By default the main Backend defines the preferred search functionality.
- *  If set, the Search Provider will always be preferred.
- *  Use 'BackendSearchLDAP' to search in a LDAP directory (see backend/searchldap/config.php)
- */
-    define('SEARCH_PROVIDER', '');
-    // Time in seconds for the server search. Setting it too high might result in timeout.
-    // Setting it too low might not return all results. Default is 10.
-    define('SEARCH_WAIT', 10);
-    // The maximum number of results to send to the client. Setting it too high
-    // might result in timeout. Default is 10.
-    define('SEARCH_MAXRESULTS', 10);
-
-
-/**********************************************************************************
- *  Synchronize additional folders to all mobiles
- *
- *  With this feature, special folders can be synchronized to all mobiles.
- *  This is useful for e.g. global company contacts.
- *
- *  This feature is supported only by certain devices, like iPhones.
- *  Check the compatibility list for supported devices:
- *      http://z-push.sf.net/compatibility
- *
- *  To synchronize a folder, add a section setting all parameters as below:
- *      store:      the ressource where the folder is located.
- *                  Zarafa users use 'SYSTEM' for the 'Public Folder'
- *      folderid:   folder id of the folder to be synchronized
- *      name:       name to be displayed on the mobile device
- *      type:       supported types are:
- *                      SYNC_FOLDER_TYPE_USER_CONTACT
- *                      SYNC_FOLDER_TYPE_USER_APPOINTMENT
- *                      SYNC_FOLDER_TYPE_USER_TASK
- *                      SYNC_FOLDER_TYPE_USER_MAIL
- *
- *  Additional notes:
- *  - on Zarafa systems use backend/zarafa/listfolders.php script to get a list
- *    of available folders
- *
- *  - all Z-Push users must have full writing permissions (secretary rights) so
- *    the configured folders can be synchronized to the mobile
- *
- *  - this feature is only partly suitable for multi-tenancy environments,
- *    as ALL users from ALL tenents need access to the configured store & folder.
- *    When configuring a public folder, this will cause problems, as each user has
- *    a different public folder in his tenant, so the folder are not available.
-
- *  - changing this configuration could cause HIGH LOAD on the system, as all
- *    connected devices will be updated and load the data contained in the
- *    added/modified folders.
- */
-
-    $additionalFolders = array(
-        // demo entry for the synchronization of contacts from the public folder.
-        // uncomment (remove '/*' '*/') and fill in the folderid
-/*
-        array(
-            'store'     => "SYSTEM",
-            'folderid'  => "",
-            'name'      => "Public Contacts",
-            'type'      => SYNC_FOLDER_TYPE_USER_CONTACT,
-        ),
-*/
-    );
-
-?>
Index: /trunk/.htaccess
===================================================================
--- /trunk/.htaccess	(revision 7616)
+++ /trunk/.htaccess	(revision 7619)
@@ -50,4 +50,5 @@
 #<ifModule mod_expires.c>
 #	ExpiresActive On
+#	ExpiresDefault A0
 #	ExpiresDefault "access plus 1 day"
 	# Permite que os arquivos sejam "cacheados" tanto para http quanto para https
@@ -66,4 +67,8 @@
 	#<FilesMatch "\.(pl|php|cgi|spl|scgi|fcgi)$">
 		#ExpiresActive Off
+		# Sem cache!
+		#ExpiresDefault A0
+		#Header set Cache-Control "no-store, no-cache, must-revalidate, max-age=0"
+		#Header set Pragma "no-cache"
 	#</FilesMatch>
 #</ifModule>
Index: /trunk/prototype/config/OpenLDAP.srv
===================================================================
--- /trunk/prototype/config/OpenLDAP.srv	(revision 6173)
+++ /trunk/prototype/config/OpenLDAP.srv	(revision 7619)
@@ -4,5 +4,5 @@
 idAtribute = "uidNumber"
 host = 127.0.0.1
-context = "LDAP_DN"
+context = "dc=prognus,dc=com,dc=br"
 ; Caso o LDAP requisite autenticacao, configure os parametros a seguir
 ;user = 
