You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2009/08/12 22:09:35 UTC
svn commit: r803693 [2/2] - in /ofbiz/branches/executioncontext20090812: ./
applications/accounting/ applications/content/ applications/humanres/
applications/manufacturing/ applications/marketing/ applications/order/
applications/party/ applications/p...
Modified: ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/GenericDelegator.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/GenericDelegator.java Wed Aug 12 20:09:32 2009
@@ -47,7 +47,7 @@
import org.xml.sax.SAXException;
/**
- * Delegator Interface
+ * Delegator Interface.
*/
public interface GenericDelegator {
@@ -1104,6 +1104,10 @@
public void setEntityEcaHandler(EntityEcaHandler<?> entityEcaHandler);
+ public void setExecutionContext(ExecutionContext executionContext);
+
+ public void setLocale(Locale locale);
+
/** Look at existing values for a sub-entity with a sequenced secondary ID, and get the highest plus 1 */
public void setNextSubSeqId(GenericValue value, String seqFieldName, int numericPadding, int incrementBy);
@@ -1111,8 +1115,6 @@
* if null is passed will effectively refresh the sequencer. */
public void setSequencer(SequenceUtil sequencer);
- public void setLocale(Locale locale);
-
public void setSessionIdentifier(String identifier);
public void setUserIdentifier(String identifier);
Modified: ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/GenericEntity.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/GenericEntity.java?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/GenericEntity.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/GenericEntity.java Wed Aug 12 20:09:32 2009
@@ -38,6 +38,7 @@
import javolution.util.FastList;
import javolution.util.FastMap;
+import org.ofbiz.api.context.ExecutionArtifact;
import org.ofbiz.base.crypto.HashCrypt;
import org.ofbiz.base.util.Base64;
import org.ofbiz.base.util.Debug;
@@ -65,7 +66,7 @@
* <code>Observer</code>.
*
*/
-public class GenericEntity extends Observable implements Map<String, Object>, LocalizedMap, Serializable, Comparable<GenericEntity>, Cloneable, Reusable {
+public class GenericEntity extends Observable implements Map<String, Object>, LocalizedMap, Serializable, Comparable<GenericEntity>, Cloneable, Reusable, ExecutionArtifact {
public static final String module = GenericEntity.class.getName();
public static final GenericEntity NULL_ENTITY = new NullGenericEntity();
@@ -1400,4 +1401,12 @@
return this != other ? -1 : 0;
}
}
+
+ public String getLocation() {
+ return this.modelEntity.getLocation();
+ }
+
+ public String getName() {
+ return this.entityName;
+ }
}
Modified: ofbiz/branches/executioncontext20090812/framework/entityext/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/entityext/build.xml?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/entityext/build.xml (original)
+++ ofbiz/branches/executioncontext20090812/framework/entityext/build.xml Wed Aug 12 20:09:32 2009
@@ -30,6 +30,7 @@
<property name="ofbiz.home.dir" value="../.."/>
<path id="local.class.path">
+ <fileset dir="../api/build/lib" includes="*.jar"/>
<fileset dir="../base/lib" includes="*.jar"/>
<fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
<fileset dir="../base/build/lib" includes="*.jar"/>
Modified: ofbiz/branches/executioncontext20090812/framework/example/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/example/build.xml?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/example/build.xml (original)
+++ ofbiz/branches/executioncontext20090812/framework/example/build.xml Wed Aug 12 20:09:32 2009
@@ -36,6 +36,7 @@
<path id="local.class.path">
<fileset dir="${lib.dir}" includes="*.jar"/>
+ <fileset dir="../api/build/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib" includes="*.jar"/>
<fileset dir="../../framework/base/build/lib" includes="*.jar"/>
<fileset dir="../../framework/entity/lib" includes="*.jar"/>
Modified: ofbiz/branches/executioncontext20090812/framework/example/widget/example/ExampleForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/example/widget/example/ExampleForms.xml?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/example/widget/example/ExampleForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/framework/example/widget/example/ExampleForms.xml Wed Aug 12 20:09:32 2009
@@ -22,6 +22,9 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
<form name="FindExamples" type="single" target="FindExample" default-entity-name="Example">
+ <!-- Uncomment this section to see the ExecutionContext in action
+ <field name="testField"><display description="${executionContext}"/></field>
+ -->
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="exampleId" title="${uiLabelMap.ExampleExampleId}"><text-find/></field>
<field name="exampleName" title="${uiLabelMap.CommonName}"><text-find/></field>
Modified: ofbiz/branches/executioncontext20090812/framework/example/widget/example/ExampleScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/example/widget/example/ExampleScreens.xml?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/example/widget/example/ExampleScreens.xml (original)
+++ ofbiz/branches/executioncontext20090812/framework/example/widget/example/ExampleScreens.xml Wed Aug 12 20:09:32 2009
@@ -37,6 +37,10 @@
<if-has-permission permission="EXAMPLE" action="_VIEW"/>
</condition>
<widgets>
+ <!-- Uncomment this section to see the ExecutionContext in action
+ <container style="button-bar"><label text="Execution path for this screen: ${executionContext}"/></container>
+ <container style="button-bar"><label text="What is contains: root/application/screen/screen/decorator/decorator"/></container>
+ -->
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="menu-bar">
<container style="button-bar"><link target="EditExample" text="${uiLabelMap.ExampleNewExample}" style="buttontext"/></container>
Modified: ofbiz/branches/executioncontext20090812/framework/minilang/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/minilang/build.xml?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/minilang/build.xml (original)
+++ ofbiz/branches/executioncontext20090812/framework/minilang/build.xml Wed Aug 12 20:09:32 2009
@@ -31,6 +31,7 @@
<path id="local.class.path">
<!-- <fileset dir="${lib.dir}" includes="*.jar"/> -->
+ <fileset dir="../api/build/lib" includes="*.jar"/>
<fileset dir="../base/lib" includes="*.jar"/>
<fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
<fileset dir="../base/lib/scripting" includes="*.jar"/>
Modified: ofbiz/branches/executioncontext20090812/framework/security/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/security/build.xml?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/security/build.xml (original)
+++ ofbiz/branches/executioncontext20090812/framework/security/build.xml Wed Aug 12 20:09:32 2009
@@ -34,6 +34,7 @@
<fileset dir="../base/lib" includes="*.jar"/>
<fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
<fileset dir="../base/build/lib" includes="*.jar"/>
+ <fileset dir="../api/build/lib" includes="*.jar"/>
<fileset dir="../entity/lib" includes="*.jar"/>
<fileset dir="../entity/build/lib" includes="*.jar"/>
</path>
Added: ofbiz/branches/executioncontext20090812/framework/security/src/org/ofbiz/security/ExecutionContext.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/security/src/org/ofbiz/security/ExecutionContext.java?rev=803693&view=auto
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/security/src/org/ofbiz/security/ExecutionContext.java (added)
+++ ofbiz/branches/executioncontext20090812/framework/security/src/org/ofbiz/security/ExecutionContext.java Wed Aug 12 20:09:32 2009
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.ofbiz.security;
+
+/**
+ * ExecutionContext Interface. This interface extends the ExecutionContext
+ * interface defined in the <code>entity</code> component.
+ */
+public interface ExecutionContext extends org.ofbiz.entity.ExecutionContext {
+
+ /** Returns the current <code>Security</code> instance.
+ *
+ * @return The current <code>Security</code> instance
+ */
+ public Security getSecurity();
+
+ /** Sets the current <code>Security</code> instance.
+ *
+ * @param security The new <code>Security</code> instance
+ */
+ public void setSecurity(Security security);
+}
Propchange: ofbiz/branches/executioncontext20090812/framework/security/src/org/ofbiz/security/ExecutionContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/branches/executioncontext20090812/framework/security/src/org/ofbiz/security/ExecutionContext.java
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/branches/executioncontext20090812/framework/security/src/org/ofbiz/security/ExecutionContext.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/branches/executioncontext20090812/framework/service/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/service/build.xml?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/service/build.xml (original)
+++ ofbiz/branches/executioncontext20090812/framework/service/build.xml Wed Aug 12 20:09:32 2009
@@ -36,6 +36,7 @@
<fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
<fileset dir="../base/lib/scripting" includes="*.jar"/>
<fileset dir="../base/build/lib" includes="*.jar"/>
+ <fileset dir="../api/build/lib" includes="*.jar"/>
<fileset dir="../entity/lib" includes="*.jar"/>
<fileset dir="../entity/build/lib" includes="*.jar"/>
<fileset dir="../security/build/lib" includes="*.jar"/>
Added: ofbiz/branches/executioncontext20090812/framework/service/src/org/ofbiz/service/ExecutionContext.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/service/src/org/ofbiz/service/ExecutionContext.java?rev=803693&view=auto
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/service/src/org/ofbiz/service/ExecutionContext.java (added)
+++ ofbiz/branches/executioncontext20090812/framework/service/src/org/ofbiz/service/ExecutionContext.java Wed Aug 12 20:09:32 2009
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.ofbiz.service;
+
+import java.util.Map;
+
+import org.ofbiz.service.LocalDispatcher;
+
+/**
+ * ExecutionContext Interface. This interface extends the ExecutionContext
+ * interface defined in the <code>security</code> component.
+ */
+public interface ExecutionContext extends org.ofbiz.security.ExecutionContext {
+
+ /** Returns the current <code>LocalDispatcher</code> instance.
+ *
+ * @return The current <code>LocalDispatcher</code> instance
+ */
+ public LocalDispatcher getDispatcher();
+
+ /** Initializes this ExecutionContext with artifacts found in
+ * <code>params</code>.
+ *
+ * @param params
+ */
+ public void initializeContext(Map<String, ? extends Object> params);
+
+ /** Sets the current <code>LocalDispatcher</code> instance.
+ *
+ * @param dispatcher The new <code>LocalDispatcher</code> instance
+ */
+ public void setDispatcher(LocalDispatcher dispatcher);
+}
Propchange: ofbiz/branches/executioncontext20090812/framework/service/src/org/ofbiz/service/ExecutionContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/branches/executioncontext20090812/framework/service/src/org/ofbiz/service/ExecutionContext.java
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/branches/executioncontext20090812/framework/service/src/org/ofbiz/service/ExecutionContext.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/branches/executioncontext20090812/framework/service/src/org/ofbiz/service/ModelService.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/service/src/org/ofbiz/service/ModelService.java?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/service/src/org/ofbiz/service/ModelService.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/service/src/org/ofbiz/service/ModelService.java Wed Aug 12 20:09:32 2009
@@ -55,6 +55,9 @@
import javolution.util.FastList;
import javolution.util.FastMap;
+import org.ofbiz.api.context.ExecutionArtifact;
+import org.ofbiz.api.context.ExecutionContext;
+import org.ofbiz.api.context.ExecutionContextFactory;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
import org.ofbiz.base.util.ObjectType;
@@ -76,7 +79,7 @@
* Generic Service Model Class
*/
@SuppressWarnings("serial")
-public class ModelService extends AbstractMap<String, Object> implements Serializable {
+public class ModelService extends AbstractMap<String, Object> implements Serializable, ExecutionArtifact {
private static final Field[] MODEL_SERVICE_FIELDS;
private static final Map<String, Field> MODEL_SERVICE_FIELD_MAP = FastMap.newInstance();
static {
@@ -859,6 +862,23 @@
}
}
+ // Copy/create ExecutionContext
+ ExecutionContext executionContext = null;
+ if (source.containsKey("executionContext")) {
+ executionContext = (ExecutionContext) source.get("executionContext");
+ } else {
+ try {
+ executionContext = ExecutionContextFactory.getInstance();
+ executionContext.setLocale(locale);
+ executionContext.setTimeZone(timeZone);
+ } catch (Exception e) {
+ Debug.logError(e, "Error while getting ExecutionContext: ", module);
+ }
+ }
+ if (executionContext != null) {
+ target.put("executionContext", executionContext);
+ }
+
for (ModelParam param: contextParamList) {
//boolean internalParam = param.internal;
@@ -1284,4 +1304,12 @@
service.addPort(port);
def.addService(service);
}
+
+ public String getLocation() {
+ return this.definitionLocation;
+ }
+
+ public String getName() {
+ return this.name;
+ }
}
Modified: ofbiz/branches/executioncontext20090812/framework/service/src/org/ofbiz/service/ModelServiceReader.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/service/src/org/ofbiz/service/ModelServiceReader.java?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/service/src/org/ofbiz/service/ModelServiceReader.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/service/src/org/ofbiz/service/ModelServiceReader.java Wed Aug 12 20:09:32 2009
@@ -643,6 +643,14 @@
def.optional = true;
def.internal = true;
service.addParam(def);
+ // executionContext
+ def = new ModelParam();
+ def.name = "executionContext";
+ def.type = "org.ofbiz.api.context.ExecutionContext";
+ def.mode = "IN";
+ def.optional = true;
+ def.internal = true;
+ service.addParam(def);
}
protected void createOverrideDefs(Element baseElement, ModelService service) {
Modified: ofbiz/branches/executioncontext20090812/framework/service/src/org/ofbiz/service/ServiceDispatcher.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/service/src/org/ofbiz/service/ServiceDispatcher.java?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/service/src/org/ofbiz/service/ServiceDispatcher.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/service/src/org/ofbiz/service/ServiceDispatcher.java Wed Aug 12 20:09:32 2009
@@ -27,6 +27,7 @@
import javolution.util.FastMap;
import org.ofbiz.base.config.GenericConfigException;
+import org.ofbiz.api.context.ExecutionContextFactory;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralRuntimeException;
import org.ofbiz.base.util.UtilMisc;
@@ -281,7 +282,6 @@
DispatchContext ctx = localContext.get(localName);
GenericDelegator delegator = ctx.getDelegator();
Locale locale = this.checkLocale(context);
- delegator.setLocale(locale);
GenericEngine engine = this.getGenericEngine(modelService.engineName);
@@ -293,6 +293,17 @@
// for isolated transactions
Transaction parentTransaction = null;
+ ExecutionContext executionContext = (ExecutionContext) context.get("executionContext");
+ if (executionContext == null) {
+ try {
+ executionContext = (ExecutionContext) ExecutionContextFactory.getInstance();
+ } catch (Exception e) {
+ throw new GenericServiceException(e);
+ }
+ executionContext.initializeContext(context);
+ context.put("executionContext", executionContext);
+ }
+ executionContext.pushExecutionArtifact(modelService);
// start the transaction
boolean beganTrans = false;
try {
@@ -558,6 +569,7 @@
Debug.logError(te, "Problems with the transaction", module);
throw new GenericServiceException("Problems with the transaction.", te.getNested());
} finally {
+ executionContext.popExecutionArtifact();
// release the semaphore lock
if (lock != null) {
lock.release();
@@ -1096,5 +1108,4 @@
public static Map<RunningService, ServiceDispatcher> getServiceLogMap() {
return runLog;
}
-
}
Modified: ofbiz/branches/executioncontext20090812/framework/webapp/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/webapp/build.xml?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/webapp/build.xml (original)
+++ ofbiz/branches/executioncontext20090812/framework/webapp/build.xml Wed Aug 12 20:09:32 2009
@@ -31,6 +31,7 @@
<path id="local.class.path">
<fileset dir="${lib.dir}" includes="*.jar"/>
+ <fileset dir="../api/build/lib" includes="*.jar"/>
<fileset dir="../base/lib" includes="*.jar"/>
<fileset dir="../base/lib/commons" includes="*.jar"/>
<fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
Modified: ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java Wed Aug 12 20:09:32 2009
@@ -31,6 +31,7 @@
import org.apache.bsf.BSFManager;
+import org.ofbiz.api.context.ExecutionContextFactory;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilHttp;
import org.ofbiz.base.util.UtilJ2eeCompat;
@@ -43,6 +44,7 @@
import org.ofbiz.entity.transaction.TransactionUtil;
import org.ofbiz.security.Security;
import org.ofbiz.security.authz.Authorization;
+import org.ofbiz.service.ExecutionContext;
import org.ofbiz.service.LocalDispatcher;
import org.ofbiz.webapp.stats.ServerHitBin;
import org.ofbiz.webapp.stats.VisitHandler;
@@ -139,12 +141,23 @@
if (Debug.verboseOn())
Debug.logVerbose("Control Path: " + request.getAttribute("_CONTROL_PATH_"), module);
+ // Set up the ExecutionContext
+ ExecutionContext executionContext = null;
+ try {
+ executionContext = (ExecutionContext) ExecutionContextFactory.getInstance();
+ } catch (Exception e) {
+ throw new ServletException(e);
+ }
+ executionContext.setLocale(UtilHttp.getLocale(request));
+ executionContext.setUserLogin(userLogin);
+ request.setAttribute("executionContext", executionContext);
+
// for convenience, and necessity with event handlers, make security and delegator available in the request:
// try to get it from the session first so that we can have a delegator/dispatcher/security for a certain user if desired
GenericDelegator delegator = null;
String delegatorName = (String) session.getAttribute("delegatorName");
if (UtilValidate.isNotEmpty(delegatorName)) {
- delegator = DelegatorFactory.getGenericDelegator(delegatorName);
+ delegator = DelegatorFactory.getGenericDelegator(delegatorName, executionContext);
}
if (delegator == null) {
delegator = (GenericDelegator) getServletContext().getAttribute("delegator");
@@ -152,9 +165,10 @@
if (delegator == null) {
Debug.logError("[ControlServlet] ERROR: delegator not found in ServletContext", module);
} else {
- request.setAttribute("delegator", delegator);
- // always put this in the session too so that session events can use the delegator
- session.setAttribute("delegatorName", delegator.getDelegatorName());
+ request.setAttribute("delegator", delegator);
+ // always put this in the session too so that session events can use the delegator
+ session.setAttribute("delegatorName", delegator.getDelegatorName());
+ executionContext.setDelegator(delegator);
}
LocalDispatcher dispatcher = (LocalDispatcher) session.getAttribute("dispatcher");
@@ -163,8 +177,10 @@
}
if (dispatcher == null) {
Debug.logError("[ControlServlet] ERROR: dispatcher not found in ServletContext", module);
+ } else {
+ request.setAttribute("dispatcher", dispatcher);
+ executionContext.setDispatcher(dispatcher);
}
- request.setAttribute("dispatcher", dispatcher);
Authorization authz = (Authorization) session.getAttribute("authz");
if (authz == null) {
@@ -181,8 +197,10 @@
}
if (security == null) {
Debug.logError("[ControlServlet] ERROR: security not found in ServletContext", module);
+ } else {
+ request.setAttribute("security", security);
+ executionContext.setSecurity(security);
}
- request.setAttribute("security", security);
request.setAttribute("_REQUEST_HANDLER_", requestHandler);
Modified: ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Wed Aug 12 20:09:32 2009
@@ -36,6 +36,7 @@
import javolution.util.FastMap;
+import org.ofbiz.api.context.GenericExecutionArtifact;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.SSLUtil;
import org.ofbiz.base.util.StringUtil;
@@ -49,6 +50,7 @@
import org.ofbiz.entity.GenericDelegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
+import org.ofbiz.service.ExecutionContext;
import org.ofbiz.webapp.event.EventFactory;
import org.ofbiz.webapp.event.EventHandler;
import org.ofbiz.webapp.event.EventHandlerException;
@@ -107,8 +109,6 @@
GenericValue userLogin, GenericDelegator delegator) throws RequestHandlerException {
HttpSession session = request.getSession();
- Locale locale = UtilHttp.getLocale(request);
- delegator.setLocale(locale);
// get the controllerConfig once for this method so we don't have to get it over and over inside the method
ConfigXMLReader.ControllerConfig controllerConfig = this.getControllerConfig();
@@ -144,6 +144,10 @@
throw new RequestHandlerException(requestMissingErrorMessage);
}
+ ExecutionContext executionContext = (ExecutionContext) request.getAttribute("executionContext");
+ Locale locale = executionContext.getLocale();
+ executionContext.pushExecutionArtifact(new GenericExecutionArtifact(UtilHttp.getFullRequestUrl(request).toString(), cname));
+
String eventReturn = null;
boolean interruptRequest = false;
@@ -323,6 +327,7 @@
// Warning: this could cause problems if more then one event attempts to return a response.
if (interruptRequest) {
if (Debug.infoOn()) Debug.logInfo("[Pre-Processor Interrupted Request, not running: [" + requestMap.uri + "], sessionId=" + UtilHttp.getSessionId(request), module);
+ executionContext.popExecutionArtifact();
return;
}
@@ -471,6 +476,7 @@
// the old/uglier way: doRequest(request, response, previousRequest, userLogin, delegator);
// this is needed as the request handled will be taking care of the view, etc
+ executionContext.popExecutionArtifact();
return;
}
}
@@ -602,6 +608,7 @@
if (Debug.verboseOn()) Debug.logVerbose("[RequestHandler.doRequest]: Response is handled by the event." + " sessionId=" + UtilHttp.getSessionId(request), module);
}
}
+ executionContext.popExecutionArtifact();
}
/** Find the event handler and invoke an event. */
Modified: ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java Wed Aug 12 20:09:32 2009
@@ -234,12 +234,8 @@
for (ModelParam modelParam: model.getInModelParamList()) {
String name = modelParam.name;
- // don't include userLogin, that's taken care of below
- if ("userLogin".equals(name)) continue;
- // don't include locale, that is also taken care of below
- if ("locale".equals(name)) continue;
- // don't include timeZone, that is also taken care of below
- if ("timeZone".equals(name)) continue;
+ // don't include non-parameters
+ if ("userLogin~locale~timeZone~executionContext".contains(name)) continue;
Object value = null;
if (modelParam.stringMapPrefix != null && modelParam.stringMapPrefix.length() > 0) {
@@ -333,6 +329,7 @@
if (ASYNC.equalsIgnoreCase(mode)) {
dispatcher.runAsync(serviceName, serviceContext);
} else {
+ serviceContext.put("executionContext", request.getAttribute("executionContext"));
result = dispatcher.runSync(serviceName, serviceContext);
}
} catch (ServiceAuthException e) {
Modified: ofbiz/branches/executioncontext20090812/framework/webtools/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/webtools/build.xml?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/webtools/build.xml (original)
+++ ofbiz/branches/executioncontext20090812/framework/webtools/build.xml Wed Aug 12 20:09:32 2009
@@ -31,6 +31,7 @@
<path id="local.class.path">
<!--<fileset dir="${lib.dir}" includes="*.jar"/>-->
+ <fileset dir="../api/build/lib" includes="*.jar"/>
<fileset dir="../base/lib" includes="*.jar"/>
<fileset dir="../base/lib/commons" includes="*.jar"/>
<fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
Modified: ofbiz/branches/executioncontext20090812/framework/widget/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/widget/build.xml?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/widget/build.xml (original)
+++ ofbiz/branches/executioncontext20090812/framework/widget/build.xml Wed Aug 12 20:09:32 2009
@@ -31,6 +31,7 @@
<path id="local.class.path">
<!-- <fileset dir="${lib.dir}" includes="*.jar"/> -->
+ <fileset dir="../api/build/lib" includes="*.jar"/>
<fileset dir="../base/lib" includes="*.jar"/>
<fileset dir="../base/lib/commons" includes="*.jar"/>
<fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
Modified: ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/form/ModelForm.java?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/form/ModelForm.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/form/ModelForm.java Wed Aug 12 20:09:32 2009
@@ -34,6 +34,7 @@
import javolution.util.FastMap;
import javolution.util.FastSet;
+import org.ofbiz.api.context.ExecutionArtifact;
import org.ofbiz.base.util.BshUtil;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
@@ -53,6 +54,7 @@
import org.ofbiz.entity.model.ModelReader;
import org.ofbiz.entity.util.EntityListIterator;
import org.ofbiz.service.DispatchContext;
+import org.ofbiz.service.ExecutionContext;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.LocalDispatcher;
import org.ofbiz.service.ModelParam;
@@ -68,7 +70,7 @@
* Widget Library - Form model class
*/
@SuppressWarnings("serial")
-public class ModelForm extends ModelWidget {
+public class ModelForm extends ModelWidget implements ExecutionArtifact {
public static final String module = ModelForm.class.getName();
public static final String DEFAULT_FORM_RESULT_LIST_NAME = "defaultFormResultList";
@@ -780,6 +782,8 @@
* use the same form definitions for many types of form UIs
*/
public void renderFormString(Appendable writer, Map<String, Object> context, FormStringRenderer formStringRenderer) throws IOException {
+ ExecutionContext executionContext = (ExecutionContext) context.get("executionContext");
+ executionContext.pushExecutionArtifact(this);
runFormActions(context);
setWidgetBoundaryComments(context);
@@ -805,9 +809,9 @@
} else {
throw new IllegalArgumentException("Error rendering form, a field has no FieldInfo, ie no sub-element for the type of field for field named: " + modelFormField.getName());
}
- }
+ }
- if ("single".equals(this.type)) {
+ if ("single".equals(this.type)) {
this.renderSingleFormString(writer, context, formStringRenderer, positions);
} else if ("list".equals(this.type)) {
this.renderListFormString(writer, context, formStringRenderer, positions);
@@ -822,6 +826,7 @@
throw new IllegalArgumentException("The form type " + this.getType() + " is not supported for form with name " + this.getName());
}
}
+ executionContext.popExecutionArtifact();
}
public void renderSingleFormString(Appendable writer, Map<String, Object> context, FormStringRenderer formStringRenderer, int positions) throws IOException {
@@ -2959,4 +2964,8 @@
return allRequestsUsed;
}
+
+ public String getLocation() {
+ return this.formLocation;
+ }
}
Modified: ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Wed Aug 12 20:09:32 2009
@@ -33,6 +33,7 @@
import javolution.util.FastList;
import javolution.util.FastMap;
+import org.ofbiz.api.context.ExecutionArtifact;
import org.ofbiz.base.util.BshUtil;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
@@ -58,6 +59,7 @@
import org.ofbiz.entity.model.ModelReader;
import org.ofbiz.entity.util.EntityUtil;
import org.ofbiz.service.DispatchContext;
+import org.ofbiz.service.ExecutionContext;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.ModelParam;
import org.ofbiz.service.ModelService;
@@ -71,7 +73,7 @@
/**
* Widget Library - Form model class
*/
-public class ModelFormField {
+public class ModelFormField implements ExecutionArtifact {
public static final String module = ModelFormField.class.getName();
@@ -589,7 +591,10 @@
}
public void renderFieldString(Appendable writer, Map<String, Object> context, FormStringRenderer formStringRenderer) throws IOException {
+ ExecutionContext executionContext = (ExecutionContext) context.get("executionContext");
+ executionContext.pushExecutionArtifact(this);
this.fieldInfo.renderFieldString(writer, context, formStringRenderer);
+ executionContext.popExecutionArtifact();
}
public List<UpdateArea> getOnChangeUpdateAreas() {
@@ -3557,4 +3562,8 @@
}
}
+
+ public String getLocation() {
+ return this.modelForm.getLocation() + "#" + this.name;
+ }
}
Modified: ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java Wed Aug 12 20:09:32 2009
@@ -26,6 +26,7 @@
import javolution.util.FastSet;
+import org.ofbiz.api.context.ExecutionArtifact;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
import org.ofbiz.base.util.UtilValidate;
@@ -35,6 +36,7 @@
import org.ofbiz.entity.GenericEntity;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.transaction.TransactionUtil;
+import org.ofbiz.service.ExecutionContext;
import org.ofbiz.service.LocalDispatcher;
import org.ofbiz.webapp.control.ConfigXMLReader;
import org.ofbiz.widget.ModelWidget;
@@ -44,7 +46,7 @@
* Widget Library - Screen model class
*/
@SuppressWarnings("serial")
-public class ModelScreen extends ModelWidget implements Serializable {
+public class ModelScreen extends ModelWidget implements Serializable, ExecutionArtifact {
public static final String module = ModelScreen.class.getName();
@@ -345,6 +347,8 @@
* use the same screen definitions for many types of screen UIs
*/
public void renderScreenString(Appendable writer, Map<String, Object> context, ScreenStringRenderer screenStringRenderer) throws ScreenRenderException {
+ ExecutionContext executionContext = (ExecutionContext) context.get("executionContext");
+ executionContext.pushExecutionArtifact(this);
// make sure the "null" object is in there for entity ops
context.put("null", GenericEntity.NULL_FIELD);
@@ -419,6 +423,7 @@
// after rolling back, rethrow the exception
throw new ScreenRenderException(errMsg, e);
} finally {
+ executionContext.popExecutionArtifact();
// only commit the transaction if we started one... this will throw an exception if it fails
try {
TransactionUtil.commit(beganTransaction);
@@ -437,6 +442,10 @@
GenericDelegator delegator = (GenericDelegator) context.get("delegator");
return delegator;
}
+
+ public String getLocation() {
+ return this.sourceLocation + "#" + this.name;
+ }
}
Modified: ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java Wed Aug 12 20:09:32 2009
@@ -50,6 +50,7 @@
import org.ofbiz.security.Security;
import org.ofbiz.security.authz.Authorization;
import org.ofbiz.service.DispatchContext;
+import org.ofbiz.service.ExecutionContext;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.LocalDispatcher;
import org.ofbiz.webapp.control.LoginWorker;
@@ -194,6 +195,7 @@
(LocalDispatcher) request.getAttribute("dispatcher"), (Authorization) request.getAttribute("authz"),
(Security) request.getAttribute("security"), UtilHttp.getLocale(request), userLogin);
+ context.put("executionContext", request.getAttribute("executionContext"));
context.put("autoUserLogin", session.getAttribute("autoUserLogin"));
context.put("person", session.getAttribute("person"));
context.put("partyGroup", session.getAttribute("partyGroup"));
@@ -204,6 +206,10 @@
// set up the user's time zone
context.put("timeZone", UtilHttp.getTimeZone(request));
+ ExecutionContext executionContext = (ExecutionContext) request.getAttribute("executionContext");
+ executionContext.initializeContext(context);
+ context.put("executionContext", executionContext);
+
// ========== setup values that are specific to OFBiz webapps
context.put("request", request);
Modified: ofbiz/branches/executioncontext20090812/specialpurpose/assetmaint/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/assetmaint/build.xml?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/specialpurpose/assetmaint/build.xml (original)
+++ ofbiz/branches/executioncontext20090812/specialpurpose/assetmaint/build.xml Wed Aug 12 20:09:32 2009
@@ -29,6 +29,7 @@
<property name="name" value="ofbiz-assetmaint"/>
<path id="local.class.path">
+ <fileset dir="../../framework/api/build/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
<fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
Modified: ofbiz/branches/executioncontext20090812/specialpurpose/crowd/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/crowd/build.xml?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/specialpurpose/crowd/build.xml (original)
+++ ofbiz/branches/executioncontext20090812/specialpurpose/crowd/build.xml Wed Aug 12 20:09:32 2009
@@ -30,6 +30,7 @@
<path id="local.class.path">
<!--<fileset dir="${lib.dir}" includes="*.jar"/>-->
+ <fileset dir="../../framework/api/build/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
<fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
Modified: ofbiz/branches/executioncontext20090812/specialpurpose/ebay/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/ebay/build.xml?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/specialpurpose/ebay/build.xml (original)
+++ ofbiz/branches/executioncontext20090812/specialpurpose/ebay/build.xml Wed Aug 12 20:09:32 2009
@@ -29,6 +29,7 @@
<property name="name" value="ofbiz-ebay"/>
<path id="local.class.path">
+ <fileset dir="../../framework/api/build/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
<fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
Modified: ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/build.xml?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/build.xml (original)
+++ ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/build.xml Wed Aug 12 20:09:32 2009
@@ -31,6 +31,7 @@
<path id="local.class.path">
<!--<fileset dir="${lib.dir}" includes="*.jar"/>-->
+ <fileset dir="../../framework/api/build/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
<fileset dir="../../framework/base/build/lib" includes="*.jar"/>
Modified: ofbiz/branches/executioncontext20090812/specialpurpose/googlebase/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/googlebase/build.xml?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/specialpurpose/googlebase/build.xml (original)
+++ ofbiz/branches/executioncontext20090812/specialpurpose/googlebase/build.xml Wed Aug 12 20:09:32 2009
@@ -29,6 +29,7 @@
<property name="name" value="ofbiz-googlebase"/>
<path id="local.class.path">
+ <fileset dir="../../framework/api/build/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
<fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
Modified: ofbiz/branches/executioncontext20090812/specialpurpose/googlecheckout/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/googlecheckout/build.xml?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/specialpurpose/googlecheckout/build.xml (original)
+++ ofbiz/branches/executioncontext20090812/specialpurpose/googlecheckout/build.xml Wed Aug 12 20:09:32 2009
@@ -30,6 +30,7 @@
<path id="local.class.path">
<fileset dir="${lib.dir}" includes="*.jar"/>
+ <fileset dir="../../framework/api/build/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
<fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
Modified: ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/build.xml?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/build.xml (original)
+++ ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/build.xml Wed Aug 12 20:09:32 2009
@@ -29,6 +29,7 @@
<property name="name" value="ofbiz-hhfacility"/>
<path id="local.class.path">
+ <fileset dir="../../framework/api/build/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
<fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
Modified: ofbiz/branches/executioncontext20090812/specialpurpose/ldap/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/ldap/build.xml?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/specialpurpose/ldap/build.xml (original)
+++ ofbiz/branches/executioncontext20090812/specialpurpose/ldap/build.xml Wed Aug 12 20:09:32 2009
@@ -30,6 +30,7 @@
<path id="local.class.path">
<fileset dir="${lib.dir}" includes="*.jar"/>
+ <fileset dir="../../framework/api/build/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
<fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
Modified: ofbiz/branches/executioncontext20090812/specialpurpose/oagis/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/oagis/build.xml?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/specialpurpose/oagis/build.xml (original)
+++ ofbiz/branches/executioncontext20090812/specialpurpose/oagis/build.xml Wed Aug 12 20:09:32 2009
@@ -29,6 +29,7 @@
<property name="name" value="ofbiz-oagis"/>
<path id="local.class.path">
+ <fileset dir="../../framework/api/build/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
<fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
Modified: ofbiz/branches/executioncontext20090812/specialpurpose/pos/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/pos/build.xml?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/specialpurpose/pos/build.xml (original)
+++ ofbiz/branches/executioncontext20090812/specialpurpose/pos/build.xml Wed Aug 12 20:09:32 2009
@@ -30,6 +30,7 @@
<path id="local.class.path">
<fileset dir="${lib.dir}" includes="*.jar"/>
+ <fileset dir="../../framework/api/build/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
<fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
Modified: ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/build.xml?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/build.xml (original)
+++ ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/build.xml Wed Aug 12 20:09:32 2009
@@ -29,6 +29,7 @@
<property name="name" value="ofbiz-projectmgr"/>
<path id="local.class.path">
+ <fileset dir="../../framework/api/build/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
<fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
Modified: ofbiz/branches/executioncontext20090812/specialpurpose/shark/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/shark/build.xml?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/specialpurpose/shark/build.xml (original)
+++ ofbiz/branches/executioncontext20090812/specialpurpose/shark/build.xml Wed Aug 12 20:09:32 2009
@@ -30,18 +30,19 @@
<path id="local.class.path">
<fileset dir="${lib.dir}" includes="*.jar"/>
- <fileset dir="../base/lib" includes="*.jar"/>
- <fileset dir="../base/lib/commons" includes="*.jar"/>
- <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
- <fileset dir="../base/lib/scripting" includes="*.jar"/>
- <fileset dir="../base/build/lib" includes="*.jar"/>
- <fileset dir="../entity/lib" includes="*.jar"/>
- <fileset dir="../entity/build/lib" includes="*.jar"/>
- <fileset dir="../security/build/lib" includes="*.jar"/>
- <fileset dir="../service/lib" includes="*.jar"/>
- <fileset dir="../service/build/lib" includes="*.jar"/>
- <fileset dir="../entityext/build/lib" includes="*.jar"/>
- <fileset dir="../common/build/lib" includes="*.jar"/>
+ <fileset dir="../../framework/api/build/lib" includes="*.jar"/>
+ <fileset dir="../../framework/base/lib" includes="*.jar"/>
+ <fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
+ <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
+ <fileset dir="../../framework/base/lib/scripting" includes="*.jar"/>
+ <fileset dir="../../framework/base/build/lib" includes="*.jar"/>
+ <fileset dir="../../framework/entity/lib" includes="*.jar"/>
+ <fileset dir="../../framework/entity/build/lib" includes="*.jar"/>
+ <fileset dir="../../framework/security/build/lib" includes="*.jar"/>
+ <fileset dir="../../framework/service/lib" includes="*.jar"/>
+ <fileset dir="../../framework/service/build/lib" includes="*.jar"/>
+ <fileset dir="../../framework/entityext/build/lib" includes="*.jar"/>
+ <fileset dir="../../framework/common/build/lib" includes="*.jar"/>
</path>
<patternset id="src.exc.set">
Modified: ofbiz/branches/executioncontext20090812/specialpurpose/webpos/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/webpos/build.xml?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/specialpurpose/webpos/build.xml (original)
+++ ofbiz/branches/executioncontext20090812/specialpurpose/webpos/build.xml Wed Aug 12 20:09:32 2009
@@ -29,6 +29,7 @@
<property name="name" value="ofbiz-webpos"/>
<path id="local.class.path">
+ <fileset dir="../../framework/api/build/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
<fileset dir="../../framework/base/build/lib" includes="*.jar"/>
Modified: ofbiz/branches/executioncontext20090812/specialpurpose/workflow/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/workflow/build.xml?rev=803693&r1=803692&r2=803693&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/specialpurpose/workflow/build.xml (original)
+++ ofbiz/branches/executioncontext20090812/specialpurpose/workflow/build.xml Wed Aug 12 20:09:32 2009
@@ -30,6 +30,7 @@
<path id="local.class.path">
<!--<fileset dir="${lib.dir}" includes="*.jar"/>-->
+ <fileset dir="../../framework/api/build/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib" includes="*.jar"/>
<fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
<fileset dir="../../framework/base/lib/scripting" includes="*.jar"/>