svn commit: r897585 - in /ofbiz/branches/executioncontext20091231: ./ framework/api/config/ framework/api/src/org/ofbiz/api/authorization/ framework/context/src/org/ofbiz/context/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r897585 - in /ofbiz/branches/executioncontext20091231: ./ framework/api/config/ framework/api/src/org/ofbiz/api/authorization/ framework/context/src/org/ofbiz/context/

adrianc
Author: adrianc
Date: Sun Jan 10 01:37:33 2010
New Revision: 897585

URL: http://svn.apache.org/viewvc?rev=897585&view=rev
Log:
Authorization Manager improvements.

Added:
    ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AuthorizationManagerException.java   (with props)
    ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AccessDeniedController.java   (with props)
    ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AccessGrantedController.java   (with props)
Modified:
    ofbiz/branches/executioncontext20091231/.classpath
    ofbiz/branches/executioncontext20091231/framework/api/config/api.properties
    ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AuthorizationManager.java
    ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/NullAuthorizationManager.java
    ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AuthorizationManagerImpl.java
    ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/ExecutionContextImpl.java

Modified: ofbiz/branches/executioncontext20091231/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/.classpath?rev=897585&r1=897584&r2=897585&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20091231/.classpath (original)
+++ ofbiz/branches/executioncontext20091231/.classpath Sun Jan 10 01:37:33 2010
@@ -1,221 +1,221 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="con" path="GROOVY_SUPPORT" exported="true"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="lib" path="applications/content/lib/lucene-core-2.4.1.jar"/>
-    <classpathentry kind="lib" path="applications/content/lib/poi-3.2-FINAL-20081019.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/ant-1.7.1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/ant-junit-1.7.1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/ant-launcher-1.7.1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/ant-trax-1.7.1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/ant/ant-apache-bsf-1.7.1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/ant/ant-nodeps-1.7.1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/antisamy-bin.1.2.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/avalon-framework-4.2.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/avalon-util-exception-1.0.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/barcode4j-fop-ext-complete-2.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/batik-all-1.7.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/fop-0.95.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/freemarker-2.3.15.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/httpclient-4.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/httpcore-4.0.1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/httpunit.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/ical4j-1.0-beta5.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/icu4j-4_2_1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/jakarta-regexp-1.5.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/javolution-5.2.3.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/jcip-annotations-1.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/jdbm-1.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/jdom-1.1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/jpim-0.1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/juel-2.1.1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/junit.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/junitperf.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/log4j-1.2.15.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/mail.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/mx4j-3.0.1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/mx4j-remote-3.0.1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/nekohtml.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/owasp-esapi-full-java-1.4.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/resolver-2.9.1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/serializer-2.9.1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/Tidy.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/xercesImpl-2.9.1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/xml-apis-2.9.1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/xml-apis-ext-1.3.04.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/xmlgraphics-commons-1.3.1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/commons/commons-beanutils-1.7.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/commons/commons-cli-1.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/commons/commons-codec-1.3.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/commons/commons-collections-3.2.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/commons/commons-digester-1.8.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/commons/commons-discovery-0.4.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/commons/commons-el-1.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/commons/commons-fileupload-1.2.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/commons/commons-io-1.3.1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/commons/commons-lang-2.3.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/commons/commons-logging-1.1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/commons/commons-modeler-2.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/commons/commons-net-1.4.1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/commons/commons-pool-1.3.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/commons/commons-primitives-1.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/commons/commons-validator-1.3.1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/commons/commons-vfs-20070730.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-activation_1.0.2_spec-1.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-j2ee-connector_1.5_spec-1.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jaxr_1.0_spec-1.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jaxrpc_1.1_spec-1.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jms_1.1_spec-1.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jta_1.1_spec-1.1.1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-qname_1.1_spec-1.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-saaj_1.1_spec-1.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.16-annotations_spec.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.16-el_2.1_spec.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.16-jsp_2.1_spec.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.16-servlet_2.5_spec.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/scripting/antlr-2.7.6.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/scripting/asm-3.2.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/scripting/asm-analysis-3.2.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/scripting/asm-tree-3.2.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/scripting/asm-util-3.2.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/scripting/bsf-2.4.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/scripting/bsh-2.0b4.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/scripting/groovy-1.7-rc-2.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/scripting/jakarta-oro-2.0.8.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/scripting/jython-nooro.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-catalina.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-catalina-ha.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-catalina-tribes.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-jasper.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-jasper-el.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-jasper-jdt.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-tomcat-coyote.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-tomcat-dbcp.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-tomcat-juli.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-tomcat-juli-adapters.jar"/>
-    <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.3-20091113-r835956.jar"/>
-    <classpathentry kind="lib" path="framework/entity/lib/ofbiz-minerva.jar"/>
-    <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-2.1.1.jar"/>
-    <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-2.1.1.jar"/>
-    <classpathentry kind="lib" path="framework/guiapp/lib/XuiCoreSwing-v3.2rc2b.jar"/>
-    <classpathentry kind="lib" path="framework/guiapp/lib/XuiOptional-v3.2rc2b.jar"/>
-    <classpathentry kind="lib" path="framework/jetty/lib/jasper-compiler-5.5.15.jar"/>
-    <classpathentry kind="lib" path="framework/jetty/lib/jasper-runtime-5.5.15.jar"/>
-    <classpathentry kind="lib" path="framework/jetty/lib/jetty-6.1.11.jar"/>
-    <classpathentry kind="lib" path="framework/jetty/lib/jetty-ajp-6.1.11.jar"/>
-    <classpathentry kind="lib" path="framework/jetty/lib/jetty-sslengine-6.1.11.jar"/>
-    <classpathentry kind="lib" path="framework/jetty/lib/jetty-util-6.1.11.jar"/>
-    <classpathentry kind="lib" path="framework/service/lib/axis.jar"/>
-    <classpathentry kind="lib" path="framework/service/lib/axis-ant.jar"/>
-    <classpathentry kind="lib" path="framework/service/lib/wsdl4j.jar"/>
-    <classpathentry kind="lib" path="framework/service/lib/axiom-api-1.2.8.jar"/>
-    <classpathentry kind="lib" path="framework/service/lib/axiom-impl-1.2.8.jar"/>
-    <classpathentry kind="lib" path="framework/service/lib/axis2-kernel-1.5.1.jar"/>
-    <classpathentry kind="lib" path="framework/service/lib/axis2-transport-http-1.5.1.jar"/>
-    <classpathentry kind="lib" path="framework/service/lib/axis2-transport-local-1.5.1.jar"/>
-    <classpathentry kind="lib" path="framework/service/lib/commons-httpclient-3.1.jar"/>
-    <classpathentry kind="lib" path="framework/service/lib/neethi-2.0.4.jar"/>
-    <classpathentry kind="lib" path="framework/service/lib/XmlSchema-1.4.3.jar"/>
-    <classpathentry kind="lib" path="framework/testtools/lib/selenium-java-client-driver.jar"/>
-    <classpathentry kind="lib" path="framework/webapp/lib/DataVision-1.0.0.jar"/>
-    <classpathentry kind="lib" path="framework/webapp/lib/ezmorph-0.9.1.jar"/>
-    <classpathentry kind="lib" path="framework/webapp/lib/itext-2.0.1.jar"/>
-    <classpathentry kind="lib" path="framework/webapp/lib/json-lib-2.2.3-jdk15.jar"/>
-    <classpathentry kind="lib" path="framework/webapp/lib/rome-0.9.jar"/>
-    <classpathentry kind="lib" path="framework/webapp/lib/velocity-1.6.1.jar"/>
-    <classpathentry kind="lib" path="framework/webapp/lib/ws-commons-java5-1.0.1.jar"/>
-    <classpathentry kind="lib" path="framework/webapp/lib/ws-commons-util-1.0.1.jar"/>
-    <classpathentry kind="lib" path="framework/webapp/lib/xmlrpc-client-3.0.jar"/>
-    <classpathentry kind="lib" path="framework/webapp/lib/xmlrpc-common-3.0.jar"/>
-    <classpathentry kind="lib" path="framework/webapp/lib/xmlrpc-server-3.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/webslinger-base-invoker-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-cache-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-collections-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-collections-arrays-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-concurrent-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-html-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-io-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-javacc-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-junit-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-lang-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-logging-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-resolver-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-util-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-xml-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-catalina-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-cgi-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-embryo-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-beanshell-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-bsf-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-code-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-commonsvfs-object-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-directory-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-freemarker-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-groovy-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-image-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-janino-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-jruby-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-jython-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-nutch-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-plan9-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-quercus-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-rhino-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-servlet-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-template-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-velocity-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-wiki-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-launcher-20091211-3897-7ab22baea4b6.jar"/>
-    <classpathentry kind="lib" path="specialpurpose/googlecheckout/lib/checkout-sdk-0.8.8.jar"/>
-    <classpathentry kind="lib" path="specialpurpose/ldap/lib/cas-server-core-3.3.jar"/>
-    <classpathentry kind="lib" path="specialpurpose/pos/lib/jcl.jar"/>
-    <classpathentry kind="lib" path="specialpurpose/pos/lib/jpos18-controls.jar"/>
-    <classpathentry kind="lib" path="specialpurpose/pos/lib/looks-2.0.2.jar"/>
-    <classpathentry kind="src" path="applications/accounting/src" excluding="org/ofbiz/accounting/thirdparty/cybersource/**|org/ofbiz/accounting/thirdparty/verisign/**|org/ofbiz/accounting/thirdparty/worldpay/**|org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java|org/ofbiz/accounting/thirdparty/orbital/**"/>
-    <classpathentry kind="src" path="applications/content/src" excluding="org/ofbiz/content/openoffice/|org/ofbiz/content/report/"/>
-    <classpathentry kind="src" path="applications/manufacturing/src"/>
-    <classpathentry kind="src" path="applications/marketing/src"/>
-    <classpathentry kind="src" path="applications/order/src" excluding="org/ofbiz/order/thirdparty/taxware/**"/>
-    <classpathentry kind="src" path="applications/party/src"/>
-    <classpathentry kind="src" path="applications/product/src" excluding="ShipmentScaleApplet.java"/>
-    <classpathentry kind="src" path="applications/securityext/src" excluding="org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java"/>
-    <classpathentry kind="src" path="applications/workeffort/src"/>
-    <classpathentry kind="src" path="framework/api/src"/>
-    <classpathentry kind="src" path="framework/appserver/src"/>
-    <classpathentry kind="src" path="framework/base/src" excluding="org/ofbiz/base/config/CoberturaInstrumenter.java"/>
-    <classpathentry kind="src" path="framework/bi/src"/>
-    <classpathentry kind="src" path="framework/catalina/src"/>
-    <classpathentry kind="src" path="framework/common/src"/>
-    <classpathentry kind="src" path="framework/context/src"/>
-    <classpathentry kind="src" path="framework/datafile/src"/>
-    <classpathentry kind="src" path="framework/entity/src" excluding="org/ofbiz/entity/connection/XaPoolConnectionFactory.java"/>
-    <classpathentry kind="src" path="framework/entityext/src"/>
-    <classpathentry kind="src" path="framework/example/src"/>
-    <classpathentry kind="src" path="framework/geronimo/src"/>
-    <classpathentry kind="src" path="framework/guiapp/src"/>
-    <classpathentry kind="src" path="framework/jetty/src"/>
-    <classpathentry kind="src" path="framework/minilang/src"/>
-    <classpathentry kind="src" path="framework/security/src"/>
-    <classpathentry kind="src" path="framework/service/src"/>
-    <classpathentry kind="src" path="framework/sql/src"/>
-    <classpathentry kind="src" path="framework/sql/build/gen-src/javacc"/>
-    <classpathentry kind="src" path="framework/start/src"/>
-    <classpathentry kind="src" path="framework/testtools/src" excluding="org/ofbiz/testtools/seleniumxml/**"/>
-    <classpathentry kind="src" path="framework/webapp/src" excluding="org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java|org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java|org/ofbiz/webapp/view/FopPdfViewHandler.java|org/ofbiz/webapp/view/GenericViewRenderer.java|org/ofbiz/webapp/view/JPublishViewHandler.java|org/ofbiz/webapp/view/JPublishWrapper.java|org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java|org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java|org/ofbiz/webapp/view/JasperReportsJXlsViewHandler.java|org/ofbiz/webapp/view/JasperReportsPoiXlsViewHandler.java"/>
-    <classpathentry kind="src" path="framework/webslinger/src"/>
-    <classpathentry kind="src" path="framework/webtools/src"/>
-    <classpathentry kind="src" path="framework/widget/src"/>
-    <classpathentry kind="src" path="specialpurpose/assetmaint/src"/>
-    <classpathentry kind="src" path="specialpurpose/ebay/src"/>
-    <classpathentry kind="src" path="specialpurpose/ecommerce/src"/>
-    <classpathentry kind="src" path="specialpurpose/googlebase/src"/>
-    <classpathentry kind="src" path="specialpurpose/googlecheckout/src"/>
-    <classpathentry kind="src" path="specialpurpose/hhfacility/src"/>
-    <classpathentry kind="src" path="specialpurpose/ldap/src"/>
-    <classpathentry kind="src" path="specialpurpose/oagis/src"/>
-    <classpathentry kind="src" path="specialpurpose/pos/src"/>
-    <classpathentry kind="src" path="specialpurpose/projectmgr/src"/>
-    <classpathentry kind="src" path="specialpurpose/shark/src" excluding="org/enhydra/|org/ofbiz/"/>
-    <classpathentry kind="src" path="specialpurpose/workflow/src"/>
-    <classpathentry kind="output" path="bin"/>
+ <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="applications/content/lib/lucene-core-2.4.1.jar"/>
+ <classpathentry kind="lib" path="applications/content/lib/poi-3.2-FINAL-20081019.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/ant-1.7.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/ant-junit-1.7.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/ant-launcher-1.7.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/ant-trax-1.7.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/ant/ant-apache-bsf-1.7.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/ant/ant-nodeps-1.7.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/antisamy-bin.1.2.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/avalon-framework-4.2.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/avalon-util-exception-1.0.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/barcode4j-fop-ext-complete-2.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/batik-all-1.7.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/fop-0.95.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/freemarker-2.3.15.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/httpclient-4.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/httpcore-4.0.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/httpunit.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/ical4j-1.0-beta5.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/icu4j-4_2_1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/jakarta-regexp-1.5.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/javolution-5.2.3.jar" sourcepath="C:/develop/src/javolution.zip"/>
+ <classpathentry kind="lib" path="framework/base/lib/jcip-annotations-1.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/jdbm-1.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/jdom-1.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/jpim-0.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/juel-2.1.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/junit.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/junitperf.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/log4j-1.2.15.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/mail.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/mx4j-3.0.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/mx4j-remote-3.0.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/nekohtml.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/owasp-esapi-full-java-1.4.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/resolver-2.9.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/serializer-2.9.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/Tidy.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/xercesImpl-2.9.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/xml-apis-2.9.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/xml-apis-ext-1.3.04.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/xmlgraphics-commons-1.3.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-beanutils-1.7.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-cli-1.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-codec-1.3.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-collections-3.2.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-digester-1.8.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-discovery-0.4.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-el-1.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-fileupload-1.2.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-io-1.3.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-lang-2.3.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-logging-1.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-modeler-2.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-net-1.4.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-pool-1.3.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-primitives-1.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-validator-1.3.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-vfs-20070730.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-activation_1.0.2_spec-1.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-j2ee-connector_1.5_spec-1.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jaxr_1.0_spec-1.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jaxrpc_1.1_spec-1.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jms_1.1_spec-1.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jta_1.1_spec-1.1.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-qname_1.1_spec-1.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-saaj_1.1_spec-1.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.16-annotations_spec.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.16-el_2.1_spec.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.16-jsp_2.1_spec.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.16-servlet_2.5_spec.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/scripting/antlr-2.7.6.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/scripting/asm-3.2.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/scripting/asm-analysis-3.2.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/scripting/asm-tree-3.2.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/scripting/asm-util-3.2.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/scripting/bsf-2.4.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/scripting/bsh-2.0b4.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/scripting/groovy-1.7-rc-2.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/scripting/jakarta-oro-2.0.8.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/scripting/jython-nooro.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-catalina.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-catalina-ha.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-catalina-tribes.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-jasper.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-jasper-el.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-jasper-jdt.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-tomcat-coyote.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-tomcat-dbcp.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-tomcat-juli.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-tomcat-juli-adapters.jar"/>
+ <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.3-20091113-r835956.jar"/>
+ <classpathentry kind="lib" path="framework/entity/lib/ofbiz-minerva.jar"/>
+ <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-2.1.1.jar"/>
+ <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-2.1.1.jar"/>
+ <classpathentry kind="lib" path="framework/guiapp/lib/XuiCoreSwing-v3.2rc2b.jar"/>
+ <classpathentry kind="lib" path="framework/guiapp/lib/XuiOptional-v3.2rc2b.jar"/>
+ <classpathentry kind="lib" path="framework/jetty/lib/jasper-compiler-5.5.15.jar"/>
+ <classpathentry kind="lib" path="framework/jetty/lib/jasper-runtime-5.5.15.jar"/>
+ <classpathentry kind="lib" path="framework/jetty/lib/jetty-6.1.11.jar"/>
+ <classpathentry kind="lib" path="framework/jetty/lib/jetty-ajp-6.1.11.jar"/>
+ <classpathentry kind="lib" path="framework/jetty/lib/jetty-sslengine-6.1.11.jar"/>
+ <classpathentry kind="lib" path="framework/jetty/lib/jetty-util-6.1.11.jar"/>
+ <classpathentry kind="lib" path="framework/service/lib/axis.jar"/>
+ <classpathentry kind="lib" path="framework/service/lib/axis-ant.jar"/>
+ <classpathentry kind="lib" path="framework/service/lib/wsdl4j.jar"/>
+ <classpathentry kind="lib" path="framework/service/lib/axiom-api-1.2.8.jar"/>
+ <classpathentry kind="lib" path="framework/service/lib/axiom-impl-1.2.8.jar"/>
+ <classpathentry kind="lib" path="framework/service/lib/axis2-kernel-1.5.1.jar"/>
+ <classpathentry kind="lib" path="framework/service/lib/axis2-transport-http-1.5.1.jar"/>
+ <classpathentry kind="lib" path="framework/service/lib/axis2-transport-local-1.5.1.jar"/>
+ <classpathentry kind="lib" path="framework/service/lib/commons-httpclient-3.1.jar"/>
+ <classpathentry kind="lib" path="framework/service/lib/neethi-2.0.4.jar"/>
+ <classpathentry kind="lib" path="framework/service/lib/XmlSchema-1.4.3.jar"/>
+ <classpathentry kind="lib" path="framework/testtools/lib/selenium-java-client-driver.jar"/>
+ <classpathentry kind="lib" path="framework/webapp/lib/DataVision-1.0.0.jar"/>
+ <classpathentry kind="lib" path="framework/webapp/lib/ezmorph-0.9.1.jar"/>
+ <classpathentry kind="lib" path="framework/webapp/lib/itext-2.0.1.jar"/>
+ <classpathentry kind="lib" path="framework/webapp/lib/json-lib-2.2.3-jdk15.jar"/>
+ <classpathentry kind="lib" path="framework/webapp/lib/rome-0.9.jar"/>
+ <classpathentry kind="lib" path="framework/webapp/lib/velocity-1.6.1.jar"/>
+ <classpathentry kind="lib" path="framework/webapp/lib/ws-commons-java5-1.0.1.jar"/>
+ <classpathentry kind="lib" path="framework/webapp/lib/ws-commons-util-1.0.1.jar"/>
+ <classpathentry kind="lib" path="framework/webapp/lib/xmlrpc-client-3.0.jar"/>
+ <classpathentry kind="lib" path="framework/webapp/lib/xmlrpc-common-3.0.jar"/>
+ <classpathentry kind="lib" path="framework/webapp/lib/xmlrpc-server-3.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/webslinger-base-invoker-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-cache-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-collections-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-collections-arrays-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-concurrent-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-html-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-io-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-javacc-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-junit-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-lang-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-logging-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-resolver-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-util-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-xml-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-catalina-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-cgi-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-embryo-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-beanshell-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-bsf-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-code-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-commonsvfs-object-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-directory-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-freemarker-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-groovy-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-image-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-janino-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-jruby-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-jython-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-nutch-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-plan9-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-quercus-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-rhino-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-servlet-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-template-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-velocity-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-wiki-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-launcher-20091211-3897-7ab22baea4b6.jar"/>
+ <classpathentry kind="lib" path="specialpurpose/googlecheckout/lib/checkout-sdk-0.8.8.jar"/>
+ <classpathentry kind="lib" path="specialpurpose/ldap/lib/cas-server-core-3.3.jar"/>
+ <classpathentry kind="lib" path="specialpurpose/pos/lib/jcl.jar"/>
+ <classpathentry kind="lib" path="specialpurpose/pos/lib/jpos18-controls.jar"/>
+ <classpathentry kind="lib" path="specialpurpose/pos/lib/looks-2.0.2.jar"/>
+ <classpathentry excluding="org/ofbiz/accounting/thirdparty/cybersource/**|org/ofbiz/accounting/thirdparty/verisign/**|org/ofbiz/accounting/thirdparty/worldpay/**|org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java|org/ofbiz/accounting/thirdparty/orbital/**" kind="src" path="applications/accounting/src"/>
+ <classpathentry excluding="org/ofbiz/content/openoffice/|org/ofbiz/content/report/" kind="src" path="applications/content/src"/>
+ <classpathentry kind="src" path="applications/manufacturing/src"/>
+ <classpathentry kind="src" path="applications/marketing/src"/>
+ <classpathentry excluding="org/ofbiz/order/thirdparty/taxware/**" kind="src" path="applications/order/src"/>
+ <classpathentry kind="src" path="applications/party/src"/>
+ <classpathentry excluding="ShipmentScaleApplet.java" kind="src" path="applications/product/src"/>
+ <classpathentry excluding="org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java" kind="src" path="applications/securityext/src"/>
+ <classpathentry kind="src" path="applications/workeffort/src"/>
+ <classpathentry kind="src" path="framework/api/src"/>
+ <classpathentry kind="src" path="framework/appserver/src"/>
+ <classpathentry excluding="org/ofbiz/base/config/CoberturaInstrumenter.java" kind="src" path="framework/base/src"/>
+ <classpathentry kind="src" path="framework/bi/src"/>
+ <classpathentry kind="src" path="framework/catalina/src"/>
+ <classpathentry kind="src" path="framework/common/src"/>
+ <classpathentry kind="src" path="framework/context/src"/>
+ <classpathentry kind="src" path="framework/datafile/src"/>
+ <classpathentry excluding="org/ofbiz/entity/connection/XaPoolConnectionFactory.java" kind="src" path="framework/entity/src"/>
+ <classpathentry kind="src" path="framework/entityext/src"/>
+ <classpathentry kind="src" path="framework/example/src"/>
+ <classpathentry kind="src" path="framework/geronimo/src"/>
+ <classpathentry kind="src" path="framework/guiapp/src"/>
+ <classpathentry kind="src" path="framework/jetty/src"/>
+ <classpathentry kind="src" path="framework/minilang/src"/>
+ <classpathentry kind="src" path="framework/security/src"/>
+ <classpathentry kind="src" path="framework/service/src"/>
+ <classpathentry kind="src" path="framework/sql/src"/>
+ <classpathentry kind="src" path="framework/sql/build/gen-src/javacc"/>
+ <classpathentry kind="src" path="framework/start/src"/>
+ <classpathentry excluding="org/ofbiz/testtools/seleniumxml/**" kind="src" path="framework/testtools/src"/>
+ <classpathentry excluding="org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java|org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java|org/ofbiz/webapp/view/FopPdfViewHandler.java|org/ofbiz/webapp/view/GenericViewRenderer.java|org/ofbiz/webapp/view/JPublishViewHandler.java|org/ofbiz/webapp/view/JPublishWrapper.java|org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java|org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java|org/ofbiz/webapp/view/JasperReportsJXlsViewHandler.java|org/ofbiz/webapp/view/JasperReportsPoiXlsViewHandler.java" kind="src" path="framework/webapp/src"/>
+ <classpathentry kind="src" path="framework/webslinger/src"/>
+ <classpathentry kind="src" path="framework/webtools/src"/>
+ <classpathentry kind="src" path="framework/widget/src"/>
+ <classpathentry kind="src" path="specialpurpose/assetmaint/src"/>
+ <classpathentry kind="src" path="specialpurpose/ebay/src"/>
+ <classpathentry kind="src" path="specialpurpose/ecommerce/src"/>
+ <classpathentry kind="src" path="specialpurpose/googlebase/src"/>
+ <classpathentry kind="src" path="specialpurpose/googlecheckout/src"/>
+ <classpathentry kind="src" path="specialpurpose/hhfacility/src"/>
+ <classpathentry kind="src" path="specialpurpose/ldap/src"/>
+ <classpathentry kind="src" path="specialpurpose/oagis/src"/>
+ <classpathentry kind="src" path="specialpurpose/pos/src"/>
+ <classpathentry kind="src" path="specialpurpose/projectmgr/src"/>
+ <classpathentry excluding="org/enhydra/|org/ofbiz/" kind="src" path="specialpurpose/shark/src"/>
+ <classpathentry kind="src" path="specialpurpose/workflow/src"/>
+ <classpathentry kind="output" path="bin"/>
 </classpath>

Modified: ofbiz/branches/executioncontext20091231/framework/api/config/api.properties
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/api/config/api.properties?rev=897585&r1=897584&r2=897585&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20091231/framework/api/config/api.properties (original)
+++ ofbiz/branches/executioncontext20091231/framework/api/config/api.properties Sun Jan 10 01:37:33 2010
@@ -34,7 +34,7 @@
 executionContext.verbose=false
 
 # Set to true to enable AuthorizationManager info messages.
-authorizationManager.verbose=false
+authorizationManager.verbose=true
 
 # Set to true to disable the AuthorizationManager.
 authorizationManager.disabled=false

Modified: ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AuthorizationManager.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AuthorizationManager.java?rev=897585&r1=897584&r2=897585&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AuthorizationManager.java (original)
+++ ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AuthorizationManager.java Sun Jan 10 01:37:33 2010
@@ -18,38 +18,40 @@
  *******************************************************************************/
 package org.ofbiz.api.authorization;
 
-import java.security.AccessControlException;
 import java.security.Permission;
 
 /**
- * AuthorizationManager interface.
+ * An object used for managing users, user groups, and permissions.
  */
 public interface AuthorizationManager {
 
- // Get the access controller for an artifact/user combination
- public AccessController getAccessController () throws AccessControlException;
+ public void assignGroupPermission(String userGroupId, String artifactId, Permission permission) throws AuthorizationManagerException;
 
- // User methods
-    public void createUser(String userLoginId, String password);
-    public void updateUser(String userLoginId, String password);
-    public void deleteUser(String userLoginId);
-
-    // User Group methods
-    public String createUserGroup(String description);
-    public void updateUserGroup(String userGroupId, String description);
-    public void deleteUserGroup(String userGroupId);
-
-    // User Group Assignment methods
-    public void assignUserToGroup(String userLoginId, String userGroupId);
-    public void deleteUserFromGroup(String userLoginId, String userGroupId);
-    public void assignGroupToGroup(String childGroupId, String parentGroupId);
-    public void deleteGroupFromGroup(String childGroupId, String parentGroupId);
-
-    // Permission Assignment methods
-    public void assignUserPermission(String userLoginId, String artifactId, Permission permission);
-    public void deleteUserPermission(String userLoginId, String artifactId, Permission permission);
-    public void assignGroupPermission(String userGroupId, String artifactId, Permission permission);
-    public void deleteGroupPermission(String userGroupId, String artifactId, Permission permission);
+    public void assignGroupToGroup(String childGroupId, String parentGroupId) throws AuthorizationManagerException;
 
+    public void assignUserPermission(String userLoginId, String artifactId, Permission permission) throws AuthorizationManagerException;
 
+    public void assignUserToGroup(String userLoginId, String userGroupId) throws AuthorizationManagerException;
+
+    public void createUser(String userLoginId, String password) throws AuthorizationManagerException;
+
+    public String createUserGroup(String description) throws AuthorizationManagerException;
+
+    public void deleteGroupFromGroup(String childGroupId, String parentGroupId) throws AuthorizationManagerException;
+
+    public void deleteGroupPermission(String userGroupId, String artifactId, Permission permission) throws AuthorizationManagerException;
+
+    public void deleteUser(String userLoginId) throws AuthorizationManagerException;
+
+    public void deleteUserFromGroup(String userLoginId, String userGroupId) throws AuthorizationManagerException;
+
+    public void deleteUserGroup(String userGroupId) throws AuthorizationManagerException;
+
+    public void deleteUserPermission(String userLoginId, String artifactId, Permission permission) throws AuthorizationManagerException;
+
+    public AccessController getAccessController() throws AuthorizationManagerException;
+
+    public void updateUser(String userLoginId, String password) throws AuthorizationManagerException;
+
+    public void updateUserGroup(String userGroupId, String description) throws AuthorizationManagerException;
 }

Added: ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AuthorizationManagerException.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AuthorizationManagerException.java?rev=897585&view=auto
==============================================================================
--- ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AuthorizationManagerException.java (added)
+++ ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AuthorizationManagerException.java Sun Jan 10 01:37:33 2010
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * 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.api.authorization;
+
+
+/**
+ * AuthorizationManagerException class.
+ */
+@SuppressWarnings("serial")
+public class AuthorizationManagerException extends Exception {
+    public AuthorizationManagerException() {
+    super();
+    }
+
+    public AuthorizationManagerException(String message) {
+    super(message);
+    }
+
+    public AuthorizationManagerException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public AuthorizationManagerException(Throwable cause) {
+        super(cause);
+    }
+}

Propchange: ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AuthorizationManagerException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AuthorizationManagerException.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AuthorizationManagerException.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/NullAuthorizationManager.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/NullAuthorizationManager.java?rev=897585&r1=897584&r2=897585&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/NullAuthorizationManager.java (original)
+++ ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/NullAuthorizationManager.java Sun Jan 10 01:37:33 2010
@@ -20,36 +20,17 @@
 
 import java.security.AccessControlException;
 import java.security.Permission;
-import java.util.List;
-import java.util.ListIterator;
 
-import org.ofbiz.api.context.ThreadContext;
-import org.ofbiz.base.util.Debug;
-import org.ofbiz.base.util.UtilProperties;
-
-/** An implementation of <code>AuthorizationManager</code> that allows
- * unrestricted access to all security-aware artifacts. This class
- * is intended to be used in situations where user permissions are
- * not available or accessible (the initial data load for example).
- * <p>Extreme care should be taken when using this class so that
- * security holes are not introduced. A recommended strategy is:<br><br>
- * <ul>
- * <li>Save the current <code>AuthorizationManager</code> instance in
- * a local variable - using <code>ExecutionContext.getSecurity()</code>.</li>
- * <li>Call <code>ExecutionContext.setSecurity(...)</code> with a
- * <code>NullAuthorizationManager</code> instance.</li>
- * <li>Perform the unrestricted tasks.</li>
- * <li>Restore the original <code>AuthorizationManager</code> by
- * calling <code>ExecutionContext.setSecurity(...)</code> with the
- * saved <code>AuthorizationManager</code> instance.</li>
- * </ul></p>
- *
- */
 public class NullAuthorizationManager implements AuthorizationManager {
 
-    protected static final String module = NullAuthorizationManager.class.getName();
-    protected static final AccessController nullAccessController = new NullAccessController();
+    public static final String module = NullAuthorizationManager.class.getName();
 
+    protected final AccessController accessController;
+    
+    public NullAuthorizationManager(AccessController accessController) {
+        this.accessController = accessController;
+    }
+    
     public void assignGroupPermission(String userGroupId, String artifactId,
             Permission permission) {
     }
@@ -98,35 +79,6 @@
     }
 
     public AccessController getAccessController() throws AccessControlException {
-        return nullAccessController;
-    }
-
-    /** An implementation of the <code>AccessController</code> interface
-     * that allows unrestricted access to all security-aware artifacts.
-     */
-    protected static class NullAccessController implements AccessController {
-
-        // Temporary - will be removed later
-        protected boolean verbose = false;
-        protected NullAccessController() {
-            this.verbose = "true".equals(UtilProperties.getPropertyValue("api.properties", "authorizationManager.verbose"));
-        }
-
-        public <E> List<E> applyFilters(List<E> list) {
-            return list;
-        }
-
-        public <E> ListIterator<E> applyFilters(ListIterator<E> list) {
-            return list;
-        }
-
-        public void checkPermission(Permission permission) throws AccessControlException {
-            if (this.verbose) {
-                Debug.logInfo("Checking permission: " + ThreadContext.getExecutionPath() + "[" + permission + "]", module);
-                Debug.logInfo("Found permission(s): " +
-                        "null-access-controller@" + ThreadContext.getExecutionPath() + "[admin=true]", module);
-            }
-        }
+        return this.accessController;
     }
-
 }

Added: 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=897585&view=auto
==============================================================================
--- ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AccessDeniedController.java (added)
+++ ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AccessDeniedController.java Sun Jan 10 01:37:33 2010
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * 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.context;
+
+import java.security.AccessControlException;
+import java.security.Permission;
+import java.util.List;
+import java.util.ListIterator;
+
+import javolution.util.FastList;
+
+import org.ofbiz.api.authorization.AccessController;
+import org.ofbiz.api.context.ThreadContext;
+import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.UtilProperties;
+import org.ofbiz.base.util.UtilGenerics;
+
+/** An implementation of the <code>AccessController</code> interface
+ * that denies access to all security-aware artifacts.
+ */
+public class AccessDeniedController implements AccessController {
+
+    public static final String module = AccessDeniedController.class.getName();
+    // Temporary - will be removed later
+    protected boolean verbose = false;
+
+    public AccessDeniedController() {
+        this.verbose = "true".equals(UtilProperties.getPropertyValue("api.properties", "authorizationManager.verbose"));
+    }
+
+    public <E> List<E> applyFilters(List<E> list) {
+        return FastList.newInstance();
+    }
+
+    public <E> ListIterator<E> applyFilters(ListIterator<E> list) {
+        return UtilGenerics.cast(FastList.newInstance().listIterator());
+    }
+
+    public void checkPermission(Permission permission) throws AccessControlException {
+        if (this.verbose) {
+            Debug.logInfo("Checking permission: " + ThreadContext.getExecutionPath() + "[" + permission + "]", module);
+            Debug.logInfo("Found permission(s): " +
+                    "access-denied-controller@" + ThreadContext.getExecutionPath() + "[]", module);
+        }
+        throw new AccessControlException(null, permission);
+    }
+}

Propchange: ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AccessDeniedController.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AccessDeniedController.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AccessDeniedController.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: 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=897585&view=auto
==============================================================================
--- ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AccessGrantedController.java (added)
+++ ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AccessGrantedController.java Sun Jan 10 01:37:33 2010
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * 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.context;
+
+import java.security.AccessControlException;
+import java.security.Permission;
+import java.util.List;
+import java.util.ListIterator;
+
+import org.ofbiz.api.authorization.AccessController;
+import org.ofbiz.api.context.ThreadContext;
+import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.UtilProperties;
+
+/** An implementation of the <code>AccessController</code> interface
+ * that allows unrestricted access to all security-aware artifacts.
+ */
+public class AccessGrantedController implements AccessController {
+
+    public static final String module = AccessGrantedController.class.getName();
+    // Temporary - will be removed later
+    protected boolean verbose = false;
+
+    public AccessGrantedController() {
+        this.verbose = "true".equals(UtilProperties.getPropertyValue("api.properties", "authorizationManager.verbose"));
+    }
+
+    public <E> List<E> applyFilters(List<E> list) {
+        return list;
+    }
+
+    public <E> ListIterator<E> applyFilters(ListIterator<E> list) {
+        return list;
+    }
+
+    public void checkPermission(Permission permission) throws AccessControlException {
+        if (this.verbose) {
+            Debug.logInfo("Checking permission: " + ThreadContext.getExecutionPath() + "[" + permission + "]", module);
+            Debug.logInfo("Found permission(s): " +
+                    "access-granted-controller@" + ThreadContext.getExecutionPath() + "[admin=true]", module);
+        }
+    }
+}

Propchange: ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AccessGrantedController.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AccessGrantedController.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AccessGrantedController.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

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=897585&r1=897584&r2=897585&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 Jan 10 01:37:33 2010
@@ -18,11 +18,11 @@
  *******************************************************************************/
 package org.ofbiz.context;
 
-import java.security.AccessControlException;
 import java.security.Permission;
 import java.util.List;
 
 import org.ofbiz.api.authorization.AccessController;
+import org.ofbiz.api.authorization.AuthorizationManagerException;
 import org.ofbiz.api.authorization.BasicPermissions;
 import org.ofbiz.api.authorization.AuthorizationManager;
 import org.ofbiz.entity.Delegator;
@@ -46,91 +46,7 @@
     public static final String module = AuthorizationManagerImpl.class.getName();
     protected static final UtilCache<String, AccessController> userPermCache = UtilCache.createUtilCache("authorization.UserPermissions");
 
-    public AuthorizationManagerImpl() {
-    }
-
- public void assignGroupPermission(String userGroupId, String artifactId, Permission permission) {
- // TODO Auto-generated method stub
-
- }
-
- public void assignGroupToGroup(String childGroupId, String parentGroupId) {
- // TODO Auto-generated method stub
-
- }
-
- public void assignUserPermission(String userLoginId, String artifactId, Permission permission) {
- // TODO Auto-generated method stub
-
- }
-
- public void assignUserToGroup(String userLoginId, String userGroupId) {
- // TODO Auto-generated method stub
-
- }
-
- public void createUser(String userLoginId, String password) {
- // TODO Auto-generated method stub
-
- }
-
- public String createUserGroup(String description) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void deleteGroupFromGroup(String childGroupId, String parentGroupId) {
- // TODO Auto-generated method stub
-
- }
-
- public void deleteGroupPermission(String userGroupId, String artifactId, Permission permission) {
- // TODO Auto-generated method stub
-
- }
-
- public void deleteUser(String userLoginId) {
- // TODO Auto-generated method stub
-
- }
-
- public void deleteUserFromGroup(String userLoginId, String userGroupId) {
- // TODO Auto-generated method stub
-
- }
-
- public void deleteUserGroup(String userGroupId) {
- // TODO Auto-generated method stub
-
- }
-
- public void deleteUserPermission(String userLoginId, String artifactId, Permission permission) {
- // TODO Auto-generated method stub
-
- }
-
- public void updateUser(String userLoginId, String password) {
- // TODO Auto-generated method stub
-
- }
-
- public void updateUserGroup(String userGroupId, String description) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
-    public void clearUserData(GenericValue userLogin) {
-        super.clearUserData(userLogin);
-        userPermCache.remove(userLogin.getString("userLogin"));
-    }
-
-    public AccessController getAccessController() throws AccessControlException {
-        String userLoginId = ThreadContext.getUserLogin().getString("userLoginId");
-        return getAccessController(userLoginId);
- }
-
-    protected static AccessController getAccessController(String userLoginId) throws AccessControlException {
+    protected static AccessController getAccessController(String userLoginId) throws AuthorizationManagerException {
         AccessController accessController = userPermCache.get(userLoginId);
         if (accessController != null) {
             return accessController;
@@ -151,15 +67,14 @@
                 accessController = new AccessControllerImpl(node);
                 userPermCache.put(userLoginId, accessController);
             } catch (GenericEntityException e) {
-                throw new AccessControlException(e.getMessage());
+                throw new AuthorizationManagerException(e);
             } finally {
                 ThreadContext.endRunUnprotected();
             }
         }
     return accessController;
  }
-
-    protected static void processGroupPermissions(String groupId, PathNode node, Delegator delegator) throws AccessControlException {
+ protected static void processGroupPermissions(String groupId, PathNode node, Delegator delegator) throws AuthorizationManagerException {
         try {
             // Process this group's memberships first
             List<GenericValue> parentGroups = delegator.findList("UserGroupRelationship", EntityCondition.makeCondition(UtilMisc.toMap("toGroupId", groupId)), null, null, null, false);
@@ -170,11 +85,11 @@
             List<GenericValue> permissionValues = delegator.findList("UserGrpToArtifactPermRel", EntityCondition.makeCondition(UtilMisc.toMap("groupId", groupId)), null, null, null, false);
             setPermissions(groupId, node, permissionValues);
         } catch (GenericEntityException e) {
-            throw new AccessControlException(e.getMessage());
+            throw new AuthorizationManagerException(e.getMessage());
         }
     }
 
-    protected static void setPermissions(String id, PathNode node, List<GenericValue> permissionValues) {
+    protected static void setPermissions(String id, PathNode node, List<GenericValue> permissionValues) throws AuthorizationManagerException {
         for (GenericValue value : permissionValues) {
             String artifactPath = value.getString("artifactPath");
             OFBizPermission target = new OFBizPermission(id + "@" + artifactPath);
@@ -192,11 +107,98 @@
                         target.excludePermissions.getPermissionsSet().add(permission);
                     }
                 } else {
-                    throw new AccessControlException("Invalid permission: " + pair[0]);
+                    throw new AuthorizationManagerException("Invalid permission: " + pair[0]);
                 }
             }
             node.setPermissions(new ArtifactPath(artifactPath), target);
         }
     }
 
+    public AuthorizationManagerImpl() {
+    }
+
+    @Override
+    public void assignGroupPermission(String userGroupId, String artifactId, Permission permission) throws AuthorizationManagerException {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public void assignGroupToGroup(String childGroupId, String parentGroupId) throws AuthorizationManagerException {
+        // TODO Auto-generated method stub
+        
+    }
+    @Override
+    public void assignUserPermission(String userLoginId, String artifactId, Permission permission) throws AuthorizationManagerException {
+        // TODO Auto-generated method stub
+        
+    }
+    @Override
+    public void assignUserToGroup(String userLoginId, String userGroupId) throws AuthorizationManagerException {
+        // TODO Auto-generated method stub
+        
+    }
+    @Override
+    public void clearUserData(GenericValue userLogin) {
+        super.clearUserData(userLogin);
+        userPermCache.remove(userLogin.getString("userLogin"));
+    }
+    @Override
+    public void createUser(String userLoginId, String password) throws AuthorizationManagerException {
+        // TODO Auto-generated method stub
+        
+    }
+    @Override
+    public String createUserGroup(String description) throws AuthorizationManagerException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+    @Override
+    public void deleteGroupFromGroup(String childGroupId, String parentGroupId) throws AuthorizationManagerException {
+        // TODO Auto-generated method stub
+        
+    }
+    @Override
+    public void deleteGroupPermission(String userGroupId, String artifactId, Permission permission) throws AuthorizationManagerException {
+        // TODO Auto-generated method stub
+        
+    }
+    @Override
+    public void deleteUser(String userLoginId) throws AuthorizationManagerException {
+        // TODO Auto-generated method stub
+        
+    }
+    @Override
+    public void deleteUserFromGroup(String userLoginId, String userGroupId) throws AuthorizationManagerException {
+        // TODO Auto-generated method stub
+        
+    }
+    @Override
+    public void deleteUserGroup(String userGroupId) throws AuthorizationManagerException {
+        // TODO Auto-generated method stub
+        
+    }
+    @Override
+    public void deleteUserPermission(String userLoginId, String artifactId, Permission permission) throws AuthorizationManagerException {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public AccessController getAccessController() throws AuthorizationManagerException {
+        String userLoginId = ThreadContext.getUserLogin().getString("userLoginId");
+        return getAccessController(userLoginId);
+ }
+
+    @Override
+    public void updateUser(String userLoginId, String password) throws AuthorizationManagerException {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public void updateUserGroup(String userGroupId, String description) throws AuthorizationManagerException {
+        // TODO Auto-generated method stub
+        
+    }
 }

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=897585&r1=897584&r2=897585&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 Jan 10 01:37:33 2010
@@ -26,6 +26,7 @@
 
 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.util.Debug;
 import org.ofbiz.base.util.UtilProperties;
@@ -41,7 +42,8 @@
 public class ExecutionContextImpl extends org.ofbiz.api.context.AbstractExecutionContext implements ExecutionContext {
 
     public static final String module = ExecutionContextImpl.class.getName();
-    protected static final AuthorizationManager nullAuthorizationManager = new NullAuthorizationManager();
+    protected static final AccessController accessDeniedController = new AccessDeniedController();
+    protected static final AuthorizationManager unrestrictedAuthorizationManager = new NullAuthorizationManager(new AccessGrantedController());
     /** Used by <code>runUnprotected</code> and <code>endRunUnprotected</code>
      * to save/restore the original <code>AuthorizationManager</code> instance.
      */
@@ -66,7 +68,12 @@
 
     @Override
     public AccessController getAccessController() {
-        return this.getSecurity().getAccessController();
+        try {
+            return this.getSecurity().getAccessController();
+        } catch (AuthorizationManagerException e) {
+            Debug.logError(e, module);
+        }
+        return accessDeniedController;
     }
 
     @Override
@@ -152,7 +159,7 @@
     @Override
     public void runUnprotected() {
         this.managerList.addLast(getSecurity());
-        this.setSecurity(nullAuthorizationManager);
+        this.setSecurity(unrestrictedAuthorizationManager);
     }
 
     @Override