Author: jleroux
Date: Sun Nov 17 11:24:47 2013
New Revision: 1542707
URL: http://svn.apache.org/r1542707
Log:
Merges trunk HEAD
Added:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/lib/poi-3.9-20121203.jar
- copied unchanged from r1542706,
ofbiz/trunk/applications/content/lib/poi-3.9-20121203.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/PatternFactory.java
- copied unchanged from r1542706,
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/PatternFactory.java
Removed:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/lib/poi-3.8-20120326.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/lib/poi-ooxml-3.8-20120326.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/lib/poi-ooxml-schemas-3.8-20120326.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/lib/poi-scratchpad-3.8-20120326.jar
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ (props changed)
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java
(contents, props changed)
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilHttp.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/servicedef/services.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ServiceDispatcher.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/Config.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl
Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1540789-1542706
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath?rev=1542707&r1=1542706&r2=1542707&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath
(original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath Sun Nov
17 11:24:47 2013
@@ -5,10 +5,7 @@
<classpathentry kind="lib"
path="applications/content/lib/jempbox-1.7.1.jar"/>
<classpathentry kind="lib"
path="applications/content/lib/pdfbox-1.7.1.jar"/>
<classpathentry kind="lib"
path="applications/content/lib/dom4j-1.6.1.jar"/>
- <classpathentry kind="lib"
path="applications/content/lib/poi-3.8-20120326.jar"/>
- <classpathentry kind="lib"
path="applications/content/lib/poi-ooxml-3.8-20120326.jar"/>
- <classpathentry kind="lib"
path="applications/content/lib/poi-ooxml-schemas-3.8-20120326.jar"/>
- <classpathentry kind="lib"
path="applications/content/lib/poi-scratchpad-3.8-20120326.jar"/>
+ <classpathentry kind="lib"
path="applications/content/lib/poi-3.9-20121203.jar"/>
<classpathentry kind="lib"
path="applications/content/lib/tika-core-1.0.jar"/>
<classpathentry kind="lib"
path="applications/content/lib/tika-parsers-1.0.jar"/>
<classpathentry kind="lib"
path="applications/product/lib/watermarker-0.0.4.jar"/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE?rev=1542707&r1=1542706&r2=1542707&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE Sun Nov 17
11:24:47 2013
@@ -106,10 +106,7 @@ framework/testtools/lib/org.springframew
applications/content/lib/fontbox-1.7.1.jar
applications/content/lib/jempbox-1.7.1.jar
applications/content/lib/pdfbox-1.7.1.jar
-applications/content/lib/poi-3.8-20120326.jar
-applications/content/lib/poi-ooxml-3.8-20120326.jar
-applications/content/lib/poi-ooxml-schemas-3.8-20120326.jar
-applications/content/lib/poi-scratchpad-3.8-20120326.jar
+applications/content/lib/poi-3.9-20121203.jar
applications/content/lib/tika-core-1.0.jar
applications/content/lib/tika-parsers-1.0.jar
applications/product/lib/dozer-4.2.1.jar
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java?rev=1542707&r1=1542706&r2=1542707&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java
Sun Nov 17 11:24:47 2013
@@ -135,7 +135,6 @@ public class FinAccountHelper {
* @throws GenericEntityException
*/
public static GenericValue getFinAccountFromCode(String finAccountCode,
Delegator delegator) throws GenericEntityException {
- // regex magic to turn all letters in code to uppercase and then
remove all non-alphanumeric letters
if (finAccountCode == null) {
return null;
}
Propchange:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 17 11:24:47 2013
@@ -0,0 +1,8 @@
+/ofbiz/branches/2013_RemoveJavolution/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java:1462755
+/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java:1535158-1535170
+/ofbiz/branches/addbirt/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java:831210-885099,885686-886087
+/ofbiz/branches/dojo1.4/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java:951708-952957
+/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java:962442-1231517
+/ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java:952958-1044489
+/ofbiz/branches/multitenant20100310/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java:921280-927264
+/ofbiz/trunk/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java:1535158-1542706
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml?rev=1542707&r1=1542706&r2=1542707&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml
Sun Nov 17 11:24:47 2013
@@ -2654,7 +2654,7 @@
<value xml:lang="zh_TW">ç¹å¥èªªæ</value>
</property>
<property key="FacilityThereIsProblemOccurredInPaymentCapture">
- <value xml:lang="en">There is problem occurred in payment capture,
shipment is still in PICKED status</value>
+ <value xml:lang="en">A problem occurred in payment capture, shipment
is still in PICKED status</value>
<value xml:lang="it">C'è un problema successo nella cattura del
pagamento, spedizione è ancora in stato PRELEVATA</value>
<value
xml:lang="ja">æ¯æãã£ããã£æã«åé¡ãããã¾ããçºéã¯ã¾ã
ãããã³ã°ã¹ãã¼ã¿ã¹ã§ã</value>
<value xml:lang="vi">Có lá»i xảy ra trong quá trình thanh toán,
nên Chuyá»n váºn vẫn á» trạng thái 'Äã Xá» lý Äặt hà ng
(Pick)'</value>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml?rev=1542707&r1=1542706&r2=1542707&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml
(original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml Sun Nov
17 11:24:47 2013
@@ -96,9 +96,9 @@ under the License.
<antcall target="clean-cache"/>
<antcall target="clean-tempfiles"/>
<antcall target="clean-search-indexes"/>
- <!-- FIXME: clean-downloads introduces some issues: with cobertura (on
Windows can't be deleted, not sure why),
+ <!-- FIXME: clean-downloads introduces some issues: with cobertura (on
Windows can't be deleted, not sure why),
but especially with postgresql drivers -->
- <!-- antcall target="clean-downloads"/ -->
+ <!-- antcall target="clean-downloads"/ -->
<antcall target="clean"/>
</target>
@@ -254,7 +254,7 @@ under the License.
<sequential>
<!-- a check is done, if no build.xml file is present in hot-deploy
dir,
then the build.xml files - if present - in hot-deploy sub-dirs
will be used.
- So the previous, simpler, behaviour is kept as long as you don't
need
+ So the previous, simpler, behaviour is kept as long as you don't
need
to build hot-deploy components in a specific order. -->
<if>
<available file="hot-deploy/build.xml" property="useHotDeployBuild"/>
@@ -307,7 +307,7 @@ under the License.
<echo message="[docs-all] ========== Start Building (JavaDoc)
=========="/>
<mkdir dir="${site.dir}/javadocs"/>
-
+
<path id="local.class.path">
<fileset dir="${ofbiz.home.dir}/framework/base/lib"
includes="*.jar"/>
<fileset dir="${ofbiz.home.dir}/framework/base/lib/commons"
includes="*.jar"/>
@@ -329,12 +329,12 @@ under the License.
<fileset dir="${ofbiz.home.dir}/applications/content/lib"
includes="*.jar"/>
<fileset dir="${ofbiz.home.dir}/applications/product/lib"
includes="*.jar"/>
</path>
-
+
<property name="desc" value="API"/>
<property name="build.dir" value="${site.dir}"/>
-
+
<default-javadoc/>
-
+
<echo message="[docs-all] ========== Done Building (JavaDocs)
=========="/>
</target>
@@ -910,7 +910,7 @@ under the License.
</target>
<target name="run-tests"
- description="Run OFBiz default tests; you have to manually execute
'ant load-demo' before and see results in
runtime/logs/test-results/html/all-tests.html.">
+ description="Run OFBiz default tests; you have to manually execute
'ant load-demo' before (and if needed even clear your data before) and see
results in runtime/logs/test-results/html/all-tests.html.">
<java jar="ofbiz.jar" fork="true" resultproperty="test.result">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilHttp.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilHttp.java?rev=1542707&r1=1542706&r2=1542707&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilHttp.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilHttp.java
Sun Nov 17 11:24:47 2013
@@ -1204,7 +1204,7 @@ public class UtilHttp {
*
* @param request
* @param prefix
- * @return Composite object from data or nulll if not supported or a
parsing error occurred.
+ * @return Composite object from data or null if not supported or a
parsing error occurred.
*/
public static Object makeParamValueFromComposite(HttpServletRequest
request, String prefix, Locale locale) {
String compositeType = request.getParameter(makeCompositeParam(prefix,
"compositeType"));
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/servicedef/services.xml?rev=1542707&r1=1542706&r2=1542707&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/servicedef/services.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/servicedef/services.xml
Sun Nov 17 11:24:47 2013
@@ -710,10 +710,8 @@ under the License.
<service name="updateGeo" default-entity-name="Geo" engine="entity-auto"
invoke="update" auth="true">
<description>Update a Geo</description>
<permission-service service-name="commonGenericPermission"
main-action="UPDATE"/>
- <auto-attributes include="pk" mode="IN"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
- <override name="geoName" optional="false"/>
- <override name="geoTypeId" optional="false"/>
</service>
<service name="deleteGeo" default-entity-name="Geo" engine="entity-auto"
invoke="delete" auth="true">
<description>Delete a Geo</description>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java?rev=1542707&r1=1542706&r2=1542707&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
Sun Nov 17 11:24:47 2013
@@ -88,6 +88,7 @@ public class EntityDataLoadContainer imp
this.name = name;
this.configFile = configFile;
// disable job scheduler, JMS listener and startup services
+ // FIXME: This is not thread-safe.
ServiceDispatcher.enableJM(false);
ServiceDispatcher.enableJMS(false);
ServiceDispatcher.enableSvcs(false);
@@ -173,22 +174,22 @@ public class EntityDataLoadContainer imp
createConstraints = true;
}
} else if ("help".equalsIgnoreCase(argumentName)) {
- Debug.logInfo("--------------------------------------",
module);
- Debug.logInfo("java -jar ofbiz.jar -install [options]",
module);
- Debug.logInfo("-component=[name] .... only load from a
specific component", module);
- Debug.logInfo("-delegator=[name] .... use the defined
delegator (default-no-eca", module);
- Debug.logInfo("-group=[name] ........ override the entity
group (org.ofbiz)", module);
- Debug.logInfo("-file=[path] ......... load a single file
from location, several files separated by commas.", module);
- Debug.logInfo("-createfks ........... create dummy
(placeholder) FKs", module);
- Debug.logInfo("-maintainTxs ......... maintain timestamps
in data file", module);
- Debug.logInfo("-inserts ............. use mostly inserts
option", module);
- Debug.logInfo("-repair-columns ........... repair column
sizes", module);
- Debug.logInfo("-drop-pks ............ drop primary keys",
module);
- Debug.logInfo("-create-pks .......... create primary
keys", module);
- Debug.logInfo("-drop-constraints..... drop indexes and
foreign keys before loading", module);
- Debug.logInfo("-create-constraints... create indexes and
foreign keys after loading (default is true w/ drop-constraints)", module);
- Debug.logInfo("-help ................ display this
information", module);
- System.exit(1);
+ String helpStr =
"\n--------------------------------------\n" +
+ "java -jar ofbiz.jar -install [options]\n" +
+ "-component=[name] .... only load from a specific
component\n" +
+ "-delegator=[name] .... use the defined delegator
(default-no-eca)\n" +
+ "-group=[name] ........ override the entity group
(org.ofbiz)\n" +
+ "-file=[path] ......... load a single file from location,
several files separated by commas\n" +
+ "-createfks ........... create dummy (placeholder) FKs\n" +
+ "-maintainTxs ......... maintain timestamps in data
file\n" +
+ "-inserts ............. use mostly inserts option\n" +
+ "-repair-columns ........... repair column sizes\n" +
+ "-drop-pks ............ drop primary keys\n" +
+ "-create-pks .......... create primary keys\n" +
+ "-drop-constraints..... drop indexes and foreign keys
before loading\n" +
+ "-create-constraints... create indexes and foreign keys
after loading (default is true w/ drop-constraints)\n" +
+ "-help ................ display this information\n";
+ throw new ContainerException(helpStr);
}
// special case
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java?rev=1542707&r1=1542706&r2=1542707&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java
Sun Nov 17 11:24:47 2013
@@ -38,8 +38,8 @@ import org.w3c.dom.Element;
/**
* Implements the <if-regexp> element.
- *
- * @see <a
href="https://cwiki.apache.org/OFBADMIN/mini-language-reference.html#Mini-languageReference-{{%3Cifregexp%3E}}";>Mini-language
Reference</a>
+ *
+ * @see <a
href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{<ifregexp>}}">Mini-language
Reference</a>
*/
public class RegexpCondition extends MethodOperation implements Conditional {
@@ -146,7 +146,7 @@ public class RegexpCondition extends Met
}
/**
- * A <if-regexp> element factory.
+ * A <if-regexp> element factory.
*/
public static final class RegexpConditionFactory extends
ConditionalFactory<RegexpCondition> implements Factory<RegexpCondition> {
@Override
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ServiceDispatcher.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ServiceDispatcher.java?rev=1542707&r1=1542706&r2=1542707&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ServiceDispatcher.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ServiceDispatcher.java
Sun Nov 17 11:24:47 2013
@@ -73,6 +73,8 @@ public class ServiceDispatcher {
protected static final Map<RunningService, ServiceDispatcher> runLog = new
ConcurrentLinkedHashMap.Builder<RunningService,
ServiceDispatcher>().maximumWeightedCapacity(lruLogSize).build();
protected static Map<String, ServiceDispatcher> dispatchers =
FastMap.newInstance();
+ // FIXME: These fields are not thread-safe. They are modified by
EntityDataLoadContainer.
+ // We need a better design - like have this class query
EntityDataLoadContainer if data is being loaded.
protected static boolean enableJM = true;
protected static boolean enableJMS = true;
protected static boolean enableSvcs = true;
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java?rev=1542707&r1=1542706&r2=1542707&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java
Sun Nov 17 11:24:47 2013
@@ -18,7 +18,13 @@
*******************************************************************************/
package org.ofbiz.service.jms;
+import java.lang.reflect.Constructor;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
+
import javolution.util.FastMap;
+
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilGenerics;
import org.ofbiz.base.util.UtilMisc;
@@ -29,10 +35,6 @@ import org.ofbiz.service.config.ServiceC
import org.ofbiz.service.config.model.JmsService;
import org.ofbiz.service.config.model.Server;
-import java.lang.reflect.Constructor;
-import java.util.List;
-import java.util.Map;
-
/**
* JmsListenerFactory
*/
@@ -46,7 +48,7 @@ public class JmsListenerFactory implemen
protected static Map<String, GenericMessageListener> listeners =
FastMap.newInstance();
protected static Map<String, Server> servers = FastMap.newInstance();
- protected static JmsListenerFactory jlf = null;
+ private static final AtomicReference<JmsListenerFactory> jlFactoryRef =
new AtomicReference<JmsListenerFactory>(null);
protected Delegator delegator;
protected boolean firstPass = true;
@@ -56,15 +58,14 @@ public class JmsListenerFactory implemen
public static JmsListenerFactory getInstance(Delegator delegator){
- if (jlf == null) {
- synchronized (JmsListenerFactory.class) {
- if (jlf == null) {
- jlf = new JmsListenerFactory(delegator);
- }
+ JmsListenerFactory instance = jlFactoryRef.get();
+ if (instance == null) {
+ instance = new JmsListenerFactory(delegator);
+ if (!jlFactoryRef.compareAndSet(null, instance)) {
+ instance = jlFactoryRef.get();
}
}
-
- return jlf;
+ return instance;
}
public JmsListenerFactory(Delegator delegator) {
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/Config.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/Config.java?rev=1542707&r1=1542706&r2=1542707&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/Config.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/Config.java
Sun Nov 17 11:24:47 2013
@@ -413,7 +413,7 @@ public class Config {
Locale.setDefault(new Locale(locales[0], locales[1]));
break;
case 3:
- Locale.setDefault(new Locale(locales[0], locales[1],
args[2]));
+ Locale.setDefault(new Locale(locales[0], locales[1],
locales[2]));
}
System.setProperty("user.language", localeString);
}
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl?rev=1542707&r1=1542706&r2=1542707&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl
Sun Nov 17 11:24:47 2013
@@ -27,9 +27,9 @@ under the License.
<tr>
<td class="label">${serviceParameter.name}
(${serviceParameter.type})</td>
<td>
- <input type="text" size="20" name="${serviceParameter.name}"
value="${serviceParameter.value?if_exists}" <#if serviceParameter.optional ==
"N">class="required"</#if>/>
+ <input type="text" size="20" name="${serviceParameter.name}"
value="<#if
serviceParameter.value?if_exists>${serviceParameter.value?string}</#if>"<#if
serviceParameter.optional == "N"> class="required"</#if>/>
<#if serviceParameter.optional == "N"><span
class="tooltip">${uiLabelMap.CommonRequired}</span></#if>
- <#if
serviceParameter.defaultValue?has_content>${uiLabelMap.WebtoolsServiceDefault}
${serviceParameter.defaultValue}</#if>
+ <#if
serviceParameter.defaultValue?has_content>${uiLabelMap.WebtoolsServiceDefault}
${serviceParameter.defaultValue?string}</#if>
</td>
</tr>
</#list>
