svn commit: r1094250 [4/4] - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1094250 [4/4] - in /ofbiz/branches/jackrabbit2010
 
|
Modified: ofbiz/branches/jackrabbit20100709/framework/service/config/ServiceErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/service/config/ServiceErrorUiLabels.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/service/config/ServiceErrorUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/service/config/ServiceErrorUiLabels.xml Mon Apr 18 06:21:43 2011 @@ -24,7 +24,7 @@ <value xml:lang="en">The following required parameter is missing:</value> <value xml:lang="es">Se necesita ingresar el siguiente parametro :</value> <value xml:lang="fr">Le paramètre requis suivant manque :</value> - <value xml:lang="it">Il seguente parametro richiesto è mancante:</value> + <value xml:lang="it">Parametro richiesto mancante:</value> <value xml:lang="nl">De volgende vereiste parameters werden niet gevonden:</value> <value xml:lang="ro">Parametrul Cerut lipseste:</value> <value xml:lang="th">à¸à¸£à¸¸à¸à¸²à¸à¸£à¸à¸à¸à¹à¸à¸¡à¸¹à¸¥à¹à¸«à¹à¸à¸£à¸à¸à¹à¸§à¸</value> @@ -36,7 +36,7 @@ <value xml:lang="en">You do not have permission to perform this operation for this party</value> <value xml:lang="es">Usted no cuenta con permisos para realizar la acción</value> <value xml:lang="fr">Vous n'avez pas l'autorisation pour effectuer cette opération</value> - <value xml:lang="it">Tu non hai il permesso per eseguire questa operazione per questo soggetto</value> + <value xml:lang="it">Non hai il permesso per eseguire questa operazione per questo soggetto</value> <value xml:lang="nl">U bezit niet de benodigde persmissie om deze opdracht uit te voeren</value> <value xml:lang="ro">Tu nu ai dreptul sa executi aceasta operatie pentru acest Subiect.</value> <value xml:lang="th">à¹à¸¡à¹à¹à¸à¹à¸£à¸±à¸à¸à¸²à¸£à¸à¸à¸¸à¸à¸²à¸à¸´à¹à¸«à¹à¸à¸±à¸à¸à¸²à¸£à¸à¹à¸à¸¡à¸¹à¸¥à¹à¸à¸ªà¹à¸§à¸à¸à¸à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹à¸à¸µà¹</value> @@ -48,7 +48,7 @@ <value xml:lang="en">You do not have permission to run this service</value> <value xml:lang="es">Usted no cuenta con permisos para realizar la acción</value> <value xml:lang="fr">Vous n'avez pas l'autorisation pour effectuer ce service</value> - <value xml:lang="it">Tu non hai il permesso di eseguire questo servizio</value> + <value xml:lang="it">Non hai il permesso di eseguire questo servizio</value> <value xml:lang="nl">U bezit niet de benodigde permissies om deze service uit te voeren</value> <value xml:lang="ro">Nu ai dreptul sa folosesti acest serviciu.</value> <value xml:lang="th">à¹à¸¡à¹à¹à¸à¹à¸£à¸±à¸à¸à¸à¸¸à¸à¸²à¸à¸´à¹à¸«à¹à¸à¸³à¹à¸à¸´à¸à¸à¸²à¸£à¹à¸à¸ªà¹à¸§à¸à¸à¸à¸ service à¸à¸µà¹</value> @@ -60,7 +60,7 @@ <value xml:lang="en">Party ID missing</value> <value xml:lang="es">No existe el código de Participante</value> <value xml:lang="fr">Il manque la Party ID</value> - <value xml:lang="it">Soggetto è mancante</value> + <value xml:lang="it">Party ID mancante</value> <value xml:lang="nl">Relatie nummer van deze partij is niet gevonden</value> <value xml:lang="ro">Cod Subiect Lipseste</value> <value xml:lang="th">à¹à¸¡à¹à¹à¸à¹à¹à¸ªà¹à¸£à¸«à¸±à¸ªà¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> @@ -72,7 +72,7 @@ <value xml:lang="en">Unable to cancel job</value> <value xml:lang="es">No se puede cancelar la terea</value> <value xml:lang="fr">Impossible d'annuler ce job</value> - <value xml:lang="it">Non è possibile cancellare il lavoro</value> + <value xml:lang="it">Impossibile annullare il lavoro</value> <value xml:lang="nl">Niet mogelijk om deze Job te stoppen</value> <value xml:lang="ro">Nu este posibila stergerea Lucrului</value> <value xml:lang="th">à¹à¸¡à¹à¸ªà¸²à¸¡à¸²à¸£à¸à¸¢à¸à¹à¸¥à¸´à¸à¸à¸²à¸à¹à¸à¹</value> @@ -84,7 +84,7 @@ <value xml:lang="en">Unable to cancel job retries</value> <value xml:lang="es">No se puede cancelar los reintentos de la terea</value> <value xml:lang="fr">Impossible d'annuler les nouvelles tentatives de traitement par lot</value> - <value xml:lang="it">Non è possibile cancellare il lavoro riprovando</value> + <value xml:lang="it">Impossibile annullare il nuovo tentativo di lavoro</value> <value xml:lang="nl">Niet mogelijk om deze Job regels te verwijderen.</value> <value xml:lang="ro">Nu este posibila stergerea noilor tentative de lucru</value> <value xml:lang="th">à¹à¸¡à¹à¸ªà¸²à¸¡à¸²à¸£à¸à¸¢à¸à¹à¸¥à¸´à¸à¸à¸²à¸à¹à¸à¹ à¸à¸£à¸¸à¸à¸²à¸¥à¸à¸à¸à¸µà¸à¸à¸£à¸±à¹à¸</value> Modified: ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/GenericDispatcher.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/GenericDispatcher.java?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/GenericDispatcher.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/GenericDispatcher.java Mon Apr 18 06:21:43 2011 @@ -52,11 +52,13 @@ public class GenericDispatcher extends G dispatcherName = delegator.getDelegatorName(); Debug.logWarning("Got a getGenericDispatcher call with a null dispatcherName, assuming default for the name.", module); } - - if (UtilValidate.isNotEmpty(delegator.getDelegatorTenantId())) { - dispatcherName += "#" + delegator.getDelegatorTenantId(); + + if (UtilValidate.isNotEmpty(delegator)) { + if (UtilValidate.isNotEmpty(delegator.getDelegatorTenantId())) { + dispatcherName += "#" + delegator.getDelegatorTenantId(); + } } - + LocalDispatcher dispatcher = dispatcherCache.get(dispatcherName); if (dispatcher == null) { Modified: ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/jms/AbstractJmsListener.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/jms/AbstractJmsListener.java?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/jms/AbstractJmsListener.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/jms/AbstractJmsListener.java Mon Apr 18 06:21:43 2011 @@ -50,7 +50,7 @@ public abstract class AbstractJmsListene * @param dispatcher */ protected AbstractJmsListener(ServiceDispatcher serviceDispatcher) { - this.dispatcher = GenericDispatcher.getLocalDispatcher("JMSDispatcher", null, null, this.getClass().getClassLoader(), serviceDispatcher); + this.dispatcher = GenericDispatcher.getLocalDispatcher("entity-default", null, null, this.getClass().getClassLoader(), serviceDispatcher); } /** Modified: ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java Mon Apr 18 06:21:43 2011 @@ -83,13 +83,13 @@ public class JmsListenerFactory implemen if (Debug.verboseOn()) Debug.logVerbose("[ServiceDispatcher] : Loading JMS Listeners.", module); for (int i = 0; i < nodeList.getLength(); i++) { Element element = (Element) nodeList.item(i); + StringBuilder serverKey = new StringBuilder(); for (Element server: UtilXml.childElementList(element, "server")) { try { String listenerEnabled = server.getAttribute("listen"); if (listenerEnabled.equalsIgnoreCase("true")) { // create a server key - StringBuilder serverKey = new StringBuilder(); serverKey.append(server.getAttribute("jndi-server-name") + ":"); serverKey.append(server.getAttribute("jndi-name") + ":"); @@ -104,7 +104,7 @@ public class JmsListenerFactory implemen listeners.put(serverKey.toString(), listener); } } catch (GenericServiceException gse) { - Debug.logVerbose("Cannot load message listener (" + gse.toString() + ").", module); + Debug.logInfo("Cannot load message listener " + serverKey + " error: (" + gse.toString() + ").", module); } catch (Exception e) { Debug.logError(e, "Uncaught exception.", module); } Modified: ofbiz/branches/jackrabbit20100709/framework/testtools/config/seleniumXml.properties URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/testtools/config/seleniumXml.properties?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/testtools/config/seleniumXml.properties (original) +++ ofbiz/branches/jackrabbit20100709/framework/testtools/config/seleniumXml.properties Mon Apr 18 06:21:43 2011 @@ -20,10 +20,12 @@ serverHost=localhost proxyPort=4444 #for Debian, use the following line #browser=*firefox /usr/lib/iceweasel/firefox-bin -#for Windows (default install, you can override by setting the Java system property firefoxDefaultPath to the correct path to Firefox) -#browser=*firefox -browser=*firefox /usr/lib/firefox-3.0.8/firefox +#default firefox (works for windows and linuxes), if a specific firefox is needed, add the path like in the debian usage +# ie you can override by setting the Java system property firefoxDefaultPath to the correct path to Firefox +browser=*firefox startUrl=http://localhost:8080/ +startUrlHttps=https://localhost:8443/ +timeout=60000 log4jFile=./config/log4j.properties # --- Allow to use Selenium in Webtools with or without Internet access Modified: ofbiz/branches/jackrabbit20100709/framework/testtools/runSeleniumServer.sh URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/testtools/runSeleniumServer.sh?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/testtools/runSeleniumServer.sh (original) +++ ofbiz/branches/jackrabbit20100709/framework/testtools/runSeleniumServer.sh Mon Apr 18 06:21:43 2011 @@ -24,5 +24,5 @@ else JAVA=java fi -#"$JAVA" -jar ../../framework/testtools/lib/selenium-server.jar -firefoxProfileTemplate ./config/firefox_profile -singleWindow -trustAllSSLCertificates -timeout 240 -"$JAVA" -jar ../../framework/testtools/lib/selenium-server.jar -singleWindow -timeout 240 +"$JAVA" -jar ../../framework/testtools/lib/selenium-server.jar -firefoxProfileTemplate ./config/firefox_profile -singleWindow -trustAllSSLCertificates -timeout 240 +#"$JAVA" -jar ../../framework/testtools/lib/selenium-server.jar -singleWindow -timeout 240 Modified: ofbiz/branches/jackrabbit20100709/framework/testtools/runSeleniumXml.sh URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/testtools/runSeleniumXml.sh?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/testtools/runSeleniumXml.sh (original) +++ ofbiz/branches/jackrabbit20100709/framework/testtools/runSeleniumXml.sh Mon Apr 18 06:21:43 2011 @@ -27,7 +27,7 @@ export CP=$CP:$OFBIZ_HOME/framework/base export CP=$CP:$OFBIZ_HOME/framework/base/lib/junit.jar export CP=$CP:$OFBIZ_HOME/framework/base/lib/commons/commons-lang-2.3.jar export CP=$CP:$OFBIZ_HOME/framework/base/lib/log4j-1.2.15.jar -export CP=$CP:$OFBIZ_HOME/framework/base/lib/javolution-5.2.3.jar +export CP=$CP:$OFBIZ_HOME/framework/base/lib/javolution-5.4.3.jar export CP=$CP:$OFBIZ_HOME/framework/base/build/lib/ofbiz-base.jar echo $CP Modified: ofbiz/branches/jackrabbit20100709/framework/testtools/src/org/ofbiz/testtools/seleniumxml/SeleniumXml.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/testtools/src/org/ofbiz/testtools/seleniumxml/SeleniumXml.java?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/testtools/src/org/ofbiz/testtools/seleniumxml/SeleniumXml.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/testtools/src/org/ofbiz/testtools/seleniumxml/SeleniumXml.java Mon Apr 18 06:21:43 2011 @@ -19,28 +19,10 @@ package org.ofbiz.testtools.seleniumxml; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.Method; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.Map.Entry; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.thoughtworks.selenium.DefaultSelenium; +import com.thoughtworks.selenium.SeleniumException; import javolution.util.FastMap; import junit.framework.Assert; - import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.RandomStringUtils; import org.apache.log4j.BasicConfigurator; @@ -50,21 +32,22 @@ import org.jdom.Document; import org.jdom.Element; import org.jdom.JDOMException; import org.jdom.input.SAXBuilder; -import org.ofbiz.base.util.UtilDateTime; -import org.ofbiz.base.util.UtilGenerics; -import org.ofbiz.base.util.UtilHttp; -import org.ofbiz.base.util.UtilProperties; -import org.ofbiz.base.util.UtilURL; -import org.ofbiz.testtools.seleniumxml.DataLoader; -import org.ofbiz.testtools.seleniumxml.DataLoop; -import org.ofbiz.testtools.seleniumxml.GroovyRunner; -import org.ofbiz.testtools.seleniumxml.JythonRunner; -import org.ofbiz.testtools.seleniumxml.RemoteRequest; -import org.ofbiz.testtools.seleniumxml.TestCaseException; +import org.ofbiz.base.util.*; import org.ofbiz.testtools.seleniumxml.util.TestUtils; -import com.thoughtworks.selenium.DefaultSelenium; -import com.thoughtworks.selenium.SeleniumException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.lang.reflect.Method; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Properties; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; public class SeleniumXml { public static String PROPS_NAME = "selenium.config"; @@ -973,6 +956,7 @@ public class SeleniumXml { String serverPort = null; String browser = null; String startUrl = null; + String timeout = null; //First initialize with property values if(props != null ) { //Get setup params from property value @@ -980,6 +964,7 @@ public class SeleniumXml { serverPort = props.getProperty("proxyPort", "4444"); browser = props.getProperty("browser", "*iexplore"); startUrl = props.getProperty("startUrl", "http://localhost:8080"); + timeout = props.getProperty("timeout", "30000"); imagePath = props.getProperty("imagePath", "runtime/logs/"); } //Second over ride properties if defined in the "setup" element @@ -1003,9 +988,11 @@ public class SeleniumXml { logger.info("setup: serverPort=" + serverPort); logger.info("setup: browser=" + browser); logger.info("setup: startUrl=" + startUrl); + logger.info("setup: timeout=" + timeout); logger.info("setup: imagePath=" + imagePath); this.sel = new DefaultSelenium(serverHost, Integer.parseInt(serverPort), browser, startUrl); this.sel.start(); + this.sel.setTimeout(timeout); } private String getAbsolutePath(String fileName){ Modified: ofbiz/branches/jackrabbit20100709/framework/testtools/webapp/testtools/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/testtools/webapp/testtools/WEB-INF/controller.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/testtools/webapp/testtools/WEB-INF/controller.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/testtools/webapp/testtools/WEB-INF/controller.xml Mon Apr 18 06:21:43 2011 @@ -68,6 +68,12 @@ <security https="true" auth="true"/> <response name="success" type="request" value="selenium"/> </request-map> + + <request-map uri="runHtmlSuite"> + <event type="java" path="org.ofbiz.testtools.selenium.SeleniumHtml" invoke="runHtmlTestSuite"/> + <response name="success" type="view" value="selenium" /> + <response name="error" type="view" value="selenium" /> + </request-map> <!-- selenium Test Case --> <view-map name="selenium" type="screen" page="component://testtools/widget/CommonScreens.xml#selenium"/> Modified: ofbiz/branches/jackrabbit20100709/framework/testtools/widget/RunSeleniumForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/testtools/widget/RunSeleniumForms.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/testtools/widget/RunSeleniumForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/testtools/widget/RunSeleniumForms.xml Mon Apr 18 06:21:43 2011 @@ -23,13 +23,16 @@ <form name="editSeleniumTestSuitePath" target="updateSeleniumTestSuitePath" type="single" title="Add new selenium test suite" default-map-name="testSuitePath" header-row-style="header-row" default-table-style="basic-table"> - - <!--alt-target use-when="testSuitePath==null" target="createSeleniumTestSuitePath"/--> - - <field name="testSuiteId" use-when="testSuitePath == null"><text></text></field> - <field name="testSuiteId" use-when="testSuitePath != null"><display></display></field> - <field name="testSuiteName"><text></text></field> - <field name="testSuitePath"><text></text></field> + <field name="testSuiteId" use-when="testSuitePath == null"><text/></field> + <field name="testSuiteId" use-when="testSuitePath != null"><display/></field> + <field name="testSuiteName"><text/></field> + <field name="testSuiteType"> + <drop-down allow-empty="false"> + <option key="XML" description="XML"/> + <option key="HTML" description="HTML"/> + </drop-down> + </field> + <field name="testSuitePath"><text/></field> <field name="description"><textarea rows="3"/></field> <field name="submitButton" title=""><submit button-type="button"/></field> </form> @@ -41,16 +44,24 @@ <parameter param-name="testSuiteId"/> </hyperlink> </field> - <field name="testSuiteName"><display></display></field> - <field name="testSuitePath"><display></display></field> - <field name="description"><display></display></field> - - <field name="runTest" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> + <field name="testSuiteName"><display/></field> + <field name="testSuitePath"><display/></field> + <field name="description"><display/></field> + <field name="testSuiteType"><display/></field> + <field name="runTest" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" + use-when=""XML".equals(testSuiteType)"> <hyperlink target="runTestSuite" description="${uiLabelMap.CommonRun}"> <parameter param-name="testSuiteId"/> <parameter param-name="testSuitePath" /> </hyperlink> </field> + <field name="runTest" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" + use-when=""HTML".equals(testSuiteType)"> + <hyperlink target="runHtmlSuite" description="${uiLabelMap.CommonRun}"> + <parameter param-name="testSuiteId"/> + <parameter param-name="testSuitePath"/> + </hyperlink> + </field> <field name="remove" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="removeSeleniumTestSuitePath" description="${uiLabelMap.CommonDelete}"> <parameter param-name="testSuiteId"/> Modified: ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java Mon Apr 18 06:21:43 2011 @@ -292,11 +292,6 @@ public class LoginWorker { public static String login(HttpServletRequest request, HttpServletResponse response) { HttpSession session = request.getSession(); - if (session.getAttribute("userLogin") != null) { - // already logged in, do nothing... - return "success"; - } - String username = request.getParameter("USERNAME"); String password = request.getParameter("PASSWORD"); Modified: ofbiz/branches/jackrabbit20100709/framework/webtools/config/WebtoolsUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/webtools/config/WebtoolsUiLabels.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/webtools/config/WebtoolsUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/webtools/config/WebtoolsUiLabels.xml Mon Apr 18 06:21:43 2011 @@ -4025,7 +4025,7 @@ <value xml:lang="de">Statistiken (seit Start) zurücksetzen</value> <value xml:lang="en">Clear Since Start Stats</value> <value xml:lang="fr">Effacer depuis le début des statistiques</value> - <value xml:lang="it">Pulisce fino dall'avvio statistiche</value> + <value xml:lang="it">Azzera statistiche</value> <value xml:lang="pt">Limpar Desde o InÃÂcio das estatÃÂsticas</value> <value xml:lang="th">ยà¸à¹à¸¥à¸´à¸à¸à¸±à¹à¸à¹à¸à¹à¹à¸£à¸´à¹à¸¡à¸à¹à¸</value> <value xml:lang="zh">æ¸ é¤å¯å¨ä»¥æ¥çç»è®¡</value> @@ -4045,7 +4045,7 @@ <value xml:lang="de">Ereignisstatistik</value> <value xml:lang="en">Event Statistics</value> <value xml:lang="fr">Statistiques d'évènement</value> - <value xml:lang="it">Evento statistiche</value> + <value xml:lang="it">Statistiche eventi</value> <value xml:lang="pt">EstatÃÂsticas de Eventos</value> <value xml:lang="th">สà¸à¸´à¸à¸´à¹à¸«à¸à¸¸à¸à¸²à¸£à¸à¹</value> <value xml:lang="zh">äºä»¶ç»è®¡</value> @@ -4075,7 +4075,7 @@ <value xml:lang="de">Serverstatistiken seit Serverstart</value> <value xml:lang="en">Server Statistics Since Start</value> <value xml:lang="fr">Début depuis les statistiques du serveur</value> - <value xml:lang="it">Statistiche da quanto il Server è Avviato</value> + <value xml:lang="it">Statistiche da quando il server è avviato</value> <value xml:lang="pt">As estatÃÂsticas do servidor desde o Inicio</value> <value xml:lang="th">สà¸à¸´à¸à¸´à¸à¸±à¹à¸à¹à¸à¹à¹à¸£à¸´à¹à¸¡à¸à¹à¸</value> <value xml:lang="zh">èªå¯å¨ä»¥æ¥çæå¡å¨ç»è®¡</value> @@ -4175,7 +4175,7 @@ <value xml:lang="de">Anfragestatistik</value> <value xml:lang="en">Request Statistics</value> <value xml:lang="fr">Requête statistiques</value> - <value xml:lang="it">Statistica richieste</value> + <value xml:lang="it">Statistiche richieste</value> <value xml:lang="pt">Requisitar EstatÃÂsticas</value> <value xml:lang="th">สà¸à¸´à¸à¸´à¸à¸³à¸£à¹à¸à¸</value> <value xml:lang="zh">请æ±ç»è®¡</value> @@ -4185,7 +4185,7 @@ <value xml:lang="de">Serverstatistik (seit Start)</value> <value xml:lang="en">Stats Since Server Start</value> <value xml:lang="fr">Statistiques depuis le démarrage du serveur</value> - <value xml:lang="it">Statistiche da quanto il Server è Avviato</value> + <value xml:lang="it">Statistiche da quando il server è avviato</value> <value xml:lang="pt">EstatÃÂsticas Desde InÃÂcio do servidor</value> <value xml:lang="ro">Statistici de cand serverul a fost Deschis</value> <value xml:lang="th">สà¸à¸´à¸à¸´à¸à¸±à¹à¸à¹à¸à¹à¹à¸£à¸´à¹à¸¡à¸à¹à¸</value> @@ -4226,7 +4226,7 @@ <value xml:lang="de">Statistiken ansehen</value> <value xml:lang="en">View Statistics</value> <value xml:lang="fr">Voir les statistiques</value> - <value xml:lang="it">Mostra statistiche</value> + <value xml:lang="it">Statistiche viste</value> <value xml:lang="pt">Ver EstatÃÂsticas</value> <value xml:lang="th">à¹à¸ªà¸à¸à¸ªà¸à¸´à¸à¸´</value> <value xml:lang="zh">æµè§ç»è®¡</value> Modified: ofbiz/branches/jackrabbit20100709/framework/webtools/webapp/webtools/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/webtools/webapp/webtools/WEB-INF/web.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/webtools/webapp/webtools/WEB-INF/web.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/webtools/webapp/webtools/WEB-INF/web.xml Mon Apr 18 06:21:43 2011 @@ -75,7 +75,7 @@ under the License. </init-param> <init-param> <param-name>allowedPaths</param-name> - <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/applet:/includes/maincss.css</param-value> + <param-value>/ping.txt:/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/applet:/includes/maincss.css</param-value> </init-param> <init-param> <param-name>errorCode</param-name> Modified: ofbiz/branches/jackrabbit20100709/framework/widget/templates/htmlFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/widget/templates/htmlFormMacroLibrary.ftl (original) +++ ofbiz/branches/jackrabbit20100709/framework/widget/templates/htmlFormMacroLibrary.ftl Mon Apr 18 06:21:43 2011 @@ -102,7 +102,14 @@ under the License. <#macro renderDateTimeField name className alert title value size maxlength id dateType shortDateInput timeDropdownParamName defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected compositeType formName mask="" event="" action="" step="" timeValues=""> <span class="view-calendar"> - <input type="text" name="${name}" <#if event?has_content && action?has_content> ${event}="${action}"</#if> <@renderClass className alert /><#rt/> + <input type="text" name="${name}_i18n" <@renderClass className alert /><#rt/> + <#if title?has_content> title="${title}"</#if> + <#if value?has_content> value="${value}"</#if> + <#if size?has_content> size="${size}"</#if><#rt/> + <#if maxlength?has_content> maxlength="${maxlength}"</#if> + <#if id?has_content> id="${id}_i18n"</#if>/><#rt/> + <#-- the style attribute is a little bit messy but when using disply:none the timepicker is shown on a wrong place --> + <input type="text" name="${name}" style="height:1px;width:1px;border:none;background-color:transparent" <#if event?has_content && action?has_content> ${event}="${action}"</#if> <@renderClass className alert /><#rt/> <#if title?has_content> title="${title}"</#if> <#if value?has_content> value="${value}"</#if> <#if size?has_content> size="${size}"</#if><#rt/> @@ -110,6 +117,42 @@ under the License. <#if id?has_content> id="${id}"</#if>/><#rt/> <#if dateType!="time" > <script type="text/javascript"> + <#-- If language specific lib is found, use date / time converter else just copy the value fields --> + if (Date.CultureInfo != undefined) { + var initDate = <#if value?has_content>jQuery("#${id}_i18n").val()<#else>""</#if>; + if (initDate != "") { + var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?exists && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>; + <#-- bad hack because the JS date parser doesn't understand dots in the date / time string --> + if (initDate.indexOf('.') != -1) { + initDate = initDate.substring(0, initDate.indexOf('.')); + } + var dateObj = Date.parse(initDate); + var formatedObj = dateObj.toString(dateFormat); + jQuery("#${id}_i18n").val(formatedObj); + } + + jQuery("#${id}").change(function() { + var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?exists && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>; + var dateObj = Date.parse(this.value); + var formatedObj = dateObj.toString(dateFormat); + jQuery("#${id}_i18n").val(formatedObj); + }); + jQuery("#${id}_i18n").change(function() { + var ofbizTime = "<#if shortDateInput?exists && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>"; + var dateObj = Date.parse(this.value); + var formatedObj = dateObj.toString(ofbizTime); + jQuery("#${id}").val(formatedObj); + }); + } else { + <#-- fallback if no language specific js date file is found --> + jQuery("#${id}").change(function() { + jQuery("#${id}_i18n").val(this.value); + }); + jQuery("#${id}_i18n").change(function() { + jQuery("#${id}").val(this.value); + }); + } + <#if shortDateInput?exists && shortDateInput> jQuery("#${id}").datepicker({ <#else> @@ -257,7 +300,15 @@ ${item.description}</span> <#macro renderFormClose focusFieldName formName> </form><#lt/> <#if focusFieldName?has_content> - <script language="JavaScript" type="text/javascript">document.${formName}.${focusFieldName}.focus();</script><#lt/> + <script language="JavaScript" type="text/javascript"> + var form = document.${formName}; + form.${focusFieldName}.focus(); + <#-- enable the validation plugin for all generated forms + only enable the validation if min one field is marked as 'required' --> + if (jQuery(form).find(".required").size() > 0) { + jQuery(form).validate(); + } + </script><#lt/> </#if> </#macro> <#macro renderMultiFormClose> @@ -578,7 +629,7 @@ ${item.description}</span> </#list> </select> ${paginateViewSizeLabel}</li></#if> <li class="nav-displaying">${commonDisplaying}</li> -</ul></div><br /> +</ul></div> </#if> </#macro> Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/lib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 18 06:21:43 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/specialpurpose/ebaystore/lib:951708-952957 /ofbiz/branches/jquery/specialpurpose/ebaystore/lib:952958-1044489 /ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264 -/ofbiz/trunk/specialpurpose/ebaystore/lib:962442-1090146 +/ofbiz/trunk/specialpurpose/ebaystore/lib:962442-1094239 Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy Mon Apr 18 06:21:43 2011 @@ -39,7 +39,20 @@ if (!userLogin) { if (orderId) { orderHeader = delegator.findOne("OrderHeader", [orderId : orderId], false); orderStatuses = orderHeader.getRelated("OrderStatus"); - filteredOrderStatusList = EntityUtil.filterByCondition(orderStatuses, EntityCondition.makeCondition("statusId", EntityOperator.IN, ["ORDER_COMPLETED", "ORDER_APPROVED"])); + filteredOrderStatusList = []; + extOfflineModeExists = false; + + // Handled the case of OFFLINE payment method. In case of OFFLINE payment "ORDER_CREATED" status must be checked. + orderPaymentPreferences = orderHeader.getRelated("OrderPaymentPreference", UtilMisc.toList("orderPaymentPreferenceId")); + filteredOrderPaymentPreferences = EntityUtil.filterByCondition(orderPaymentPreferences, EntityCondition.makeCondition("paymentMethodTypeId", EntityOperator.IN, ["EXT_OFFLINE"])); + if (filteredOrderPaymentPreferences) { + extOfflineModeExists = true; + } + if (extOfflineModeExists) { + filteredOrderStatusList = EntityUtil.filterByCondition(orderStatuses, EntityCondition.makeCondition("statusId", EntityOperator.IN, ["ORDER_COMPLETED", "ORDER_APPROVED", "ORDER_CREATED"])); + } else { + filteredOrderStatusList = EntityUtil.filterByCondition(orderStatuses, EntityCondition.makeCondition("statusId", EntityOperator.IN, ["ORDER_COMPLETED", "ORDER_APPROVED"])); + } if (UtilValidate.isNotEmpty(filteredOrderStatusList)) { if (filteredOrderStatusList.size() < 2) { statusUserLogin = EntityUtil.getFirst(filteredOrderStatusList).statusUserLogin; Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 18 06:21:43 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-952957 /ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:952958-1044489 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:962442-1090146 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:962442-1094239 Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 18 06:21:43 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-952957 /ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:952958-1044489 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:962442-1090146 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:962442-1094239 Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 18 06:21:43 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-952957 /ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:952958-1044489 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:962442-1090146 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:962442-1094239 Modified: ofbiz/branches/jackrabbit20100709/startofbiz.sh URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/startofbiz.sh?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/startofbiz.sh (original) +++ ofbiz/branches/jackrabbit20100709/startofbiz.sh Mon Apr 18 06:21:43 2011 @@ -49,9 +49,9 @@ else JAVA=java fi +# Allows to run from Jenkins. See http://wiki.jenkins-ci.org/display/JENKINS/ProcessTreeKiller. Cons: the calling Jenkins job does not terminate if the log is not enabled, pros: this allows to monitor the log in Jenkins +#BUILD_ID=dontKillMe + # start ofbiz #$JAVA $VMARGS -jar ofbiz.jar $* >>$OFBIZ_LOG 2>>$OFBIZ_LOG& exec "$JAVA" $VMARGS -jar ofbiz.jar "$@" - -# Allow To Run From Jenkins. See http://wiki.jenkins-ci.org/display/JENKINS/ProcessTreeKiller. Drawback: the calling Jenkins job does not terminate -#BUILD_ID=dontKillMe Modified: ofbiz/branches/jackrabbit20100709/themes/tomahawk/includes/appbarClose.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/themes/tomahawk/includes/appbarClose.ftl?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/themes/tomahawk/includes/appbarClose.ftl (original) +++ ofbiz/branches/jackrabbit20100709/themes/tomahawk/includes/appbarClose.ftl Mon Apr 18 06:21:43 2011 @@ -87,7 +87,7 @@ under the License. <li class="org">${orgName}</li> </#if> <#if userLogin.partyId?exists> - <li class="user"><a href="/partymgr/control/viewprofile?partyId=${userLogin.partyId}${StringUtil.wrapString(externalKeyParam!)}">${userName}</a></li> + <li class="user"><a href="passwordChange">${userName}</a></li> <#else> <li class="user">${userName}</li> </#if> Modified: ofbiz/branches/jackrabbit20100709/themes/tomahawk/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/themes/tomahawk/includes/header.ftl?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/themes/tomahawk/includes/header.ftl (original) +++ ofbiz/branches/jackrabbit20100709/themes/tomahawk/includes/header.ftl Mon Apr 18 06:21:43 2011 @@ -108,7 +108,7 @@ under the License. <#assign headerImageUrl = layoutSettings.VT_HDR_IMAGE_URL.get(0)> </#if> <#if headerImageUrl?exists> - <li id="logo-area"><a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>" title="${layoutSettings.companyName}"><span> </span></a></li> + <li id="logo-area"><a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>" title="${layoutSettings.companyName}"></a></li> </#if> <#if layoutSettings.middleTopMessage1?has_content && layoutSettings.middleTopMessage1 != " "> <li class="last-system-msg"> Modified: ofbiz/branches/jackrabbit20100709/themes/tomahawk/webapp/tomahawk/css/style.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/themes/tomahawk/webapp/tomahawk/css/style.css (original) +++ ofbiz/branches/jackrabbit20100709/themes/tomahawk/webapp/tomahawk/css/style.css Mon Apr 18 06:21:43 2011 @@ -951,6 +951,11 @@ width:385px; height:50px; } +#logo-area a{ +display:block; +height:100%; +} + #masthead { background: url(../images/header_top_bg.gif) repeat-x; font-weight: bold; @@ -1000,13 +1005,13 @@ text-decoration: none; } ul#preferences-menu .expanded { -background: url(../images/collapse.png) no-repeat right; +background: url(../images/expand.png) no-repeat right; width:22px; padding: 0; } ul#preferences-menu .collapsed { -background: url(../images/expand.png) no-repeat right; +background: url(../images/collapse.png) no-repeat right; width:32px; padding: 0; } @@ -1037,7 +1042,7 @@ background: url(../images/collapse.png) } ul#preferences-menu li.expanded a:hover { -background: url(../images/collapse.png) no-repeat right; +background: url(../images/expand.png) no-repeat right; } ul#preferences-menu li a.help-link { @@ -1463,6 +1468,9 @@ color:#000000; padding: 6px 10px 6px; line-height:19px; white-space: nowrap; +} + +.button-bar a.buttontext { text-transform:uppercase; } @@ -1505,7 +1513,6 @@ background: url(../images/button_sprite. .button-bar ul a:hover,.button-bar a:hover { color:#25292c; background-image:url(../images/ptrn_button_hover.gif); -bbbackground-color:#EDCC12; text-decoration: none; } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |