svn commit: r930719 [2/2] - in /ofbiz/branches/executionconte
Locked
svn commit: r930719 [2/2] - in /ofbiz/branches/executionconte
 
|
Added: ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ExecutionContext.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ExecutionContext.java?rev=930719&view=auto ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ExecutionContext.java (added) +++ ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ExecutionContext.java Sun Apr 4 17:12:53 2010 @@ -0,0 +1,183 @@ +/******************************************************************************* + * 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.base.context; + +import java.util.Currency; +import java.util.Locale; +import java.util.Map; +import java.util.TimeZone; + +import org.ofbiz.base.authorization.AccessController; +import org.ofbiz.base.authorization.AuthorizationManager; + + +/** ExecutionContext interface. The <code>ExecutionContext</code> is a container + * for frequently used objects, plus it keeps track of the program's + * execution path. <p>As an object container, the <code>ExecutionContext</code> + * simplifies framework code - since only one oject needs to be + * passed around instead of five or six.</p><p>The <code>ExecutionContext</code> + * depends on the artifacts in the program's execution path to implement + * the <code>ExecutionArtifact</code> interface, or if that is not possible, + * to use a <code>GenericExecutionArtifact</code> instance. At the start of + * each method, the artifact calls <code>pushExecutionArtifact</code>, and + * as each method exits the artifact calls <code>popExecutionArtifact</code>. + * Implementations of this interface will pass the current execution path + * to the Authorization Manager so the proper user permissions can be + * retrieved for the current artifact.</p> + * + * @see org.ofbiz.base.context.ExecutionArtifact + * @see org.ofbiz.base.context.GenericExecutionArtifact + */ +public interface ExecutionContext { + + /** + * Restores the <code>AuthorizationManager</code> instance that was in use + * before the last <code>runUnprotected</code> method call. + */ + void endRunUnprotected(); + + /** Returns an <code>AccessController</code> instance for this + * user login and execution path combination. + * + * @return An <code>AccessController</code> instance + */ + AccessController getAccessController(); + + /** Returns the current currency. + * + * @return The current currency + */ + Currency getCurrency(); + + /** Returns the current execution path. + * + * @return The current execution path + */ + ArtifactPath getExecutionPath(); + + /** Returns the current execution path as a <code>String</code>. + * Path elements are separated with a forward slash. + * + * @return The current execution path + */ + String getExecutionPathAsString(); + + /** Returns the current execution path as an array of strings. + * Each array element contains an Artifact name, with the + * first element containing the path root. + * + * @return The current execution path as an array + */ + String[] getExecutionPathAsArray(); + + /** Returns the current <code>Locale</code>. + * + * @return The current <code>Locale</code> + */ + Locale getLocale(); + + /** + * Returns the parameters associated with this context. + * + * @return The parameters associated with this context + */ + Map<String, ? extends Object> getParameters(); + + /** Returns the specified property. + * + * @param key property whose associated value is to be returned + * @return the specified property, or null if the property doesn't exist + */ + Object getProperty(String key); + + /** Returns the current <code>AuthorizationManager</code> instance. + * + * @return The current <code>AuthorizationManager</code> instance + */ + AuthorizationManager getSecurity(); + + /** Returns the current <code>TimeZone</code>. + * + * @return The current <code>TimeZone</code> + */ + TimeZone getTimeZone(); + + /** Initializes this ExecutionContext with artifacts found in + * <code>params</code>. + * + * @param params + */ + void initializeContext(Map<String, ? extends Object> params); + + /** Pop an <code>ExecutionArtifact</code> off the stack. */ + void popExecutionArtifact(); + + /** Push an <code>ExecutionArtifact</code> on the stack. + * + * @param artifact + */ + void pushExecutionArtifact(ExecutionArtifact artifact); + + /** + * Resets this <code>ExecutionContext</code> to its default + * state. This method is called when an <code>ExecutionContext</code> + * instance is about to be reused. + */ + void reset(); + + /** + * Replaces the current <code>AuthorizationManager</code> instance + * with one that allows unrestricted use of all artifacts. + */ + void runUnprotected(); + + /** Sets the current currency. + * + * @param currency The current currency + */ + void setCurrency(Currency currency); + + /** Sets the current <code>Locale</code>. + * + * @param locale The current <code>Locale</code> + */ + void setLocale(Locale locale); + + /** Associates the specified value with the specified key. + * If the context contained a previous property for this key, + * then the old value is replaced by the specified value. + * + * @param key the key with which the specified value is to be associated + * @param value the value to be associated with the specified key + * @return the previous value associated with specified key, or null if there was no mapping for key + */ + Object setProperty(String key, Object value); + + /** Sets the current <code>AuthorizationManager</code> instance. + * + * @param security The new <code>AuthorizationManager</code> instance + */ + void setSecurity(AuthorizationManager security); + + /** Sets the current <code>TimeZone</code>. + * + * @param timeZone The current <code>TimeZone</code> + */ + void setTimeZone(TimeZone timeZone); +} Propchange: ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ExecutionContext.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ExecutionContext.java ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ExecutionContext.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ExecutionContextFactory.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ExecutionContextFactory.java?rev=930719&view=auto ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ExecutionContextFactory.java (added) +++ ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ExecutionContextFactory.java Sun Apr 4 17:12:53 2010 @@ -0,0 +1,41 @@ +/******************************************************************************* + * 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.base.context; + +import org.ofbiz.base.util.Debug; +import org.ofbiz.base.util.UtilProperties; + +/** An <code>ExecutionContext</code> factory. + */ +public class ExecutionContextFactory { + + public static final String module = ExecutionContextFactory.class.getName(); + + public static ExecutionContext getInstance() { + ExecutionContext result = null; + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + String className = UtilProperties.getPropertyValue("api.properties", "executionContext.class"); + try { + result = (ExecutionContext) loader.loadClass(className).newInstance(); + } catch (Exception e) { + Debug.logError(e, module); + } + return result; + } +} Propchange: ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ExecutionContextFactory.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ExecutionContextFactory.java ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ExecutionContextFactory.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/GenericExecutionArtifact.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/GenericExecutionArtifact.java?rev=930719&view=auto ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/GenericExecutionArtifact.java (added) +++ ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/GenericExecutionArtifact.java Sun Apr 4 17:12:53 2010 @@ -0,0 +1,44 @@ +/******************************************************************************* + * 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.base.context; + +/** A basic implementation of the <code>ExecutionArtifact</code> interface. */ +public class GenericExecutionArtifact implements ExecutionArtifact { + + protected final String location; + protected final String name; + + public GenericExecutionArtifact(String location, String name) { + this.location = location; + this.name = name; + } + + public String getLocation() { + return this.location; + } + + public String getName() { + return this.name; + } + + @Override + public String toString() { + return "GenericExecutionArtifact: location = " + this.location + ", name = " + this.name; + } +} Propchange: ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/GenericExecutionArtifact.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/GenericExecutionArtifact.java ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/GenericExecutionArtifact.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/GenericParametersArtifact.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/GenericParametersArtifact.java?rev=930719&view=auto ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/GenericParametersArtifact.java (added) +++ ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/GenericParametersArtifact.java Sun Apr 4 17:12:53 2010 @@ -0,0 +1,46 @@ +/******************************************************************************* + * 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.base.context; + +import java.util.Map; + +/** A basic implementation of the ParametersArtifact interface. */ +public class GenericParametersArtifact extends GenericExecutionArtifact implements ParametersArtifact { + + protected final Map<String, ? extends Object> parameters; + + public GenericParametersArtifact(String location, String name, Map<String, ? extends Object> parameters) { + super(location, name); + this.parameters = parameters; + } + + public GenericParametersArtifact(ExecutionArtifact artifact, Map<String, ? extends Object> parameters) { + super(artifact.getLocation(), artifact.getName()); + this.parameters = parameters; + } + + public Map<String, ? extends Object> getParameters() { + return this.parameters; + } + + @Override + public String toString() { + return "GenericParametersArtifact: location = " + this.location + ", name = " + this.name; + } +} Propchange: ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/GenericParametersArtifact.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/GenericParametersArtifact.java ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/GenericParametersArtifact.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ParametersArtifact.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ParametersArtifact.java?rev=930719&view=auto ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ParametersArtifact.java (added) +++ ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ParametersArtifact.java Sun Apr 4 17:12:53 2010 @@ -0,0 +1,48 @@ +/******************************************************************************* + * 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.base.context; + +import java.util.Map; + +/** ParametersArtifact interface. This interface extends + * <code>ExecutionArtifact</code> and adds the ability to + * contain a parameter <code>Map</code>.<p>The purpose of this + * class is to provide a way for the <code>ExecutionContext</code> + * to keep track of what parameters are the most recent. For + * example: Service A calls Service B. Service A has one set of + * parameters, and Service B has another set of parameters. During + * program execution, Service A creates a <code>ParametersArtifact</code> + * instance that contains the service's parameters, then pushes that + * instance on the <code>ExecutionContext</code> stack. When Service B + * is called, it does the same thing. When framework code needs to + * access the current parameters, it calls + * <code>ExecutionContext.getParameters()</code>. The <code>ExecutionContext</code> + * will search its stack for the first <code>ParametersArtifact</code> instance - + * starting at the top of the stack, and return that instance.</p> + */ +public interface ParametersArtifact extends ExecutionArtifact { + + /** + * Returns the parameters associated with this artifact. + * + * @return The parameters associated with this artifact + */ + Map<String, ? extends Object> getParameters(); + +} Propchange: ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ParametersArtifact.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ParametersArtifact.java ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ParametersArtifact.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ThreadContext.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ThreadContext.java?rev=930719&view=auto ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ThreadContext.java (added) +++ ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ThreadContext.java Sun Apr 4 17:12:53 2010 @@ -0,0 +1,143 @@ +/******************************************************************************* + * 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.base.context; + +import java.util.Currency; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.TimeZone; + +import org.ofbiz.base.authorization.AccessController; +import org.ofbiz.base.authorization.AuthorizationManager; + +/** A convenience class for accessing the current thread's <code>ExecutionContext</code>. + * @see {@link org.ofbiz.service.ExecutionContext} + */ +public class ThreadContext { + + public static final String module = ThreadContext.class.getName(); + + protected static final ThreadLocal<ExecutionContext> executionContext = new ThreadLocal<ExecutionContext>() { + protected synchronized ExecutionContext initialValue() { + return ExecutionContextFactory.getInstance(); + } + }; + + public static <E> List<E> applyFilters(List<E> list) { + return executionContext.get().getAccessController().applyFilters(list); + } + + public static void endRunUnprotected() { + executionContext.get().endRunUnprotected(); + } + + public static AccessController getAccessController() { + return executionContext.get().getAccessController(); + } + + public static Currency getCurrency() { + return executionContext.get().getCurrency(); + } + + public static ArtifactPath getExecutionPath() { + return executionContext.get().getExecutionPath(); + } + + public static String[] getExecutionPathAsArray() { + return executionContext.get().getExecutionPathAsArray(); + } + + public static String getExecutionPathAsString() { + return executionContext.get().getExecutionPathAsString(); + } + + public static Locale getLocale() { + return executionContext.get().getLocale(); + } + + public static Map<String, ? extends Object> getParameters() { + return executionContext.get().getParameters(); + } + + public static Object getProperty(String key) { + return executionContext.get().getProperty(key); + } + + public static AuthorizationManager getSecurity() { + return executionContext.get().getSecurity(); + } + + public static TimeZone getTimeZone() { + return executionContext.get().getTimeZone(); + } + + public static void initializeContext(Map<String, ? extends Object> params) { + executionContext.get().initializeContext(params); + } + + public static void popExecutionArtifact() { + executionContext.get().popExecutionArtifact(); + } + + public static void pushExecutionArtifact(ExecutionArtifact artifact) { + executionContext.get().pushExecutionArtifact(artifact); + } + + public static void pushExecutionArtifact(ExecutionArtifact artifact, Map<String, ? extends Object> parameters) { + pushExecutionArtifact(new GenericParametersArtifact(artifact, parameters)); + } + + public static void pushExecutionArtifact(String location, String name) { + pushExecutionArtifact(new GenericExecutionArtifact(location, name)); + } + + public static void pushExecutionArtifact(String location, String name, Map<String, ? extends Object> parameters) { + pushExecutionArtifact(new GenericParametersArtifact(location, name, parameters)); + } + + public static void reset() { + executionContext.get().reset(); + } + + public static void runUnprotected() { + executionContext.get().runUnprotected(); + } + + public static void setCurrency(Currency currency) { + executionContext.get().setCurrency(currency); + } + + public static void setLocale(Locale locale) { + executionContext.get().setLocale(locale); + } + + public static Object setProperty(String key, Object value) { + return executionContext.get().setProperty(key, value); + } + + public static void setSecurity(AuthorizationManager security) { + executionContext.get().setSecurity(security); + } + + public static void setTimeZone(TimeZone timeZone) { + executionContext.get().setTimeZone(timeZone); + } + +} Propchange: ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ThreadContext.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ThreadContext.java ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/branches/executioncontext20091231/framework/base/src/org/ofbiz/base/context/ThreadContext.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/branches/executioncontext20091231/framework/bi/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/bi/build.xml?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/bi/build.xml (original) +++ ofbiz/branches/executioncontext20091231/framework/bi/build.xml Sun Apr 4 17:12:53 2010 @@ -29,7 +29,6 @@ under the License. <property name="name" value="ofbiz-bi"/> <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/executioncontext20091231/framework/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/build.xml?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/build.xml (original) +++ ofbiz/branches/executioncontext20091231/framework/build.xml Sun Apr 4 17:12:53 2010 @@ -22,7 +22,7 @@ under the License. <import file="../macros.xml"/> <filelist id="framework-builds" dir="." - files="start/build.xml,base/build.xml,api/build.xml,sql/build.xml, + files="start/build.xml,base/build.xml,sql/build.xml, entity/build.xml,geronimo/build.xml, catalina/build.xml,jetty/build.xml, security/build.xml,service/build.xml,context/build.xml,entityext/build.xml, Modified: ofbiz/branches/executioncontext20091231/framework/common/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/common/build.xml?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/common/build.xml (original) +++ ofbiz/branches/executioncontext20091231/framework/common/build.xml Sun Apr 4 17:12:53 2010 @@ -30,7 +30,6 @@ under the License. <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/commons" includes="*.jar"/> <fileset dir="../base/lib/j2eespecs" includes="*.jar"/> Modified: ofbiz/branches/executioncontext20091231/framework/component-load.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/component-load.xml?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/component-load.xml (original) +++ ofbiz/branches/executioncontext20091231/framework/component-load.xml Sun Apr 4 17:12:53 2010 @@ -20,7 +20,6 @@ under the License. <component-loader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/component-loader.xsd"> - <load-component component-location="api"/> <load-component component-location="context"/> <load-component component-location="geronimo"/> <load-component component-location="sql"/> Modified: ofbiz/branches/executioncontext20091231/framework/context/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/context/build.xml?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/context/build.xml (original) +++ ofbiz/branches/executioncontext20091231/framework/context/build.xml Sun Apr 4 17:12:53 2010 @@ -29,7 +29,6 @@ under the License. <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/commons" includes="*.jar"/> <fileset dir="../base/lib/j2eespecs" includes="*.jar"/> Modified: ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AccessControllerImpl.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AccessControllerImpl.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AccessControllerImpl.java (original) +++ ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AccessControllerImpl.java Sun Apr 4 17:12:53 2010 @@ -26,8 +26,8 @@ import java.util.Map; import javolution.util.FastMap; -import org.ofbiz.api.authorization.AccessController; -import org.ofbiz.api.context.ArtifactPath; +import org.ofbiz.base.authorization.AccessController; +import org.ofbiz.base.context.ArtifactPath; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilProperties; Modified: ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AccessDeniedController.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AccessDeniedController.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AccessDeniedController.java (original) +++ ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AccessDeniedController.java Sun Apr 4 17:12:53 2010 @@ -25,9 +25,9 @@ import java.util.ListIterator; import javolution.util.FastList; -import org.ofbiz.api.authorization.AccessController; -import org.ofbiz.api.context.ArtifactPath; -import org.ofbiz.api.context.ThreadContext; +import org.ofbiz.base.authorization.AccessController; +import org.ofbiz.base.context.ArtifactPath; +import org.ofbiz.base.context.ThreadContext; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilGenerics; Modified: ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AccessGrantedController.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AccessGrantedController.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AccessGrantedController.java (original) +++ ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AccessGrantedController.java Sun Apr 4 17:12:53 2010 @@ -23,9 +23,9 @@ import java.security.Permission; import java.util.List; import java.util.ListIterator; -import org.ofbiz.api.authorization.AccessController; -import org.ofbiz.api.context.ArtifactPath; -import org.ofbiz.api.context.ThreadContext; +import org.ofbiz.base.authorization.AccessController; +import org.ofbiz.base.context.ArtifactPath; +import org.ofbiz.base.context.ThreadContext; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilProperties; Modified: ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AuditedArtifactFinder.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AuditedArtifactFinder.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AuditedArtifactFinder.java (original) +++ ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AuditedArtifactFinder.java Sun Apr 4 17:12:53 2010 @@ -19,7 +19,7 @@ package org.ofbiz.context; import org.ofbiz.context.PathNode.BranchNode; -import org.ofbiz.api.context.ArtifactPath; +import org.ofbiz.base.context.ArtifactPath; public class AuditedArtifactFinder extends TreeWalker { Modified: ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AuthorizationManagerImpl.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AuthorizationManagerImpl.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AuthorizationManagerImpl.java (original) +++ ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AuthorizationManagerImpl.java Sun Apr 4 17:12:53 2010 @@ -26,11 +26,11 @@ import java.util.Map; import javolution.util.FastMap; -import org.ofbiz.api.authorization.AccessController; -import org.ofbiz.api.authorization.AuthorizationManager; -import org.ofbiz.api.authorization.AuthorizationManagerException; -import org.ofbiz.api.authorization.BasicPermissions; -import org.ofbiz.api.context.ArtifactPath; +import org.ofbiz.base.authorization.AccessController; +import org.ofbiz.base.authorization.AuthorizationManager; +import org.ofbiz.base.authorization.AuthorizationManagerException; +import org.ofbiz.base.authorization.BasicPermissions; +import org.ofbiz.base.context.ArtifactPath; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.cache.UtilCache; Modified: ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/ContextUtil.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/ContextUtil.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/ContextUtil.java (original) +++ ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/ContextUtil.java Sun Apr 4 17:12:53 2010 @@ -18,16 +18,16 @@ *******************************************************************************/ package org.ofbiz.context; -import static org.ofbiz.api.authorization.BasicPermissions.Access; +import static org.ofbiz.base.authorization.BasicPermissions.Access; import java.security.AccessControlException; import java.util.List; import javolution.util.FastList; -import org.ofbiz.api.authorization.AccessController; -import org.ofbiz.api.context.ArtifactPath; -import org.ofbiz.api.context.ThreadContext; +import org.ofbiz.base.authorization.AccessController; +import org.ofbiz.base.context.ArtifactPath; +import org.ofbiz.base.context.ThreadContext; import org.ofbiz.base.component.ComponentConfig; import org.ofbiz.base.component.ComponentConfig.WebappInfo; Modified: ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/ExecutionContextImpl.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/ExecutionContextImpl.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/ExecutionContextImpl.java (original) +++ ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/ExecutionContextImpl.java Sun Apr 4 17:12:53 2010 @@ -24,10 +24,10 @@ import java.util.TimeZone; import javolution.util.FastList; -import org.ofbiz.api.authorization.AccessController; -import org.ofbiz.api.authorization.AuthorizationManager; -import org.ofbiz.api.authorization.AuthorizationManagerException; -import org.ofbiz.api.authorization.NullAuthorizationManager; +import org.ofbiz.base.authorization.AccessController; +import org.ofbiz.base.authorization.AuthorizationManager; +import org.ofbiz.base.authorization.AuthorizationManagerException; +import org.ofbiz.base.authorization.NullAuthorizationManager; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.entity.DelegatorFactory; @@ -39,7 +39,7 @@ import org.ofbiz.service.GenericDispatch import org.ofbiz.service.LocalDispatcher; /** An implementation of the <code>ExecutionContext</code> interface. */ -public class ExecutionContextImpl extends org.ofbiz.api.context.AbstractExecutionContext implements ExecutionContext { +public class ExecutionContextImpl extends org.ofbiz.base.context.AbstractExecutionContext implements ExecutionContext { public static final String module = ExecutionContextImpl.class.getName(); protected static final AccessController accessDeniedController = new AccessDeniedController(); Modified: ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/OFBizPermission.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/OFBizPermission.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/OFBizPermission.java (original) +++ ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/OFBizPermission.java Sun Apr 4 17:12:53 2010 @@ -18,14 +18,14 @@ *******************************************************************************/ package org.ofbiz.context; -import static org.ofbiz.api.authorization.BasicPermissions.*; +import static org.ofbiz.base.authorization.BasicPermissions.*; import java.security.Permission; import java.util.Set; import javolution.util.FastSet; -import org.ofbiz.api.authorization.PermissionsUnion; +import org.ofbiz.base.authorization.PermissionsUnion; /** OFBizPermission class. * <p>This class enforces the security-aware artifact permission Modified: ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/PathNode.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/PathNode.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/PathNode.java (original) +++ ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/PathNode.java Sun Apr 4 17:12:53 2010 @@ -20,7 +20,7 @@ package org.ofbiz.context; import java.util.Map; -import org.ofbiz.api.context.ArtifactPath; +import org.ofbiz.base.context.ArtifactPath; /** A node in a permissions tree. */ public abstract class PathNode { Modified: ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/PermissionTreeBuilder.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/PermissionTreeBuilder.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/PermissionTreeBuilder.java (original) +++ ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/PermissionTreeBuilder.java Sun Apr 4 17:12:53 2010 @@ -18,7 +18,7 @@ *******************************************************************************/ package org.ofbiz.context; -import org.ofbiz.api.context.ArtifactPath; +import org.ofbiz.base.context.ArtifactPath; import org.ofbiz.context.PathNode.BranchNode; public class PermissionTreeBuilder extends TreeBuilder { Modified: ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/PermissionsGatherer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/PermissionsGatherer.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/PermissionsGatherer.java (original) +++ ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/PermissionsGatherer.java Sun Apr 4 17:12:53 2010 @@ -18,7 +18,7 @@ *******************************************************************************/ package org.ofbiz.context; -import org.ofbiz.api.context.ArtifactPath; +import org.ofbiz.base.context.ArtifactPath; import org.ofbiz.context.PathNode.BranchNode; public class PermissionsGatherer extends TreeWalker { Modified: ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/TreeBuilder.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/TreeBuilder.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/TreeBuilder.java (original) +++ ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/TreeBuilder.java Sun Apr 4 17:12:53 2010 @@ -20,7 +20,7 @@ package org.ofbiz.context; import javolution.util.FastMap; -import org.ofbiz.api.context.ArtifactPath; +import org.ofbiz.base.context.ArtifactPath; import org.ofbiz.context.PathNode.BranchNode; import org.ofbiz.context.PathNode.SubstitutionNode; import org.ofbiz.context.PathNode.WildCardNode; Modified: ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/TreeWalker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/TreeWalker.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/TreeWalker.java (original) +++ ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/TreeWalker.java Sun Apr 4 17:12:53 2010 @@ -18,7 +18,7 @@ *******************************************************************************/ package org.ofbiz.context; -import org.ofbiz.api.context.ArtifactPath; +import org.ofbiz.base.context.ArtifactPath; import org.ofbiz.context.PathNode.BranchNode; import org.ofbiz.context.PathNode.SubstitutionNode; import org.ofbiz.context.PathNode.WildCardNode; Modified: ofbiz/branches/executioncontext20091231/framework/entity/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/entity/build.xml?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/entity/build.xml (original) +++ ofbiz/branches/executioncontext20091231/framework/entity/build.xml Sun Apr 4 17:12:53 2010 @@ -32,7 +32,6 @@ under the License. <path id="local.class.path"> <fileset dir="${lib.dir}" includes="*.jar"/> <fileset dir="${lib.dir}/jdbc" 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/executioncontext20091231/framework/entity/src/org/ofbiz/entity/ExecutionContext.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/entity/src/org/ofbiz/entity/ExecutionContext.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/entity/src/org/ofbiz/entity/ExecutionContext.java (original) +++ ofbiz/branches/executioncontext20091231/framework/entity/src/org/ofbiz/entity/ExecutionContext.java Sun Apr 4 17:12:53 2010 @@ -22,7 +22,7 @@ package org.ofbiz.entity; * ExecutionContext Interface. This interface extends the ExecutionContext * interface defined in the <code>base</code> component. */ -public interface ExecutionContext extends org.ofbiz.api.context.ExecutionContext { +public interface ExecutionContext extends org.ofbiz.base.context.ExecutionContext { /** Returns the current <code>GenericDelegator</code> instance. * Modified: ofbiz/branches/executioncontext20091231/framework/entity/src/org/ofbiz/entity/GenericDelegator.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/entity/src/org/ofbiz/entity/GenericDelegator.java (original) +++ ofbiz/branches/executioncontext20091231/framework/entity/src/org/ofbiz/entity/GenericDelegator.java Sun Apr 4 17:12:53 2010 @@ -18,9 +18,9 @@ */ package org.ofbiz.entity; -import static org.ofbiz.api.authorization.BasicPermissions.Create; -import static org.ofbiz.api.authorization.BasicPermissions.Delete; -import static org.ofbiz.api.authorization.BasicPermissions.Update; +import static org.ofbiz.base.authorization.BasicPermissions.Create; +import static org.ofbiz.base.authorization.BasicPermissions.Delete; +import static org.ofbiz.base.authorization.BasicPermissions.Update; import java.io.FileNotFoundException; import java.io.IOException; @@ -41,7 +41,7 @@ import javax.xml.parsers.ParserConfigura import javolution.util.FastList; import javolution.util.FastMap; -import org.ofbiz.api.authorization.AccessController; +import org.ofbiz.base.authorization.AccessController; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralRuntimeException; import org.ofbiz.base.util.UtilDateTime; Modified: ofbiz/branches/executioncontext20091231/framework/entity/src/org/ofbiz/entity/GenericEntity.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/entity/src/org/ofbiz/entity/GenericEntity.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/entity/src/org/ofbiz/entity/GenericEntity.java (original) +++ ofbiz/branches/executioncontext20091231/framework/entity/src/org/ofbiz/entity/GenericEntity.java Sun Apr 4 17:12:53 2010 @@ -38,7 +38,7 @@ import javolution.lang.Reusable; import javolution.util.FastList; import javolution.util.FastMap; -import org.ofbiz.api.context.ExecutionArtifact; +import org.ofbiz.base.context.ExecutionArtifact; import org.ofbiz.base.crypto.HashCrypt; import org.ofbiz.base.util.Base64; import org.ofbiz.base.util.Debug; Modified: ofbiz/branches/executioncontext20091231/framework/entity/src/org/ofbiz/entity/ThreadContext.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/entity/src/org/ofbiz/entity/ThreadContext.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/entity/src/org/ofbiz/entity/ThreadContext.java (original) +++ ofbiz/branches/executioncontext20091231/framework/entity/src/org/ofbiz/entity/ThreadContext.java Sun Apr 4 17:12:53 2010 @@ -21,7 +21,7 @@ package org.ofbiz.entity; /** A convenience class for accessing the current thread's <code>ExecutionContext</code>. * @see {@link org.ofbiz.entity.ExecutionContext} */ -public class ThreadContext extends org.ofbiz.api.context.ThreadContext { +public class ThreadContext extends org.ofbiz.base.context.ThreadContext { protected static final String module = ThreadContext.class.getName(); Modified: ofbiz/branches/executioncontext20091231/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java (original) +++ ofbiz/branches/executioncontext20091231/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java Sun Apr 4 17:12:53 2010 @@ -33,7 +33,7 @@ import java.util.TimeZone; import javolution.util.FastList; import javolution.util.FastMap; -import org.ofbiz.api.context.ExecutionArtifact; +import org.ofbiz.base.context.ExecutionArtifact; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.ObjectType; Modified: ofbiz/branches/executioncontext20091231/framework/entityext/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/entityext/build.xml?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/entityext/build.xml (original) +++ ofbiz/branches/executioncontext20091231/framework/entityext/build.xml Sun Apr 4 17:12:53 2010 @@ -30,7 +30,6 @@ under the License. <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/executioncontext20091231/framework/minilang/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/minilang/build.xml?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/minilang/build.xml (original) +++ ofbiz/branches/executioncontext20091231/framework/minilang/build.xml Sun Apr 4 17:12:53 2010 @@ -31,7 +31,6 @@ under the License. <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/executioncontext20091231/framework/security/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/security/build.xml?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/security/build.xml (original) +++ ofbiz/branches/executioncontext20091231/framework/security/build.xml Sun Apr 4 17:12:53 2010 @@ -31,7 +31,6 @@ under the License. <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/build/lib" includes="*.jar"/> Modified: ofbiz/branches/executioncontext20091231/framework/service/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/service/build.xml?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/service/build.xml (original) +++ ofbiz/branches/executioncontext20091231/framework/service/build.xml Sun Apr 4 17:12:53 2010 @@ -31,7 +31,6 @@ under the License. <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/executioncontext20091231/framework/service/src/org/ofbiz/service/ModelService.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/service/src/org/ofbiz/service/ModelService.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/service/src/org/ofbiz/service/ModelService.java (original) +++ ofbiz/branches/executioncontext20091231/framework/service/src/org/ofbiz/service/ModelService.java Sun Apr 4 17:12:53 2010 @@ -59,7 +59,7 @@ import javax.xml.parsers.DocumentBuilder import javolution.util.FastList; import javolution.util.FastMap; -import org.ofbiz.api.context.ExecutionArtifact; +import org.ofbiz.base.context.ExecutionArtifact; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.ObjectType; Modified: ofbiz/branches/executioncontext20091231/framework/service/src/org/ofbiz/service/ServiceDispatcher.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/service/src/org/ofbiz/service/ServiceDispatcher.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/service/src/org/ofbiz/service/ServiceDispatcher.java (original) +++ ofbiz/branches/executioncontext20091231/framework/service/src/org/ofbiz/service/ServiceDispatcher.java Sun Apr 4 17:12:53 2010 @@ -18,7 +18,7 @@ *******************************************************************************/ package org.ofbiz.service; -import static org.ofbiz.api.authorization.BasicPermissions.Access; +import static org.ofbiz.base.authorization.BasicPermissions.Access; import java.util.List; import java.util.Locale; Modified: ofbiz/branches/executioncontext20091231/framework/webapp/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/webapp/build.xml?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/webapp/build.xml (original) +++ ofbiz/branches/executioncontext20091231/framework/webapp/build.xml Sun Apr 4 17:12:53 2010 @@ -31,7 +31,6 @@ under the License. <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/executioncontext20091231/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java (original) +++ ofbiz/branches/executioncontext20091231/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java Sun Apr 4 17:12:53 2010 @@ -31,7 +31,7 @@ import java.util.Enumeration; import org.apache.bsf.BSFManager; -import org.ofbiz.api.authorization.AuthorizationManager; +import org.ofbiz.base.authorization.AuthorizationManager; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilHttp; Modified: ofbiz/branches/executioncontext20091231/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java (original) +++ ofbiz/branches/executioncontext20091231/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java Sun Apr 4 17:12:53 2010 @@ -39,7 +39,7 @@ import javax.transaction.Transaction; import javolution.util.FastList; import javolution.util.FastMap; -import static org.ofbiz.api.authorization.BasicPermissions.Access; +import static org.ofbiz.base.authorization.BasicPermissions.Access; import org.ofbiz.base.component.ComponentConfig; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; Modified: ofbiz/branches/executioncontext20091231/framework/webtools/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/webtools/build.xml?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/webtools/build.xml (original) +++ ofbiz/branches/executioncontext20091231/framework/webtools/build.xml Sun Apr 4 17:12:53 2010 @@ -31,7 +31,6 @@ under the License. <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/executioncontext20091231/framework/widget/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/widget/build.xml?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/widget/build.xml (original) +++ ofbiz/branches/executioncontext20091231/framework/widget/build.xml Sun Apr 4 17:12:53 2010 @@ -31,7 +31,6 @@ under the License. <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/executioncontext20091231/framework/widget/src/org/ofbiz/widget/form/ModelForm.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/widget/src/org/ofbiz/widget/form/ModelForm.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/widget/src/org/ofbiz/widget/form/ModelForm.java (original) +++ ofbiz/branches/executioncontext20091231/framework/widget/src/org/ofbiz/widget/form/ModelForm.java Sun Apr 4 17:12:53 2010 @@ -18,7 +18,7 @@ *******************************************************************************/ package org.ofbiz.widget.form; -import static org.ofbiz.api.authorization.BasicPermissions.View; +import static org.ofbiz.base.authorization.BasicPermissions.View; import java.io.IOException; import java.util.ArrayList; @@ -36,7 +36,7 @@ import javolution.util.FastList; import javolution.util.FastMap; import javolution.util.FastSet; -import org.ofbiz.api.context.ExecutionArtifact; +import org.ofbiz.base.context.ExecutionArtifact; import org.ofbiz.base.util.BshUtil; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; Modified: ofbiz/branches/executioncontext20091231/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original) +++ ofbiz/branches/executioncontext20091231/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Sun Apr 4 17:12:53 2010 @@ -34,8 +34,8 @@ import java.util.TimeZone; import javolution.util.FastList; import javolution.util.FastMap; -import static org.ofbiz.api.authorization.BasicPermissions.View; -import org.ofbiz.api.context.ExecutionArtifact; +import static org.ofbiz.base.authorization.BasicPermissions.View; +import org.ofbiz.base.context.ExecutionArtifact; import org.ofbiz.base.util.BshUtil; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; Modified: ofbiz/branches/executioncontext20091231/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java (original) +++ ofbiz/branches/executioncontext20091231/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java Sun Apr 4 17:12:53 2010 @@ -25,7 +25,7 @@ import java.util.Map; import javolution.util.FastMap; -import org.ofbiz.api.context.ThreadContext; +import org.ofbiz.base.context.ThreadContext; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.StringUtil; Modified: ofbiz/branches/executioncontext20091231/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java (original) +++ ofbiz/branches/executioncontext20091231/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java Sun Apr 4 17:12:53 2010 @@ -18,7 +18,7 @@ *******************************************************************************/ package org.ofbiz.widget.screen; -import static org.ofbiz.api.authorization.BasicPermissions.View; +import static org.ofbiz.base.authorization.BasicPermissions.View; import java.io.Serializable; import java.util.Collection; @@ -28,8 +28,8 @@ import java.util.Set; import javolution.util.FastSet; -import org.ofbiz.api.authorization.AccessController; -import org.ofbiz.api.context.ExecutionArtifact; +import org.ofbiz.base.authorization.AccessController; +import org.ofbiz.base.context.ExecutionArtifact; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.UtilGenerics; Modified: ofbiz/branches/executioncontext20091231/specialpurpose/ebay/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/ebay/build.xml?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/ebay/build.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/ebay/build.xml Sun Apr 4 17:12:53 2010 @@ -29,7 +29,6 @@ under the License. <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/executioncontext20091231/specialpurpose/googlebase/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/googlebase/build.xml?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/googlebase/build.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/googlebase/build.xml Sun Apr 4 17:12:53 2010 @@ -29,7 +29,6 @@ under the License. <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/executioncontext20091231/specialpurpose/googlecheckout/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/googlecheckout/build.xml?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/googlecheckout/build.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/googlecheckout/build.xml Sun Apr 4 17:12:53 2010 @@ -30,7 +30,6 @@ under the License. <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/executioncontext20091231/specialpurpose/hhfacility/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/hhfacility/build.xml?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/hhfacility/build.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/hhfacility/build.xml Sun Apr 4 17:12:53 2010 @@ -29,7 +29,6 @@ under the License. <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/executioncontext20091231/specialpurpose/oagis/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/oagis/build.xml?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/oagis/build.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/oagis/build.xml Sun Apr 4 17:12:53 2010 @@ -29,7 +29,6 @@ under the License. <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/executioncontext20091231/specialpurpose/pos/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/pos/build.xml?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/pos/build.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/pos/build.xml Sun Apr 4 17:12:53 2010 @@ -30,7 +30,6 @@ under the License. <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/executioncontext20091231/specialpurpose/webpos/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/webpos/build.xml?rev=930719&r1=930718&r2=930719&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/webpos/build.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/webpos/build.xml Sun Apr 4 17:12:53 2010 @@ -29,7 +29,6 @@ under the License. <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"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |