svn commit: r894961 [4/4] - in /ofbiz/branches/executionconte
Locked
svn commit: r894961 [4/4] - in /ofbiz/branches/executionconte
 
|
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=894961&r1=894960&r2=894961&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 Fri Jan 1 00:38:52 2010 @@ -18,6 +18,8 @@ *******************************************************************************/ package org.ofbiz.widget.form; +import static org.ofbiz.api.authorization.BasicPermissions.View; + import java.io.IOException; import java.util.ArrayList; import java.util.Collection; @@ -34,6 +36,7 @@ import javolution.util.FastMap; import javolution.util.FastSet; +import org.ofbiz.api.context.ExecutionArtifact; import org.ofbiz.base.util.BshUtil; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; @@ -57,6 +60,7 @@ import org.ofbiz.service.LocalDispatcher; import org.ofbiz.service.ModelParam; import org.ofbiz.service.ModelService; +import org.ofbiz.service.ThreadContext; import org.ofbiz.webapp.control.ConfigXMLReader; import org.ofbiz.widget.ModelWidget; import org.w3c.dom.Element; @@ -68,7 +72,7 @@ * Widget Library - Form model class */ @SuppressWarnings("serial") -public class ModelForm extends ModelWidget { +public class ModelForm extends ModelWidget implements ExecutionArtifact { public static final String module = ModelForm.class.getName(); public static final String DEFAULT_FORM_RESULT_LIST_NAME = "defaultFormResultList"; @@ -787,61 +791,67 @@ * use the same form definitions for many types of form UIs */ public void renderFormString(Appendable writer, Map<String, Object> context, FormStringRenderer formStringRenderer) throws IOException { - // increment the paginator, only for list and multi forms - if ("list".equals(this.type) || "multi".equals(this.type)) { - this.incrementPaginatorNumber(context); - } - - //if pagination is disabled, update the defualt view size - if (!getPaginate(context)) { - setDefaultViewSize(this.MAX_PAGE_SIZE); - } - - // Populate the viewSize and viewIndex so they are available for use during form actions - context.put("viewIndex", this.getViewIndex(context)); - context.put("viewSize", this.getViewSize(context)); + try { + ThreadContext.pushExecutionArtifact(this); + ThreadContext.getAccessController().checkPermission(View); + // increment the paginator, only for list and multi forms + if ("list".equals(this.type) || "multi".equals(this.type)) { + this.incrementPaginatorNumber(context); + } - runFormActions(context); + //if pagination is disabled, update the defualt view size + if (!getPaginate(context)) { + setDefaultViewSize(this.MAX_PAGE_SIZE); + } - setWidgetBoundaryComments(context); + // Populate the viewSize and viewIndex so they are available for use during form actions + context.put("viewIndex", this.getViewIndex(context)); + context.put("viewSize", this.getViewSize(context)); - // if this is a list form, don't useRequestParameters - if ("list".equals(this.type) || "multi".equals(this.type)) { - context.put("useRequestParameters", Boolean.FALSE); - } + runFormActions(context); - // find the highest position number to get the max positions used - int positions = 1; - for (ModelFormField modelFormField: this.fieldList) { - int curPos = modelFormField.getPosition(); - if (curPos > positions) { - positions = curPos; - } - ModelFormField.FieldInfo currentFieldInfo = modelFormField.getFieldInfo(); - if (currentFieldInfo != null) { - ModelFormField fieldInfoFormField = currentFieldInfo.getModelFormField(); - if (fieldInfoFormField != null) { - fieldInfoFormField.setModelForm(this); + setWidgetBoundaryComments(context); + + // if this is a list form, don't useRequestParameters + if ("list".equals(this.type) || "multi".equals(this.type)) { + context.put("useRequestParameters", Boolean.FALSE); + } + + // find the highest position number to get the max positions used + int positions = 1; + for (ModelFormField modelFormField: this.fieldList) { + int curPos = modelFormField.getPosition(); + if (curPos > positions) { + positions = curPos; + } + ModelFormField.FieldInfo currentFieldInfo = modelFormField.getFieldInfo(); + if (currentFieldInfo != null) { + ModelFormField fieldInfoFormField = currentFieldInfo.getModelFormField(); + if (fieldInfoFormField != null) { + fieldInfoFormField.setModelForm(this); + } + } else { + throw new IllegalArgumentException("Error rendering form, a field has no FieldInfo, ie no sub-element for the type of field for field named: " + modelFormField.getName()); } - } else { - throw new IllegalArgumentException("Error rendering form, a field has no FieldInfo, ie no sub-element for the type of field for field named: " + modelFormField.getName()); } - } - if ("single".equals(this.type)) { - this.renderSingleFormString(writer, context, formStringRenderer, positions); - } else if ("list".equals(this.type)) { - this.renderListFormString(writer, context, formStringRenderer, positions); - } else if ("multi".equals(this.type)) { - this.renderMultiFormString(writer, context, formStringRenderer, positions); - } else if ("upload".equals(this.type)) { - this.renderSingleFormString(writer, context, formStringRenderer, positions); - } else { - if (UtilValidate.isEmpty(this.getType())) { - throw new IllegalArgumentException("The form 'type' tag is missing or empty on the form with the name " + this.getName()); + if ("single".equals(this.type)) { + this.renderSingleFormString(writer, context, formStringRenderer, positions); + } else if ("list".equals(this.type)) { + this.renderListFormString(writer, context, formStringRenderer, positions); + } else if ("multi".equals(this.type)) { + this.renderMultiFormString(writer, context, formStringRenderer, positions); + } else if ("upload".equals(this.type)) { + this.renderSingleFormString(writer, context, formStringRenderer, positions); } else { - throw new IllegalArgumentException("The form type " + this.getType() + " is not supported for form with name " + this.getName()); + if (UtilValidate.isEmpty(this.getType())) { + throw new IllegalArgumentException("The form 'type' tag is missing or empty on the form with the name " + this.getName()); + } else { + throw new IllegalArgumentException("The form type " + this.getType() + " is not supported for form with name " + this.getName()); + } } + } finally { + ThreadContext.popExecutionArtifact(); } } @@ -1874,6 +1884,10 @@ return this.name; } + public String getLocation() { + return this.formLocation; + } + public String getCurrentFormName(Map<String, Object> context) { Integer itemIndex = (Integer) context.get("itemIndex"); String formName = (String) context.get("formName"); 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=894961&r1=894960&r2=894961&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 Fri Jan 1 00:38:52 2010 @@ -33,6 +33,7 @@ import javolution.util.FastList; import javolution.util.FastMap; +import org.ofbiz.api.context.ExecutionArtifact; import org.ofbiz.base.util.BshUtil; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; @@ -62,6 +63,7 @@ import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.ModelParam; import org.ofbiz.service.ModelService; +import org.ofbiz.service.ThreadContext; import org.ofbiz.widget.WidgetWorker; import org.ofbiz.widget.form.ModelForm.UpdateArea; import org.w3c.dom.Element; @@ -72,7 +74,7 @@ /** * Widget Library - Form model class */ -public class ModelFormField { +public class ModelFormField implements ExecutionArtifact { public static final String module = ModelFormField.class.getName(); @@ -592,7 +594,12 @@ } public void renderFieldString(Appendable writer, Map<String, Object> context, FormStringRenderer formStringRenderer) throws IOException { - this.fieldInfo.renderFieldString(writer, context, formStringRenderer); + try { + ThreadContext.pushExecutionArtifact(this); + this.fieldInfo.renderFieldString(writer, context, formStringRenderer); + } finally { + ThreadContext.popExecutionArtifact(); + } } public List<UpdateArea> getOnChangeUpdateAreas() { @@ -820,6 +827,10 @@ return name; } + public String getLocation() { + return this.modelForm.getLocation() + "#" + this.name; + } + /** * Get the name to use for the parameter for this field in the form interpreter. * For HTML forms this is the request parameter name. 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=894961&r1=894960&r2=894961&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 Fri Jan 1 00:38:52 2010 @@ -18,6 +18,8 @@ *******************************************************************************/ package org.ofbiz.widget.screen; +import static org.ofbiz.api.authorization.BasicPermissions.View; + import java.io.Serializable; import java.util.Collection; import java.util.List; @@ -26,6 +28,8 @@ import javolution.util.FastSet; +import org.ofbiz.api.authorization.AccessController; +import org.ofbiz.api.context.ExecutionArtifact; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.UtilGenerics; @@ -37,6 +41,7 @@ import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.transaction.TransactionUtil; import org.ofbiz.service.LocalDispatcher; +import org.ofbiz.service.ThreadContext; import org.ofbiz.webapp.control.ConfigXMLReader; import org.ofbiz.widget.ModelWidget; import org.w3c.dom.Element; @@ -45,7 +50,7 @@ * Widget Library - Screen model class */ @SuppressWarnings("serial") -public class ModelScreen extends ModelWidget implements Serializable { +public class ModelScreen extends ModelWidget implements Serializable, ExecutionArtifact { public static final String module = ModelScreen.class.getName(); @@ -81,6 +86,10 @@ return sourceLocation; } + public String getLocation() { + return this.sourceLocation + "#" + this.name; + } + public Set<String> getAllServiceNamesUsed() { Set<String> allServiceNamesUsed = FastSet.newInstance(); findServiceNamesUsedInWidget(this.section, allServiceNamesUsed); @@ -354,32 +363,34 @@ // wrap the whole screen rendering in a transaction, should improve performance in querying and such Map<String, String> parameters = UtilGenerics.cast(context.get("parameters")); boolean beganTransaction = false; - int transactionTimeout = -1; - if (parameters != null) { - String transactionTimeoutPar = parameters.get("TRANSACTION_TIMEOUT"); - if (transactionTimeoutPar != null) { - try { - transactionTimeout = Integer.parseInt(transactionTimeoutPar); - } catch (NumberFormatException nfe) { - String msg = "TRANSACTION_TIMEOUT parameter for screen [" + this.sourceLocation + "#" + this.name + "] is invalid and it will be ignored: " + nfe.toString(); - Debug.logWarning(msg, module); + try { + ThreadContext.pushExecutionArtifact(this); + ThreadContext.getAccessController().checkPermission(View); + int transactionTimeout = -1; + if (parameters != null) { + String transactionTimeoutPar = parameters.get("TRANSACTION_TIMEOUT"); + if (transactionTimeoutPar != null) { + try { + transactionTimeout = Integer.parseInt(transactionTimeoutPar); + } catch (NumberFormatException nfe) { + String msg = "TRANSACTION_TIMEOUT parameter for screen [" + this.sourceLocation + "#" + this.name + "] is invalid and it will be ignored: " + nfe.toString(); + Debug.logWarning(msg, module); + } } } - } - if (transactionTimeout < 0 && !transactionTimeoutExdr.isEmpty()) { - // no TRANSACTION_TIMEOUT parameter, check screen attribute - String transactionTimeoutStr = transactionTimeoutExdr.expandString(context); - if (UtilValidate.isNotEmpty(transactionTimeoutStr)) { - try { - transactionTimeout = Integer.parseInt(transactionTimeoutStr); - } catch (NumberFormatException e) { - Debug.logWarning(e, "Could not parse transaction-timeout value, original=[" + transactionTimeoutExdr + "], expanded=[" + transactionTimeoutStr + "]", module); + if (transactionTimeout < 0 && !transactionTimeoutExdr.isEmpty()) { + // no TRANSACTION_TIMEOUT parameter, check screen attribute + String transactionTimeoutStr = transactionTimeoutExdr.expandString(context); + if (UtilValidate.isNotEmpty(transactionTimeoutStr)) { + try { + transactionTimeout = Integer.parseInt(transactionTimeoutStr); + } catch (NumberFormatException e) { + Debug.logWarning(e, "Could not parse transaction-timeout value, original=[" + transactionTimeoutExdr + "], expanded=[" + transactionTimeoutStr + "]", module); + } } } - } - try { // If transaction timeout is not present (i.e. is equal to -1), the default transaction timeout is used // If transaction timeout is present, use it to start the transaction // If transaction timeout is set to zero, no transaction is started @@ -420,6 +431,7 @@ // after rolling back, rethrow the exception throw new ScreenRenderException(errMsg, e); } finally { + ThreadContext.popExecutionArtifact(); // only commit the transaction if we started one... this will throw an exception if it fails try { TransactionUtil.commit(beganTransaction); Modified: ofbiz/branches/executioncontext20091231/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java (original) +++ ofbiz/branches/executioncontext20091231/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java Fri Jan 1 00:38:52 2010 @@ -52,6 +52,7 @@ import org.ofbiz.service.DispatchContext; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; +import org.ofbiz.service.ThreadContext; import org.ofbiz.webapp.control.LoginWorker; import org.ofbiz.widget.cache.GenericWidgetOutput; import org.ofbiz.widget.cache.ScreenCache; @@ -211,6 +212,8 @@ // set up the user's time zone context.put("timeZone", UtilHttp.getTimeZone(request)); + ThreadContext.initializeContext(context); + // ========== setup values that are specific to OFBiz webapps context.put("request", request); Modified: ofbiz/branches/executioncontext20091231/specialpurpose/assetmaint/data/AssetMaintSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/assetmaint/data/AssetMaintSecurityData.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/assetmaint/data/AssetMaintSecurityData.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/assetmaint/data/AssetMaintSecurityData.xml Fri Jan 1 00:38:52 2010 @@ -34,4 +34,15 @@ <SecurityGroupPermission groupId="ASSETMAINTTECH" permissionId="ASSETMAINT_UPDATE"/> <SecurityGroupPermission groupId="FULLADMIN" permissionId="ASSETMAINT_ADMIN"/> + + <ArtifactPath artifactPath="ofbiz/assetmaint" description="Asset Maintenance Application"/> + <ArtifactPath artifactPath="ofbiz/ismgr" description="IS Manager Application"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGrpToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/assetmaint" permissionValue="admin=true"/> + <UserGrpToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/ismgr" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20091231/specialpurpose/cmssite/data/CmsSiteDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/cmssite/data/CmsSiteDemoData.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/cmssite/data/CmsSiteDemoData.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/cmssite/data/CmsSiteDemoData.xml Fri Jan 1 00:38:52 2010 @@ -203,5 +203,15 @@ <ContentAssoc contentId="CMSS_PPOINT" contentIdTo="PUBLIC_DOCS" contentAssocTypeId="SUB_CONTENT" fromDate="2001-01-01 00:00:00"/> <ContentAssoc contentId="CMSS_PPOINT" contentIdTo="APACHE_OFBIZ_HTML" contentAssocTypeId="SUB_CONTENT" fromDate="2001-01-01 00:00:00" mapKey="documents"/> <ContentAssoc contentId="CMSS_PPOINT" contentIdTo="APACHE_OFBIZ_PDF" contentAssocTypeId="SUB_CONTENT" fromDate="2001-01-01 00:00:00" mapKey="documents"/> + + <ArtifactPath artifactPath="ofbiz/cmssite" description="CMS Demo Site"/> + <ArtifactPath artifactPath="ofbiz/ofbizsite" description="CMS OFBiz Demo Site"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGrpToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/cmssite" permissionValue="admin=true"/> + <UserGrpToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/ofbizsite" permissionValue="admin=true"/> </entity-engine-xml> Modified: ofbiz/branches/executioncontext20091231/specialpurpose/ebay/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/ebay/build.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/ebay/build.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/ebay/build.xml Fri Jan 1 00:38:52 2010 @@ -29,6 +29,7 @@ <property name="name" value="ofbiz-ebay"/> <path id="local.class.path"> + <fileset dir="../../framework/api/build/lib" includes="*.jar"/> <fileset dir="../../framework/base/lib" includes="*.jar"/> <fileset dir="../../framework/base/lib/commons" includes="*.jar"/> <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/> Modified: ofbiz/branches/executioncontext20091231/specialpurpose/ebay/data/EbaySecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/ebay/data/EbaySecurityData.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/ebay/data/EbaySecurityData.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/ebay/data/EbaySecurityData.xml Fri Jan 1 00:38:52 2010 @@ -28,4 +28,12 @@ <SecurityGroupPermission groupId="VIEWADMIN" permissionId="EBAY_VIEW"/> <SecurityGroupPermission groupId="BIZADMIN" permissionId="EBAY_VIEW"/> + <ArtifactPath artifactPath="ofbiz/ebay" description="eBay Application"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGrpToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/ebay" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20091231/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml Fri Jan 1 00:38:52 2010 @@ -198,4 +198,14 @@ <PaymentMethod paymentMethodId="FRENCHCUSTOMER" paymentMethodTypeId="CREDIT_CARD" partyId="FrenchCustomer" fromDate="2009-01-09 00:00:00.000"/> <CreditCard paymentMethodId="FRENCHCUSTOMER" cardType="Visa" cardNumber="4111111111111111" expireDate="02/2020" companyNameOnCard="" titleOnCard="" firstNameOnCard="FRENCH" middleNameOnCard="" lastNameOnCard="CUSTOMER" suffixOnCard="" contactMechId="FRENCHCUSTOMER"/> + + <UserToUserGroupRel userLoginId="DemoBuyer" groupId="OFBIZ_USERS"/> + <UserToUserGroupRel userLoginId="DemoRepAll" groupId="OFBIZ_USERS"/> + <UserToUserGroupRel userLoginId="DemoRepStore" groupId="OFBIZ_USERS"/> + <UserToUserGroupRel userLoginId="DemoCustCompany" groupId="OFBIZ_USERS"/> + <UserToUserGroupRel userLoginId="DemoCustAgent" groupId="OFBIZ_USERS"/> + <UserToUserGroupRel userLoginId="DemoCustomer" groupId="OFBIZ_USERS"/> + <UserToUserGroupRel userLoginId="EuroCustomer" groupId="OFBIZ_USERS"/> + <UserToUserGroupRel userLoginId="FrenchCustomer" groupId="OFBIZ_USERS"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20091231/specialpurpose/ecommerce/data/DemoPurchasing.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/ecommerce/data/DemoPurchasing.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/ecommerce/data/DemoPurchasing.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/ecommerce/data/DemoPurchasing.xml Fri Jan 1 00:38:52 2010 @@ -235,4 +235,7 @@ <ProductPrice productId="dropShip3" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="14.99" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/> <SupplierProduct productId="dropShip3" partyId="EuroSupplier" availableFromDate="2007-01-01 14:51:52.627" minimumOrderQuantity="0.0" lastPrice="11.0" currencyUomId="USD" supplierProductName="Drop ship product from Euro supplier" supplierProductId="dropShip3-DS" canDropShip="Y" supplierCommissionPerc="20.0" lastUpdatedStamp="2007-05-05 14:53:35.248" lastUpdatedTxStamp="2007-05-05 14:53:35.15" createdStamp="2007-05-05 14:53:35.248" createdTxStamp="2007-05-05 14:53:35.15"/> + <UserToUserGroupRel userLoginId="DemoSupplier" groupId="OFBIZ_USERS"/> + <UserToUserGroupRel userLoginId="BigSupplier" groupId="OFBIZ_USERS"/> + <UserToUserGroupRel userLoginId="EuroSupplier" groupId="OFBIZ_USERS"/> </entity-engine-xml> Modified: ofbiz/branches/executioncontext20091231/specialpurpose/ecommerce/data/EcommerceTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/ecommerce/data/EcommerceTypeData.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/ecommerce/data/EcommerceTypeData.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/ecommerce/data/EcommerceTypeData.xml Fri Jan 1 00:38:52 2010 @@ -30,4 +30,15 @@ <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://ecommerce/webapp/ecommerce/includes/header.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://ecommerce/webapp/ecommerce/includes/footer.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/images/ecdefaulttheme.jpg" sequenceId="01"/> + + <ArtifactPath artifactPath="ofbiz/ecommerce" description="eCommerce Application"/> + <ArtifactPath artifactPath="ofbiz/ecomclone" description="Cloned eCommerce Application"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGrpToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/ecommerce" permissionValue="admin=true"/> + <UserGrpToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/ecomclone" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20091231/specialpurpose/googlebase/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/googlebase/build.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/googlebase/build.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/googlebase/build.xml Fri Jan 1 00:38:52 2010 @@ -29,6 +29,7 @@ <property name="name" value="ofbiz-googlebase"/> <path id="local.class.path"> + <fileset dir="../../framework/api/build/lib" includes="*.jar"/> <fileset dir="../../framework/base/lib" includes="*.jar"/> <fileset dir="../../framework/base/lib/commons" includes="*.jar"/> <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/> Modified: ofbiz/branches/executioncontext20091231/specialpurpose/googlebase/data/GoogleBaseSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/googlebase/data/GoogleBaseSecurityData.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/googlebase/data/GoogleBaseSecurityData.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/googlebase/data/GoogleBaseSecurityData.xml Fri Jan 1 00:38:52 2010 @@ -28,4 +28,12 @@ <SecurityGroupPermission groupId="VIEWADMIN" permissionId="GOOGLEBASE_VIEW"/> <SecurityGroupPermission groupId="BIZADMIN" permissionId="GOOGLEBASE_VIEW"/> + <ArtifactPath artifactPath="ofbiz/googlebase" description="Google Base Application"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGrpToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/googlebase" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20091231/specialpurpose/googlecheckout/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/googlecheckout/build.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/googlecheckout/build.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/googlecheckout/build.xml Fri Jan 1 00:38:52 2010 @@ -30,6 +30,7 @@ <path id="local.class.path"> <fileset dir="${lib.dir}" includes="*.jar"/> + <fileset dir="../../framework/api/build/lib" includes="*.jar"/> <fileset dir="../../framework/base/lib" includes="*.jar"/> <fileset dir="../../framework/base/lib/commons" includes="*.jar"/> <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/> Modified: ofbiz/branches/executioncontext20091231/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityData.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityData.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityData.xml Fri Jan 1 00:38:52 2010 @@ -31,4 +31,13 @@ <SecurityGroupPermission groupId="FLEXADMIN" permissionId="GCHECKOUT_VIEW"/> <SecurityGroupPermission groupId="VIEWADMIN" permissionId="GCHECKOUT_VIEW"/> <SecurityGroupPermission groupId="BIZADMIN" permissionId="GCHECKOUT_ADMIN"/> + + <ArtifactPath artifactPath="ofbiz/googlecheckout" description="Google Checkout Application"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGrpToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/googlecheckout" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20091231/specialpurpose/hhfacility/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/hhfacility/build.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/hhfacility/build.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/hhfacility/build.xml Fri Jan 1 00:38:52 2010 @@ -29,6 +29,7 @@ <property name="name" value="ofbiz-hhfacility"/> <path id="local.class.path"> + <fileset dir="../../framework/api/build/lib" includes="*.jar"/> <fileset dir="../../framework/base/lib" includes="*.jar"/> <fileset dir="../../framework/base/lib/commons" includes="*.jar"/> <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/> Added: ofbiz/branches/executioncontext20091231/specialpurpose/hhfacility/data/HhFacilitySecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/hhfacility/data/HhFacilitySecurityData.xml?rev=894961&view=auto ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/hhfacility/data/HhFacilitySecurityData.xml (added) +++ ofbiz/branches/executioncontext20091231/specialpurpose/hhfacility/data/HhFacilitySecurityData.xml Fri Jan 1 00:38:52 2010 @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> +<entity-engine-xml> + + <ArtifactPath artifactPath="ofbiz/hhfacility" description="Handheld Facility Application"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGrpToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/hhfacility" permissionValue="admin=true"/> + +</entity-engine-xml> Propchange: ofbiz/branches/executioncontext20091231/specialpurpose/hhfacility/data/HhFacilitySecurityData.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/executioncontext20091231/specialpurpose/hhfacility/data/HhFacilitySecurityData.xml ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/branches/executioncontext20091231/specialpurpose/hhfacility/data/HhFacilitySecurityData.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/branches/executioncontext20091231/specialpurpose/hhfacility/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/hhfacility/ofbiz-component.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/hhfacility/ofbiz-component.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/hhfacility/ofbiz-component.xml Fri Jan 1 00:38:52 2010 @@ -24,6 +24,7 @@ <resource-loader name="main" type="component"/> <classpath type="jar" location="build/lib/*"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/HhFacilitySecurityData.xml"/> <service-resource type="model" loader="main" location="servicedef/services_hhfacility.xml"/> <webapp name="hhfacility" Modified: ofbiz/branches/executioncontext20091231/specialpurpose/myportal/data/MyPortalSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/myportal/data/MyPortalSecurityData.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/myportal/data/MyPortalSecurityData.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/myportal/data/MyPortalSecurityData.xml Fri Jan 1 00:38:52 2010 @@ -80,4 +80,13 @@ <SecurityGroupPermission groupId="MYPORTAL_CUSTOMER" permissionId="WORKEFFORTMGR_ROLE_DELETE"/> <SecurityGroupPermission groupId="MYPORTAL_CUSTOMER" permissionId="ORDERMGR_CRQ_CREATE"/> <SecurityGroupPermission groupId="MYPORTAL_CUSTOMER" permissionId="ORDERMGR_CRQ_UPDATE"/> + + <ArtifactPath artifactPath="ofbiz/myportal" description="MyPortal Application"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGrpToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/myportal" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20091231/specialpurpose/oagis/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/oagis/build.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/oagis/build.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/oagis/build.xml Fri Jan 1 00:38:52 2010 @@ -29,6 +29,7 @@ <property name="name" value="ofbiz-oagis"/> <path id="local.class.path"> + <fileset dir="../../framework/api/build/lib" includes="*.jar"/> <fileset dir="../../framework/base/lib" includes="*.jar"/> <fileset dir="../../framework/base/lib/commons" includes="*.jar"/> <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/> Modified: ofbiz/branches/executioncontext20091231/specialpurpose/oagis/data/OagisSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/oagis/data/OagisSecurityData.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/oagis/data/OagisSecurityData.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/oagis/data/OagisSecurityData.xml Fri Jan 1 00:38:52 2010 @@ -27,4 +27,12 @@ <SecurityGroupPermission groupId="VIEWADMIN" permissionId="OAGIS_VIEW"/> <SecurityGroupPermission groupId="BIZADMIN" permissionId="OAGIS_VIEW"/> + <ArtifactPath artifactPath="ofbiz/oagis" description="OAGIS Application"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGrpToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/oagis" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20091231/specialpurpose/pos/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/pos/build.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/pos/build.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/pos/build.xml Fri Jan 1 00:38:52 2010 @@ -30,6 +30,7 @@ <path id="local.class.path"> <fileset dir="${lib.dir}" includes="*.jar"/> + <fileset dir="../../framework/api/build/lib" includes="*.jar"/> <fileset dir="../../framework/base/lib" includes="*.jar"/> <fileset dir="../../framework/base/lib/commons" includes="*.jar"/> <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/> Modified: ofbiz/branches/executioncontext20091231/specialpurpose/pos/data/DemoRetail.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/pos/data/DemoRetail.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/pos/data/DemoRetail.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/pos/data/DemoRetail.xml Fri Jan 1 00:38:52 2010 @@ -110,6 +110,8 @@ productCategoryId="" titleTransferEnumId="" minItemPrice="25.00" minPurchase="0.00" taxShipping="N" taxPercentage="1" taxPromotions="N" fromDate="2008-12-03 00:00:00.001" thruDate="" description="1% OFB _NA_ Tax"/> + <UserToUserGroupRel userLoginId="1" groupId="OFBIZ_USERS"/> + <UserToUserGroupRel userLoginId="2" groupId="OFBIZ_USERS"/> </entity-engine-xml> Modified: ofbiz/branches/executioncontext20091231/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml Fri Jan 1 00:38:52 2010 @@ -178,4 +178,12 @@ <WorkEffort workEffortId="9202" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:21.831" workEffortParentId="9201" scopeEnumId="WES_PRIVATE" workEffortName="task1" estimatedStartDate="2007-12-03 00:00:00.0" estimatedCompletionDate="2007-12-05 00:00:00.0" revisionNumber="1"/> <WorkEffortSkillStandard workEffortId="9202" skillTypeId="9000" estimatedDuration="16.0"/> + <UserToUserGroupRel userLoginId="DemoEmployee" groupId="OFBIZ_USERS"/> + <UserToUserGroupRel userLoginId="DemoEmployee1" groupId="OFBIZ_USERS"/> + <UserToUserGroupRel userLoginId="DemoEmployee2" groupId="OFBIZ_USERS"/> + <UserToUserGroupRel userLoginId="DemoEmployee3" groupId="OFBIZ_USERS"/> + <UserToUserGroupRel userLoginId="DemoCustomer1" groupId="OFBIZ_USERS"/> + <UserToUserGroupRel userLoginId="DemoCustomer2" groupId="OFBIZ_USERS"/> + <UserToUserGroupRel userLoginId="DemoCustomer3" groupId="OFBIZ_USERS"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20091231/specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml Fri Jan 1 00:38:52 2010 @@ -53,4 +53,12 @@ <SecurityGroupPermission groupId="PROJECTUSER" permissionId="PROJECTMGR_ROLE_TIMESHEET_CREATE"/> <SecurityGroupPermission groupId="PROJECTUSER" permissionId="PROJECTMGR_ROLE_TIMESHEET_UPDATE"/> + <ArtifactPath artifactPath="ofbiz/projectmgr" description="Project Manager Application"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGrpToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/projectmgr" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20091231/specialpurpose/webpos/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/webpos/build.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/webpos/build.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/webpos/build.xml Fri Jan 1 00:38:52 2010 @@ -29,6 +29,7 @@ <property name="name" value="ofbiz-webpos"/> <path id="local.class.path"> + <fileset dir="../../framework/api/build/lib" includes="*.jar"/> <fileset dir="../../framework/base/lib" includes="*.jar"/> <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/> <fileset dir="../../framework/base/build/lib" includes="*.jar"/> Modified: ofbiz/branches/executioncontext20091231/specialpurpose/webpos/data/DemoPosData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/specialpurpose/webpos/data/DemoPosData.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/specialpurpose/webpos/data/DemoPosData.xml (original) +++ ofbiz/branches/executioncontext20091231/specialpurpose/webpos/data/DemoPosData.xml Fri Jan 1 00:38:52 2010 @@ -22,4 +22,13 @@ <WebSite webSiteId="WebStorePos" siteName="Web POS Site" productStoreId="9100"/> <ProductStorePaymentSetting productStoreId="9100" paymentMethodTypeId="PERSONAL_CHECK" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/> + + <ArtifactPath artifactPath="ofbiz/webpos" description="Web POS Application"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGrpToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/webpos" permissionValue="admin=true"/> + </entity-engine-xml> \ No newline at end of file Modified: ofbiz/branches/executioncontext20091231/themes/bizznesstime/data/BizznessTimeThemeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/themes/bizznesstime/data/BizznessTimeThemeData.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/themes/bizznesstime/data/BizznessTimeThemeData.xml (original) +++ ofbiz/branches/executioncontext20091231/themes/bizznesstime/data/BizznessTimeThemeData.xml Fri Jan 1 00:38:52 2010 @@ -32,4 +32,13 @@ <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://bizznesstime/includes/appbar.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://bizznesstime/includes/messages.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/bizznesstime/screenshot.jpg" sequenceId="01"/> + + <ArtifactPath artifactPath="ofbiz/bizznesstime" description="Bizzness Time Visual Theme"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGrpToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/bizznesstime" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20091231/themes/bluelight/data/BlueLightThemeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/themes/bluelight/data/BlueLightThemeData.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/themes/bluelight/data/BlueLightThemeData.xml (original) +++ ofbiz/branches/executioncontext20091231/themes/bluelight/data/BlueLightThemeData.xml Fri Jan 1 00:38:52 2010 @@ -33,4 +33,13 @@ <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_NAV_CLOSE_TMPLT" resourceValue="component://bluelight/includes/appbarClose.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://bluelight/includes/messages.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/bluelight/screenshot.jpg" sequenceId="01"/> + + <ArtifactPath artifactPath="ofbiz/bluelight" description="Bluelight Visual Theme"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGrpToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/bluelight" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20091231/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml (original) +++ ofbiz/branches/executioncontext20091231/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml Fri Jan 1 00:38:52 2010 @@ -33,4 +33,13 @@ <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_NAV_CLOSE_TMPLT" resourceValue="component://droppingcrumbs/includes/appbarClose.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/webcommon/includes/messages.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/droppingcrumbs/screenshot.jpg" sequenceId="01"/> + + <ArtifactPath artifactPath="ofbiz/droppingcrumbs" description="Dropping Crumbs Visual Theme"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGrpToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/droppingcrumbs" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20091231/themes/flatgrey/data/FlatGreyThemeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/themes/flatgrey/data/FlatGreyThemeData.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/themes/flatgrey/data/FlatGreyThemeData.xml (original) +++ ofbiz/branches/executioncontext20091231/themes/flatgrey/data/FlatGreyThemeData.xml Fri Jan 1 00:38:52 2010 @@ -32,4 +32,13 @@ <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://flatgrey/includes/footer.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://flatgrey/includes/appbar.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/flatgrey/screenshot.gif" sequenceId="01"/> + + <ArtifactPath artifactPath="ofbiz/flatgrey" description="Flat Grey Visual Theme"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGrpToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/flatgrey" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20091231/themes/multiflex/data/MultiflexThemeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/themes/multiflex/data/MultiflexThemeData.xml?rev=894961&r1=894960&r2=894961&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/themes/multiflex/data/MultiflexThemeData.xml (original) +++ ofbiz/branches/executioncontext20091231/themes/multiflex/data/MultiflexThemeData.xml Fri Jan 1 00:38:52 2010 @@ -29,4 +29,13 @@ <VisualThemeResource visualThemeId="MULTIFLEX" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://multiflex/includes/header.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="MULTIFLEX" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://multiflex/includes/footer.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="MULTIFLEX" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/multiflex/screenshot.jpg" sequenceId="01"/> + + <ArtifactPath artifactPath="ofbiz/multiflex" description="Multiflex Visual Theme"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGrpToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/multiflex" permissionValue="admin=true"/> + </entity-engine-xml> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |