svn commit: r757069 [2/3] - in /ofbiz/trunk/framework/service
Locked
 
|
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfoException.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfoException.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfoException.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfoException.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -35,7 +35,7 @@ * Recurrence Rule Object */ public class RecurrenceRule { - + public static final String module = RecurrenceRule.class.getName(); // ********************** @@ -98,7 +98,7 @@ protected List byMonthList; protected List bySetPosList; - /** + /** * Creates a new RecurrenceRule object from a RecurrenceInfo entity. *@param rule GenericValue object defining this rule. */ @@ -109,7 +109,7 @@ init(); } - /** + /** * Initializes the rules for this RecurrenceInfo object. *@throws RecurrenceRuleException */ @@ -118,7 +118,7 @@ String freq = rule.getString("frequency"); if (!checkFreq(freq)) - throw new RecurrenceRuleException("Recurrence FREQUENCY is a required parameter."); + throw new RecurrenceRuleException("Recurrence FREQUENCY is a required parameter."); if (rule.getLong("intervalNumber").longValue() < 1) throw new RecurrenceRuleException("Recurrence INTERVAL must be a positive integer."); @@ -133,7 +133,7 @@ byMonthList = StringUtil.split(rule.getString("byMonthList"), ","); bySetPosList = StringUtil.split(rule.getString("bySetPosList"), ","); } - + // Checks for a valid frequency property. private boolean checkFreq(String freq) { if (freq == null) @@ -155,7 +155,7 @@ return false; } - /** + /** * Gets the end time of the recurrence rule or 0 if none. *@return long The timestamp of the end time for this rule or 0 for none. */ @@ -169,7 +169,7 @@ stamp = rule.getTimestamp("untilDateTime"); Debug.logVerbose("Stamp value: " + stamp, module); - + if (stamp != null) { long nanos = (long) stamp.getNanos(); time = stamp.getTime(); @@ -179,7 +179,7 @@ return time; } - /** + /** * Get the number of times this recurrence will run (-1 until end time). *@return long The number of time this recurrence will run. */ @@ -189,7 +189,7 @@ return 0; } - /** + /** * Returns the frequency name of the recurrence. *@return String The name of this frequency. */ @@ -197,7 +197,7 @@ return rule.getString("frequency").toUpperCase(); } - /** + /** * Returns the frequency of this recurrence. *@return int The reference value for the frequency */ @@ -223,7 +223,7 @@ return 0; } - /** + /** * Returns the interval of the frequency. *@return long Interval value */ @@ -233,7 +233,7 @@ return rule.getLong("intervalNumber").longValue(); } - /** + /** * Returns the interval of the frequency as an int. *@return The interval of this frequency as an integer. */ @@ -242,7 +242,7 @@ return (int) getInterval(); } - /** + /** * Returns the next recurrence of this rule. *@param startTime The time this recurrence first began. *@param fromTime The time to base the next recurrence on. @@ -255,12 +255,12 @@ startTime = RecurrenceUtil.now(); if (fromTime == 0) fromTime = startTime; - + // Test the end time of the recurrence. if (getEndTime() != 0 && getEndTime() <= RecurrenceUtil.now()) return 0; Debug.logVerbose("Rule NOT expired by end time.", module); - + // Test the recurrence limit. if (getCount() != -1 && currentCount >= getCount()) return 0; @@ -284,9 +284,9 @@ return nextRuntime; } - /** - * Gets the current recurrence (current for the checkTime) of this rule and returns it if it is valid. - * If the current recurrence is not valid, doesn't try to find a valid one, instead returns 0. + /** + * Gets the current recurrence (current for the checkTime) of this rule and returns it if it is valid. + * If the current recurrence is not valid, doesn't try to find a valid one, instead returns 0. *@param startTime The time this recurrence first began. *@param checkTime The time to base the current recurrence on. *@param currentCount The total number of times the recurrence has run. @@ -299,12 +299,12 @@ if (checkTime == 0) { checkTime = startTime; } - + // Test the end time of the recurrence. if (getEndTime() != 0 && getEndTime() <= RecurrenceUtil.now()) { return 0; } - + // Test the recurrence limit. if (getCount() != -1 && currentCount >= getCount()) { return 0; @@ -316,15 +316,15 @@ Calendar checkTimeCal = Calendar.getInstance(); cal.setTime(nextRun); checkTimeCal.setTime(new Date(checkTime)); - + // Get previous frequency and update its values from checkTime - switch (getFrequency()) { + switch (getFrequency()) { case YEARLY: cal.add(Calendar.YEAR, -getIntervalInt()); if (cal.get(Calendar.YEAR) != checkTimeCal.get(Calendar.YEAR)) { return 0; } - + case MONTHLY: if (MONTHLY == getFrequency()) { cal.add(Calendar.MONTH, -getIntervalInt()); @@ -334,7 +334,7 @@ } else { cal.set(Calendar.MONTH, checkTimeCal.get(Calendar.MONTH)); } - + case WEEKLY: if (WEEKLY == getFrequency()) { cal.add(Calendar.WEEK_OF_YEAR, -getIntervalInt()); @@ -390,11 +390,11 @@ if (validByRule(cal.getTime())) { return cal.getTime().getTime(); } - + return 0; } - - /** + + /** * Tests the date to see if it falls within the rules *@param startDate date object to test *@return True if the date is within the rules @@ -403,7 +403,7 @@ return isValid(startDate.getTime(), date.getTime()); } - /** + /** * Tests the date to see if it falls within the rules *@param startTime date object to test *@return True if the date is within the rules @@ -421,7 +421,7 @@ return false; } - /** + /** * Removes this rule from the persistant store. *@throws RecurrenceRuleException */ @@ -751,7 +751,7 @@ throws RecurrenceRuleException { return makeRule(delegator, frequency, interval, -1, endTime); } - + public static RecurrenceRule makeRule(GenericDelegator delegator, int frequency, int interval, int count, long endTime) throws RecurrenceRuleException { String freq[] = {"", "SECONDLY", "MINUTELY", "HOURLY", "DAILY", "WEEKLY", "MONTHLY", "YEARLY"}; @@ -760,7 +760,7 @@ throw new RecurrenceRuleException("Invalid frequency"); if (interval < 0) throw new RecurrenceRuleException("Invalid interval"); - + String freqStr = freq[frequency]; try { Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRuleException.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRuleException.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRuleException.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRuleException.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceUtil.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceUtil.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceUtil.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceUtil.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpression.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpression.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpression.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpression.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -27,12 +27,12 @@ /** Temporal expression abstract class. */ public abstract class TemporalExpression implements Serializable, Comparable<TemporalExpression> { protected TemporalExpression() {} - + /** Field used to sort expressions. Expression evaluation depends * on correct ordering. Expressions are evaluated from lowest value * to highest value. */ protected int sequence = Integer.MAX_VALUE; - + /** Field used to sort expressions. Expression evaluation depends * on correct ordering. Expressions are evaluated from lowest value * to highest value. */ @@ -41,14 +41,14 @@ /** A unique ID for this expression. This field is intended to be used by * persistence classes. */ protected String id = null; - + /** Returns true if this expression includes the specified date. * @param cal A date to evaluate * @return true if this expression includes the date represented by * <code>cal</code> */ public abstract boolean includesDate(Calendar cal); - + /** Returns a date representing the first occurrence of this expression * on or after a specified date. Returns <code>null</code> if there * is no matching date. @@ -57,7 +57,7 @@ * or <code>null</code> if no matching date is found */ public abstract Calendar first(Calendar cal); - + /** Returns a date representing the next occurrence of this expression * after a specified date. Returns <code>null</code> if there * is no matching date. Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionVisitor.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionVisitor.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionVisitor.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionVisitor.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionWorker.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionWorker.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionWorker.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressions.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressions.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressions.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressions.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -437,7 +437,7 @@ protected final int endSecs; protected final int endMins; protected final int endHrs; - + /** * @param start A time String in the form of hh:mm:ss (24 hr clock) * @param end A time String in the form of hh:mm:ss (24 hr clock) @@ -595,7 +595,7 @@ public static class DayOfWeekRange extends TemporalExpression { protected final int start; protected final int end; - + /** * @param start An integer in the range of <code>Calendar.SUNDAY</code> * to <code>Calendar.SATURDAY</code> @@ -691,7 +691,7 @@ public static class MonthRange extends TemporalExpression { protected final int start; protected final int end; - + /** * @param start An integer in the range of <code>Calendar.JANUARY</code> * to <code>Calendar.UNDECIMBER</code> @@ -789,7 +789,7 @@ public static class DayOfMonthRange extends TemporalExpression { protected final int start; protected final int end; - + /** * @param start An integer in the range of 1 to 31 * @param end An integer in the range of 1 to 31 @@ -870,7 +870,7 @@ public static class DayInMonth extends TemporalExpression { protected final int dayOfWeek; protected final int occurrence; - + /** * @param dayOfWeek An integer in the range of <code>Calendar.SUNDAY</code> * to <code>Calendar.SATURDAY</code> @@ -986,7 +986,7 @@ protected final Date start; protected final int freqType; protected final int freqCount; - + /** * @param start Starting date, defaults to current system time * @param freqType One of the following integer values: <code>Calendar.SECOND Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/config/ServiceConfigUtil.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/config/ServiceConfigUtil.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/config/ServiceConfigUtil.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/config/ServiceConfigUtil.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -37,7 +37,7 @@ * Misc. utility method for dealing with the serviceengine.xml file */ public class ServiceConfigUtil implements Serializable { - + public static final String module = ServiceConfigUtil.class.getName(); public static final String engine = "default"; public static final String SERVICE_ENGINE_XML_FILENAME = "serviceengine.xml"; @@ -56,10 +56,10 @@ } catch (GenericConfigException e) { Debug.logError(e, "Error getting Service Engine XML root element", module); } - return UtilXml.firstChildElement(rootElement, elementName); + return UtilXml.firstChildElement(rootElement, elementName); } - - public static String getElementAttr(String elementName, String attrName) { + + public static String getElementAttr(String elementName, String attrName) { Element element = getElement(elementName); if (element == null) return null; @@ -67,23 +67,23 @@ } public static String getSendPool() { - return getElementAttr("thread-pool", "send-to-pool"); + return getElementAttr("thread-pool", "send-to-pool"); } - + public static List<String> getRunPools() { List<String> readPools = null; - + Element threadPool = getElement("thread-pool"); List<? extends Element> readPoolElements = UtilXml.childElementList(threadPool, "run-from-pool"); if (readPoolElements != null) { - readPools = FastList.newInstance(); + readPools = FastList.newInstance(); for (Element e: readPoolElements) { readPools.add(e.getAttribute("name")); } } return readPools; } - + public static int getPurgeJobDays() { String days = getElementAttr("thread-pool", "purge-job-days"); int purgeDays; @@ -144,7 +144,7 @@ return null; } - + public static class NotificationGroup implements Serializable { protected Notification notification; protected List<Notify> notify; Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -52,7 +52,7 @@ protected boolean resultToContext = true; protected boolean resultToResult = false; protected boolean ignoreFailure = false; - protected boolean ignoreError = false; + protected boolean ignoreError = false; protected boolean persist = false; protected ServiceEcaAction() {} @@ -65,7 +65,7 @@ // support the old, inconsistent attribute name if (UtilValidate.isEmail(this.runAsUser)) this.runAsUser = action.getAttribute("runAsUser"); this.resultMapName = action.getAttribute("result-map-name"); - + // default is true, so anything but false is true this.resultToContext = !"false".equals(action.getAttribute("result-to-context")); // default is false, so anything but true is false @@ -75,15 +75,15 @@ this.ignoreError = !"false".equals(action.getAttribute("ignore-error")); this.persist = "true".equals(action.getAttribute("persist")); } - + public String getServiceName() { return this.serviceName; } - + public String getServiceMode() { return this.serviceMode; } - + public boolean isPersist() { return this.persist; } @@ -91,7 +91,7 @@ public String getShortDisplayDescription() { return this.serviceName + "[" + this.serviceMode + (this.persist ? "-persist" : "") + "]"; } - + public boolean runAction(String selfService, DispatchContext dctx, Map<String, Object> context, Map<String, Object> result) throws GenericServiceException { if (serviceName.equals(selfService)) { throw new GenericServiceException("Cannot invoke self on ECA."); @@ -102,7 +102,7 @@ // set the userLogin object in the context actionContext.put("userLogin", ServiceUtil.getUserLogin(dctx, actionContext, runAsUser)); - + Map<String, Object> actionResult = null; LocalDispatcher dispatcher = dctx.getDispatcher(); // if SECAs have been turned off, then just return true which has same effect as if secas ran successfully @@ -238,7 +238,7 @@ return success; } - + public boolean equals(Object obj) { if (obj instanceof ServiceEcaAction) { ServiceEcaAction other = (ServiceEcaAction) obj; @@ -248,14 +248,14 @@ if (!UtilValidate.areEqual(this.serviceMode, other.serviceMode)) return false; if (!UtilValidate.areEqual(this.resultMapName, other.resultMapName)) return false; if (!UtilValidate.areEqual(this.runAsUser, other.runAsUser)) return false; - + if (this.newTransaction != other.newTransaction) return false; if (this.resultToContext != other.resultToContext) return false; if (this.resultToResult != other.resultToResult) return false; if (this.ignoreFailure != other.ignoreFailure) return false; if (this.ignoreError != other.ignoreError) return false; if (this.persist != other.persist) return false; - + return true; } else { return false; Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaCondition.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaCondition.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaCondition.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -37,7 +37,7 @@ * ServiceEcaCondition */ public class ServiceEcaCondition implements java.io.Serializable { - + public static final String module = ServiceEcaCondition.class.getName(); protected String conditionService = null; @@ -94,7 +94,7 @@ buf.append(":").append(operator).append(":"); if (UtilValidate.isNotEmpty(rhsMapName)) buf.append(rhsMapName).append("."); buf.append(rhsValueName); - + if (moreDetail) { if (UtilValidate.isNotEmpty(compareType)) { buf.append("-"); @@ -224,10 +224,10 @@ if (!UtilValidate.areEqual(this.operator, other.operator)) return false; if (!UtilValidate.areEqual(this.compareType, other.compareType)) return false; if (!UtilValidate.areEqual(this.format, other.format)) return false; - + if (this.isConstant != other.isConstant) return false; if (this.isService != other.isService) return false; - + return true; } else { return false; Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -70,7 +70,7 @@ } if (Debug.verboseOn()) Debug.logVerbose("Conditions: " + conditions, module); - + Set<String> nameSet = UtilMisc.toSet("set", "action"); for (Element actionOrSetElement: UtilXml.childElementList(eca, nameSet)) { if ("action".equals(actionOrSetElement.getNodeName())) { @@ -86,19 +86,19 @@ public String getShortDisplayName() { return this.serviceName + ":" + this.eventName; } - + public String getServiceName() { return this.serviceName; } - + public String getEventName() { return this.eventName; } - + public String getDefinitionLocation() { return this.definitionLocation; } - + public List<ServiceEcaAction> getEcaActionList() { List<ServiceEcaAction> actionList = FastList.newInstance(); for (Object actionOrSet: this.actionsAndSets) { @@ -108,13 +108,13 @@ } return actionList; } - + public List<ServiceEcaCondition> getEcaConditionList() { List<ServiceEcaCondition> condList = FastList.newInstance(); condList.addAll(this.conditions); return condList; } - + public void eval(String serviceName, DispatchContext dctx, Map<String, Object> context, Map<String, Object> result, boolean isError, boolean isFailure, Set<String> actionsRun) throws GenericServiceException { if (!enabled) { Debug.logInfo("Service ECA [" + this.serviceName + "] on [" + this.eventName + "] is disabled; not running.", module); @@ -169,7 +169,7 @@ public boolean isEnabled() { return this.enabled; } - + public boolean equals(Object obj) { if (obj instanceof ServiceEcaRule) { ServiceEcaRule other = (ServiceEcaRule) obj; @@ -177,11 +177,11 @@ if (!UtilValidate.areEqual(this.eventName, other.eventName)) return false; if (!this.conditions.equals(other.conditions)) return false; if (!this.actionsAndSets.equals(other.actionsAndSets)) return false; - + if (this.runOnFailure != other.runOnFailure) return false; if (this.runOnError != other.runOnError) return false; if (this.enabled != other.enabled) return false; - + return true; } else { return false; Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -62,7 +62,7 @@ // process the context changes if (UtilValidate.isNotEmpty(value)) { - context.put(fieldName, this.format(value, context)); + context.put(fieldName, this.format(value, context)); } else if (UtilValidate.isNotEmpty(envName) && context.get(envName) != null) { context.put(fieldName, this.format((String) context.get(envName), context)); } @@ -70,7 +70,7 @@ } protected Object format(String s, Map<String, ? extends Object> c) { - if (UtilValidate.isEmpty(s) || UtilValidate.isEmpty(format)) { + if (UtilValidate.isEmpty(s) || UtilValidate.isEmpty(format)) { return s; } @@ -81,7 +81,7 @@ newStr.append(c.get(envName)); } newStr.append(s); - return newStr.toString(); + return newStr.toString(); } if ("to-upper".equalsIgnoreCase(format)) { return s.toUpperCase(); @@ -125,7 +125,7 @@ if (!UtilValidate.areEqual(this.envName, other.envName)) return false; if (!UtilValidate.areEqual(this.value, other.value)) return false; if (!UtilValidate.areEqual(this.format, other.format)) return false; - + return true; } else { return false; Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -90,7 +90,7 @@ } catch (GenericConfigException e) { Debug.logError(e, "Could not get resource URL", module); } - + int numDefs = 0; for (Element e: UtilXml.childElementList(rootElement, "eca")) { String serviceName = e.getAttribute("service"); Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/AbstractEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/AbstractEngine.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/AbstractEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/AbstractEngine.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/BSFEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/BSFEngine.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/BSFEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/BSFEngine.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -38,21 +38,21 @@ * BSF Service Engine */ public class BSFEngine extends GenericAsyncEngine { - + public static final String module = BSFEngine.class.getName(); public static UtilCache<String, String> scriptCache = new UtilCache<String, String>("BSFScripts", 0, 0); - + public BSFEngine(ServiceDispatcher dispatcher) { super(dispatcher); } - + /** * @see org.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ public void runSyncIgnore(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { runSync(localName, modelService, context); } - + /** * @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ @@ -63,7 +63,7 @@ throw new GenericServiceException("Service did not return expected result"); return UtilGenerics.checkMap(result); } - + // Invoke the BSF Script. private Object serviceInvoker(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { if (modelService.location == null || modelService.invoke == null) @@ -71,7 +71,7 @@ // get the DispatchContext from the localName and ServiceDispatcher DispatchContext dctx = dispatcher.getLocalContext(localName); - + // get the classloader to use ClassLoader cl = null; @@ -89,15 +89,15 @@ mgr.registerBean("dctx", dctx); mgr.registerBean("context", context); - + // pre-load the engine to make sure we were called right - org.apache.bsf.BSFEngine bsfEngine = null; + org.apache.bsf.BSFEngine bsfEngine = null; try { bsfEngine = mgr.loadScriptingEngine(modelService.engineName); } catch (BSFException e) { throw new GenericServiceException("Problems loading org.apache.bsf.BSFEngine: " + modelService.engineName, e); } - + // source the script into a string String script = scriptCache.get(localName + "_" + location); @@ -123,15 +123,15 @@ scriptCache.put(localName + "_" + location, script); } } - } - + } + // now invoke the script try { bsfEngine.exec(location, 0, 0, script); } catch (BSFException e) { throw new GenericServiceException("Script invocation error", e); } - - return mgr.lookupBean("response"); + + return mgr.lookupBean("response"); } } Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/BeanShellEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/BeanShellEngine.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/BeanShellEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/BeanShellEngine.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -41,14 +41,14 @@ public BeanShellEngine(ServiceDispatcher dispatcher) { super(dispatcher); } - + /** * @see org.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ public void runSyncIgnore(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { runSync(localName, modelService, context); } - + /** * @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ @@ -64,10 +64,10 @@ String location = this.getLocation(modelService); context.put("dctx", dispatcher.getLocalContext(localName)); - + try { Object resultObj = BshUtil.runBshAtLocation(location, context); - + if (resultObj != null && resultObj instanceof Map) { Debug.logInfo("Got result Map from script return: " + resultObj, module); return cast(resultObj); Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -73,16 +73,16 @@ if (modelService.invoke == null || (!"create".equals(modelService.invoke) && !"update".equals(modelService.invoke) && !"delete".equals(modelService.invoke))) { throw new GenericServiceException("In Service [" + modelService.name + "] the invoke value must be create, update, or delete for entity-auto engine"); } - + if (UtilValidate.isEmpty(modelService.defaultEntityName)) { throw new GenericServiceException("In Service [" + modelService.name + "] you must specify a default-entity-name for entity-auto engine"); } - + ModelEntity modelEntity = dctx.getDelegator().getModelEntity(modelService.defaultEntityName); if (modelEntity == null) { throw new GenericServiceException("In Service [" + modelService.name + "] the specified default-entity-name [" + modelService.defaultEntityName + "] is not valid"); } - + try { boolean allPksInOnly = true; for (ModelField pkField: modelEntity.getPkFieldsUnmodifiable()) { @@ -91,19 +91,19 @@ allPksInOnly = false; } } - + if ("create".equals(modelService.invoke)) { GenericValue newEntity = dctx.getDelegator().makeValue(modelEntity.getEntityName()); - + boolean isSinglePk = modelEntity.getPksSize() == 1; boolean isDoublePk = modelEntity.getPksSize() == 2; Iterator<ModelField> pksIter = modelEntity.getPksIterator(); - + ModelField singlePkModeField = isSinglePk ? pksIter.next() : null; - ModelParam singlePkModelParam = isSinglePk ? modelService.getParam(singlePkModeField.getName()) : null; + ModelParam singlePkModelParam = isSinglePk ? modelService.getParam(singlePkModeField.getName()) : null; boolean isSinglePkIn = isSinglePk ? singlePkModelParam.isIn() : false; boolean isSinglePkOut = isSinglePk ? singlePkModelParam.isOut() : false; - + ModelParam doublePkPrimaryInParam = null; ModelParam doublePkSecondaryOutParam = null; ModelField doublePkSecondaryOutField = null; @@ -124,14 +124,14 @@ // we don't have an IN and an OUT... so do nothing and leave them null } } - - + + if (isSinglePk && isSinglePkOut && !isSinglePkIn) { /* **** primary sequenced primary key **** - * + * <auto-attributes include="pk" mode="OUT" optional="false"/> - * + * <make-value entity-name="Example" value-name="newEntity"/> <sequenced-id-to-env sequence-name="Example" env-name="newEntity.exampleId"/> <!-- get the next sequenced ID --> <field-to-result field-name="newEntity.exampleId" result-name="exampleId"/> @@ -139,16 +139,16 @@ <create-value value-name="newEntity"/> * */ - + String sequencedId = dctx.getDelegator().getNextSeqId(modelEntity.getEntityName()); newEntity.set(singlePkModeField.getName(), sequencedId); result.put(singlePkModelParam.name, sequencedId); } else if (isSinglePk && isSinglePkOut && isSinglePkIn) { /* **** primary sequenced key with optional override passed in **** - * + * <auto-attributes include="pk" mode="INOUT" optional="true"/> - * + * <make-value value-name="newEntity" entity-name="Product"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <set from-field="parameters.productId" field="newEntity.productId"/> @@ -161,7 +161,7 @@ </if-empty> <field-to-result field-name="productId" map-name="newEntity" result-name="productId"/> <create-value value-name="newEntity"/> - * + * */ Object pkValue = parameters.get(singlePkModelParam.name); @@ -169,7 +169,7 @@ pkValue = dctx.getDelegator().getNextSeqId(modelEntity.getEntityName()); } else { // pkValue passed in, check and if there are problems return an error - + if (pkValue instanceof String) { StringBuffer errorDetails = new StringBuffer(); if (!UtilValidate.isValidDatabaseId((String) pkValue, errorDetails)) { @@ -182,27 +182,27 @@ } else if (isDoublePk && doublePkPrimaryInParam != null && doublePkSecondaryOutParam != null) { /* **** secondary sequenced primary key **** - * + * <auto-attributes include="pk" mode="IN" optional="false"/> <override name="exampleItemSeqId" mode="OUT"/> <!-- make this OUT rather than IN, we will automatically generate the next sub-sequence ID --> - * + * <make-value entity-name="ExampleItem" value-name="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <make-next-seq-id value-name="newEntity" seq-field-name="exampleItemSeqId"/> <!-- this finds the next sub-sequence ID --> <field-to-result field-name="newEntity.exampleItemSeqId" result-name="exampleItemSeqId"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <create-value value-name="newEntity"/> + <create-value value-name="newEntity"/> */ - + newEntity.setPKFields(parameters, true); dctx.getDelegator().setNextSubSeqId(newEntity, doublePkSecondaryOutField.getName(), 5, 1); result.put(doublePkSecondaryOutParam.name, newEntity.get(doublePkSecondaryOutField.getName())); } else if (allPksInOnly) { /* **** plain specified primary key **** - * + * <auto-attributes include="pk" mode="IN" optional="false"/> - * + * <make-value entity-name="Example" value-name="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> @@ -218,7 +218,7 @@ "3. a 2-part pk with one part IN (existing primary pk) and one part OUT (the secdonary pk to sub-sequence, " + "4. all pk fields are IN for a manually specified primary key"); } - + // handle the case where there is a fromDate in the pk of the entity, and it is optional or undefined in the service def, populate automatically ModelField fromDateField = modelEntity.getField("fromDate"); if (fromDateField != null && fromDateField.getIsPk()) { @@ -227,18 +227,18 @@ newEntity.set("fromDate", UtilDateTime.nowTimestamp()); } } - + newEntity.setNonPKFields(parameters, true); newEntity.create(); } else if ("update".equals(modelService.invoke)) { /* <auto-attributes include="pk" mode="IN" optional="false"/> - * + * <entity-one entity-name="ExampleItem" value-name="lookedUpValue"/> <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/> <store-value value-name="lookedUpValue"/> */ - + // check to make sure that all primary key fields are defined as IN attributes if (!allPksInOnly) { throw new GenericServiceException("In Service [" + modelService.name + "] which uses the entity-auto engine with the update invoke option not all pk fields have the mode IN"); @@ -248,14 +248,14 @@ if (lookedUpValue == null) { return ServiceUtil.returnError("Value not found, cannot update"); } - + localContext.put("lookedUpValue", lookedUpValue); - + // populate the oldStatusId out if there is a service parameter for it, and before we do the set non-pk fields /* <auto-attributes include="pk" mode="IN" optional="false"/> <attribute name="oldStatusId" type="String" mode="OUT" optional="false"/> - * + * <field-to-result field-name="lookedUpValue.statusId" result-name="oldStatusId"/> */ ModelParam statusIdParam = modelService.getParam("statusId"); @@ -264,7 +264,7 @@ if (statusIdParam != null && statusIdParam.isIn() && oldStatusIdParam != null && oldStatusIdParam.isOut() && statusIdField != null) { result.put("oldStatusId", lookedUpValue.get("statusId")); } - + // do the StatusValidChange check /* <if-compare-field field="lookedUpValue.statusId" operator="not-equals" to-field="parameters.statusId"> @@ -295,24 +295,24 @@ } } } - + // NOTE: nothing here to maintain the status history, that should be done with a custom service called by SECA rule - + lookedUpValue.setNonPKFields(parameters, true); lookedUpValue.store(); } else if ("delete".equals(modelService.invoke)) { /* <auto-attributes include="pk" mode="IN" optional="false"/> - * + * <entity-one entity-name="ExampleItem" value-name="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> */ - + // check to make sure that all primary key fields are defined as IN attributes if (!allPksInOnly) { throw new GenericServiceException("In Service [" + modelService.name + "] which uses the entity-auto engine with the delete invoke option not all pk fields have the mode IN"); } - + GenericValue lookedUpValue = PrimaryKeyFinder.runFind(modelEntity, parameters, dctx.getDelegator(), false, true, null, null); if (lookedUpValue != null) { lookedUpValue.remove(); Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericAsyncEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericAsyncEngine.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericAsyncEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericAsyncEngine.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -48,18 +48,18 @@ * Generic Asynchronous Engine */ public abstract class GenericAsyncEngine extends AbstractEngine { - + public static final String module = GenericAsyncEngine.class.getName(); protected GenericAsyncEngine(ServiceDispatcher dispatcher) { - super(dispatcher); + super(dispatcher); } /** * @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ public abstract Map<String, Object> runSync(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException; - + /** * @see org.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ @@ -71,7 +71,7 @@ public void runAsync(String localName, ModelService modelService, Map<String, Object> context, boolean persist) throws GenericServiceException { runAsync(localName, modelService, context, null, persist); } - + /** * @see org.ofbiz.service.engine.GenericEngine#runAsync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map, org.ofbiz.service.GenericRequester, boolean) */ Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericEngine.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericEngine.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -34,7 +34,7 @@ /** * Run the service synchronously and return the result. - * + * * @param localName Name of the LocalDispatcher. * @param modelService Service model object. * @param context Map of name, value pairs composing the context. @@ -45,7 +45,7 @@ /** * Run the service synchronously and IGNORE the result. - * + * * @param localName Name of the LocalDispatcher. * @param modelService Service model object. * @param context Map of name, value pairs composing the context. @@ -55,7 +55,7 @@ /** * Run the service asynchronously, passing an instance of GenericRequester that will receive the result. - * + * * @param localName Name of the LocalDispatcher. * @param modelService Service model object. * @param context Map of name, value pairs composing the context. @@ -68,7 +68,7 @@ /** * Run the service asynchronously and IGNORE the result. - * + * * @param localName Name of the LocalDispatcher. * @param modelService Service model object. * @param context Map of name, value pairs composing the context. @@ -80,7 +80,7 @@ /** * Send the service callbacks * @param modelService Service model object - * @param context Map of name, value pairs composing the context + * @param context Map of name, value pairs composing the context * @param cbObj Object to return to callback (Throwable or Map) * @param mode Service mode (sync or async) * @throws GenericServiceException Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -37,18 +37,18 @@ protected ServiceDispatcher dispatcher = null; protected Map<String, GenericEngine> engines = null; - + public GenericEngineFactory(ServiceDispatcher dispatcher) { this.dispatcher = dispatcher; engines = FastMap.newInstance(); } - /** + /** * Gets the GenericEngine instance that corresponds to given the name *@param engineName Name of the engine *@return GenericEngine that corresponds to the engineName */ - public GenericEngine getGenericEngine(String engineName) throws GenericServiceException { + public GenericEngine getGenericEngine(String engineName) throws GenericServiceException { Element rootElement = null; try { Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -37,14 +37,14 @@ public GroovyEngine(ServiceDispatcher dispatcher) { super(dispatcher); } - + /** * @see org.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ public void runSyncIgnore(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { runSync(localName, modelService, context); } - + /** * @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ @@ -59,10 +59,10 @@ String location = this.getLocation(modelService); context.put("dctx", dispatcher.getLocalContext(localName)); - + try { Object resultObj = GroovyUtil.runScriptAtLocation(location, context); - + if (resultObj != null && resultObj instanceof Map) { return cast(resultObj); } else if (context.get("result") != null && context.get("result") instanceof Map) { Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/HttpEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/HttpEngine.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/HttpEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/HttpEngine.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -43,41 +43,41 @@ * HttpEngine.java */ public class HttpEngine extends GenericAsyncEngine { - + public static final String module = HttpEngine.class.getName(); private static final boolean exportAll = false; public HttpEngine(ServiceDispatcher dispatcher) { super(dispatcher); } - + /** * @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ - public Map<String, Object> runSync(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { + public Map<String, Object> runSync(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { DispatchContext dctx = dispatcher.getLocalContext(localName); String xmlContext = null; - + try { if (Debug.verboseOn()) Debug.logVerbose("Serializing Context --> " + context, module); xmlContext = XmlSerializer.serialize(context); } catch (Exception e) { throw new GenericServiceException("Cannot serialize context.", e); } - + Map<String, Object> parameters = FastMap.newInstance(); parameters.put("serviceName", modelService.invoke); if (xmlContext != null) parameters.put("serviceContext", xmlContext); - + HttpClient http = new HttpClient(this.getLocation(modelService), parameters); - String postResult = null; + String postResult = null; try { postResult = http.post(); } catch (HttpClientException e) { throw new GenericServiceException("Problems invoking HTTP request", e); } - + Map<String, Object> result = null; try { Object res = XmlSerializer.deserialize(postResult, dctx.getDelegator()); @@ -88,7 +88,7 @@ } catch (Exception e) { throw new GenericServiceException("Problems deserializing result.", e); } - + return result; } @@ -97,8 +97,8 @@ */ public void runSyncIgnore(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { Map<String, Object> result = runSync(localName, modelService, context); - } - + } + /** * Event for handling HTTP services * @param request HttpServletRequest object @@ -108,20 +108,20 @@ public static String httpEngine(HttpServletRequest request, HttpServletResponse response) { LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); - + String serviceName = request.getParameter("serviceName"); String serviceMode = request.getParameter("serviceMode"); String xmlContext = request.getParameter("serviceContext"); - + Map<String, Object> result = FastMap.newInstance(); Map<String, Object> context = null; - + if (serviceName == null) result.put(ModelService.ERROR_MESSAGE, "Cannot have null service name"); - + if (serviceMode == null) serviceMode = "SYNC"; - + // deserialize the context if (!result.containsKey(ModelService.ERROR_MESSAGE)) { if (xmlContext != null) { @@ -139,9 +139,9 @@ } } } - + // invoke the service - if (!result.containsKey(ModelService.ERROR_MESSAGE)) { + if (!result.containsKey(ModelService.ERROR_MESSAGE)) { try { ModelService model = dispatcher.getDispatchContext().getModelService(serviceName); if (model.export || exportAll) { @@ -159,10 +159,10 @@ result.put(ModelService.ERROR_MESSAGE, "Service invocation error: " + e.toString()); } } - + // backup error message StringBuilder errorMessage = new StringBuilder(); - + // process the result String resultString = null; try { @@ -174,12 +174,12 @@ errorMessage.append("::"); errorMessage.append(e); } - + // handle the response try { PrintWriter out = response.getWriter(); response.setContentType("plain/text"); - + if (errorMessage.length() > 0) { response.setContentLength(errorMessage.length()); out.write(errorMessage.toString()); @@ -187,16 +187,16 @@ response.setContentLength(resultString.length()); out.write(resultString); } - + out.flush(); response.flushBuffer(); } catch (IOException e) { Debug.logError(e, "Problems w/ getting the servlet writer.", module); return "error"; } - + return null; } - + } Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/InterfaceEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/InterfaceEngine.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/InterfaceEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/InterfaceEngine.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,7 +29,7 @@ * InterfaceEngine.java */ public class InterfaceEngine implements GenericEngine { - + public InterfaceEngine(ServiceDispatcher dispatcher) { } /** @@ -42,7 +42,7 @@ /** * @see org.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ - public void runSyncIgnore(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { + public void runSyncIgnore(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { throw new GenericServiceException("Interface services cannot be invoked; try invoking an implementing service."); } @@ -51,12 +51,12 @@ */ public void runAsync(String localName, ModelService modelService, Map<String, Object> context, GenericRequester requester, boolean persist) throws GenericServiceException { throw new GenericServiceException("Interface services cannot be invoked; try invoking an implementing service."); - } + } /** * @see org.ofbiz.service.engine.GenericEngine#runAsync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map, boolean) */ - public void runAsync(String localName, ModelService modelService, Map<String, Object> context, boolean persist) throws GenericServiceException { + public void runAsync(String localName, ModelService modelService, Map<String, Object> context, boolean persist) throws GenericServiceException { throw new GenericServiceException("Interface services cannot be invoked; try invoking an implementing service."); } Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/RouteEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/RouteEngine.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/RouteEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/RouteEngine.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -36,9 +36,9 @@ /** * @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) - */ + */ public Map<String, Object> runSync(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { - return modelService.makeValid(context, ModelService.OUT_PARAM); + return modelService.makeValid(context, ModelService.OUT_PARAM); } /** Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -49,39 +49,39 @@ * Generic Service SOAP Interface */ public final class SOAPClientEngine extends GenericAsyncEngine { - + public static final String module = SOAPClientEngine.class.getName(); - + public SOAPClientEngine(ServiceDispatcher dispatcher) { super(dispatcher); } - + /** * @see org.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ public void runSyncIgnore(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { runSync(localName, modelService, context); } - + /** * @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ public Map<String, Object> runSync(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { Map<String, Object> result = serviceInvoker(modelService, context); - + if (result == null) throw new GenericServiceException("Service did not return expected result"); return result; } - + // Invoke the remote SOAP service private Map<String, Object> serviceInvoker(ModelService modelService, Map<String, Object> context) throws GenericServiceException { if (modelService.location == null || modelService.invoke == null) throw new GenericServiceException("Cannot locate service to invoke"); - + Service service = null; Call call = null; - + try { service = new Service(); call = (Call) service.createCall(); @@ -90,34 +90,34 @@ } catch (ServiceException e) {//Add by Andy.Chen 2003.01.15 throw new GenericServiceException("RPC service error", e); } - + URL endPoint = null; - + try { endPoint = new URL(this.getLocation(modelService)); } catch (MalformedURLException e) { throw new GenericServiceException("Location not a valid URL", e); } - + List<ModelParam> inModelParamList = modelService.getInModelParamList(); - + if (Debug.infoOn()) Debug.logInfo("[SOAPClientEngine.invoke] : Parameter length - " + inModelParamList.size(), module); - + call.setTargetEndpointAddress(endPoint); - + if (UtilValidate.isNotEmpty(modelService.nameSpace)) { call.setOperationName(new QName(modelService.nameSpace, modelService.invoke)); } else { call.setOperationName(modelService.invoke); } - + int i = 0; - + call.setOperation(call.getOperationName().getLocalPart()); List<Object> vParams = new ArrayList<Object>(); for (ModelParam p: inModelParamList) { if (Debug.infoOn()) Debug.logInfo("[SOAPClientEngine.invoke} : Parameter: " + p.name + " (" + p.mode + ") - " + i, module); - + // exclude params that ModelServiceReader insert into (internal params) if (!p.internal) { QName qName = call.getParameterTypeByName(p.name); //.getTypeMapping().getTypeQName((Class) ObjectType.classNameClassMap.get(p.type)); @@ -126,12 +126,12 @@ } i++; } - + call.setReturnType(XMLType.XSD_ANYTYPE); Object[] params=vParams.toArray(new Object[vParams.size()]); - + Object result = null; - + try { Debug.logInfo("[SOAPClientEngine.invoke] : Sending Call To SOAP Server", module); result = call.invoke(params); @@ -144,7 +144,7 @@ return getResponseParams(call.getMessageContext().getResponseMessage()); } - + private Map<String, Object> getResponseParams(Message respMessage) { Map<String, Object> mRet = FastMap.newInstance(); try { @@ -176,7 +176,7 @@ } return mRet; } - + private ParameterMode getMode(String sMode) { if (sMode.equals("IN")) { return ParameterMode.IN; Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/StandardJavaEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/StandardJavaEngine.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/StandardJavaEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/StandardJavaEngine.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupModel.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupModel.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupModel.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupModel.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -38,14 +38,14 @@ * GroupModel.java */ public class GroupModel { - + public static final String module = GroupModel.class.getName(); - - private String groupName, sendMode; + + private String groupName, sendMode; private List<GroupServiceModel> services; private boolean optional = false; private int lastServiceRan; - + /** * Constructor using DOM Element * @param group DOM element for the group @@ -74,7 +74,7 @@ if (Debug.verboseOn()) Debug.logVerbose("Created Service Group Model --> " + this, module); } - + /** * Basic Constructor * @param groupName Name of the group @@ -87,7 +87,7 @@ this.sendMode = sendMode; this.services = services; } - + /** * Getter for group name * @return String @@ -95,7 +95,7 @@ public String getGroupName() { return this.groupName; } - + /** * Getter for send mode * @return String @@ -103,7 +103,7 @@ public String getSendMode() { return this.sendMode; } - + /** * Returns a list of services in this group * @return List @@ -111,7 +111,7 @@ public List<GroupServiceModel> getServices() { return this.services; } - + /** * Invokes the group of services in order defined * @param dispatcher ServiceDispatcher used for invocation @@ -124,20 +124,20 @@ if (this.getSendMode().equals("all")) { return runAll(dispatcher, localName, context); } else if (this.getSendMode().equals("round-robin")) { - return runIndex(dispatcher, localName, context, (++lastServiceRan % services.size())); + return runIndex(dispatcher, localName, context, (++lastServiceRan % services.size())); } else if (this.getSendMode().equals("random")) { - int randomIndex = (int) (Math.random() * (double) (services.size())); + int randomIndex = (int) (Math.random() * (double) (services.size())); return runIndex(dispatcher, localName, context, randomIndex); } else if (this.getSendMode().equals("first-available")) { - return runOne(dispatcher, localName, context); + return runOne(dispatcher, localName, context); } else if (this.getSendMode().equals("none")) { - return FastMap.newInstance(); - } else { + return FastMap.newInstance(); + } else { throw new GenericServiceException("This mode is not currently supported"); } } - - /** + + /** * @see java.lang.Object#toString() */ public String toString() { @@ -145,11 +145,11 @@ str.append(getGroupName()); str.append("::"); str.append(getSendMode()); - str.append("::"); + str.append("::"); str.append(getServices()); return str.toString(); } - + private Map<String, Object> runAll(ServiceDispatcher dispatcher, String localName, Map<String, Object> context) throws GenericServiceException { Map<String, Object> runContext = UtilMisc.makeMapWritable(context); Map<String, Object> result = FastMap.newInstance(); @@ -157,13 +157,13 @@ if (Debug.verboseOn()) Debug.logVerbose("Using Context: " + runContext, module); Map<String, Object> thisResult = model.invoke(dispatcher, localName, runContext); if (Debug.verboseOn()) Debug.logVerbose("Result: " + thisResult, module); - + // make sure we didn't fail if (ServiceUtil.isError(thisResult)) { Debug.logError("Grouped service [" + model.getName() + "] failed.", module); return thisResult; } - + result.putAll(thisResult); if (model.resultToContext()) { runContext.putAll(thisResult); @@ -172,14 +172,14 @@ } return result; } - + private Map<String, Object> runIndex(ServiceDispatcher dispatcher, String localName, Map<String, Object> context, int index) throws GenericServiceException { GroupServiceModel model = services.get(index); return model.invoke(dispatcher, localName, context); - } - - private Map<String, Object> runOne(ServiceDispatcher dispatcher, String localName, Map<String, Object> context) throws GenericServiceException { - Map<String, Object> result = null; + } + + private Map<String, Object> runOne(ServiceDispatcher dispatcher, String localName, Map<String, Object> context) throws GenericServiceException { + Map<String, Object> result = null; for (GroupServiceModel model: services) { try { result = model.invoke(dispatcher, localName, context); @@ -191,5 +191,5 @@ throw new GenericServiceException("All services failed to run; none available."); } return result; - } + } } Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupServiceModel.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupServiceModel.java?rev=757069&r1=757068&r2=757069&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupServiceModel.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupServiceModel.java Sat Mar 21 23:23:25 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -34,13 +34,13 @@ * GroupServiceModel.java */ public class GroupServiceModel { - + public static final String module = GroupServiceModel.class.getName(); private String serviceName, serviceMode; private boolean resultToContext = false; private boolean optionalParams = false; - + /** * Constructor using DOM element * @param service DOM element for the service @@ -49,9 +49,9 @@ this.serviceName = service.getAttribute("name"); this.serviceMode = service.getAttribute("mode"); this.resultToContext = service.getAttribute("result-to-context").equalsIgnoreCase("true"); - this.optionalParams = service.getAttribute("parameters").equalsIgnoreCase("optional"); + this.optionalParams = service.getAttribute("parameters").equalsIgnoreCase("optional"); } - + /** * Basic constructor * @param serviceName name of the service @@ -60,8 +60,8 @@ public GroupServiceModel(String serviceName, String serviceMode) { this.serviceName = serviceName; this.serviceMode = serviceMode; - } - + } + /** * Getter for the service mode * @return String @@ -69,15 +69,15 @@ public String getMode() { return this.serviceMode; } - + /** * Getter for the service name * @return String */ public String getName() { return this.serviceName; - } - + } + /** * Returns true if the results of this service are to go back into the context * @return boolean @@ -93,7 +93,7 @@ public boolean isOptional() { return this.optionalParams; } - + /** * Invoker method to invoke this service * @param dispatcher ServiceDispatcher used for this invocation @@ -107,7 +107,7 @@ ModelService model = dctx.getModelService(getName()); if (model == null) throw new GenericServiceException("Group defined service (" + getName() + ") is not a defined service."); - + Map<String, Object> thisContext = model.makeValid(context, ModelService.IN_PARAM); Debug.logInfo("Running grouped service [" + serviceName + "]", module); if (getMode().equals("async")) { @@ -123,10 +123,10 @@ return dispatcher.runSync(localName, model, thisContext); } } - - /** + + /** * @see java.lang.Object#toString() - */ + */ public String toString() { StringBuilder str = new StringBuilder(); str.append(getName()); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |