svn commit: r807412 [2/2] - in /ofbiz/branches/executionconte
Locked
svn commit: r807412 [2/2] - in /ofbiz/branches/executionconte
 
|
Added: ofbiz/branches/executioncontext20090812/framework/context/src/org/ofbiz/context/AccessControllerImpl.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/context/src/org/ofbiz/context/AccessControllerImpl.java?rev=807412&view=auto ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/context/src/org/ofbiz/context/AccessControllerImpl.java (added) +++ ofbiz/branches/executioncontext20090812/framework/context/src/org/ofbiz/context/AccessControllerImpl.java Mon Aug 24 22:15:46 2009 @@ -0,0 +1,97 @@ +/******************************************************************************* + * 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 static org.ofbiz.api.authorization.BasicPermissions.Admin; + +import java.security.AccessControlException; +import java.security.Permission; +import java.util.List; +import java.util.ListIterator; + +import org.ofbiz.entity.AccessController; +import org.ofbiz.base.util.Debug; +import org.ofbiz.base.util.UtilMisc; +import org.ofbiz.base.util.UtilProperties; +import org.ofbiz.base.util.cache.UtilCache; +import org.ofbiz.entity.util.EntityListIterator; +import org.ofbiz.service.ExecutionContext; + +public class AccessControllerImpl<E> implements AccessController<E> { + + public static final String module = AccessControllerImpl.class.getName(); + protected static UtilCache<String, Permission> userGroupPermCache = new UtilCache<String, Permission>("authorization.UserGroupPermissions"); + protected static UtilCache<String, Permission> userPermCache = new UtilCache<String, Permission>("authorization.UserPermissions"); + protected final ExecutionContext executionContext; + protected final String executionPath; + protected final Permission permission; + // Temporary - will be removed later + protected boolean verbose = false; + protected List<String> serviceNameList = UtilMisc.toList("securityRedesignTest"); + + protected AccessControllerImpl(ExecutionContext executionContext, Permission permission) { + this.executionContext = executionContext; + this.executionPath = executionContext.getExecutionPath(); + this.permission = permission; + this.verbose = "true".equals(UtilProperties.getPropertyValue("api.properties", "authorizationManager.verbose")); + } + + public void checkPermission(Permission permission) throws AccessControlException { + if (this.verbose) { + Debug.logInfo("Checking permission: " + this.executionPath + "[" + permission + "]", module); + } + if (!this.permission.implies(permission)) { + throw new AccessControlException(this.executionPath); + } + } + + public List<E> applyFilters(List<E> list) { + String upperPath = this.executionPath.toUpperCase(); + if (upperPath.startsWith("OFBIZ/EXAMPLE")) { + if (this.verbose) { + Debug.logInfo("Applying List filter \"securityRedesignTest\" for path " + this.executionPath, module); + } + return new SecurityAwareList<E>(list, this.serviceNameList, this.executionContext); + } + return list; + } + + public ListIterator<E> applyFilters(ListIterator<E> listIterator) { + String upperPath = this.executionPath.toUpperCase(); + if (upperPath.startsWith("OFBIZ/EXAMPLE")) { + if (this.verbose) { + Debug.logInfo("Applying ListIterator filter \"securityRedesignTest\" for path " + this.executionPath, module); + } + return new SecurityAwareListIterator<E>(listIterator, this.serviceNameList, this.executionContext); + } + return listIterator; + } + + public EntityListIterator applyFilters(EntityListIterator listIterator) { + String upperPath = this.executionPath.toUpperCase(); + if (upperPath.startsWith("OFBIZ/EXAMPLE")) { + if (this.verbose) { + Debug.logInfo("Applying EntityListIterator filter \"securityRedesignTest\" for path " + this.executionPath, module); + } + // Commented out for now - causes problems with list pagination in UI + // return new SecurityAwareEli(listIterator, this.serviceNameList, this.executionContext); + } + return listIterator; + } +} Propchange: ofbiz/branches/executioncontext20090812/framework/context/src/org/ofbiz/context/AccessControllerImpl.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/executioncontext20090812/framework/context/src/org/ofbiz/context/AccessControllerImpl.java ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/branches/executioncontext20090812/framework/context/src/org/ofbiz/context/AccessControllerImpl.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/branches/executioncontext20090812/framework/context/src/org/ofbiz/context/AuthorizationManagerImpl.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/context/src/org/ofbiz/context/AuthorizationManagerImpl.java?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/context/src/org/ofbiz/context/AuthorizationManagerImpl.java (original) +++ ofbiz/branches/executioncontext20090812/framework/context/src/org/ofbiz/context/AuthorizationManagerImpl.java Mon Aug 24 22:15:46 2009 @@ -29,8 +29,6 @@ import org.ofbiz.api.authorization.PermissionsIntersection; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilMisc; -import org.ofbiz.base.util.UtilProperties; -import org.ofbiz.entity.util.EntityListIterator; import org.ofbiz.security.AuthorizationManager; import org.ofbiz.security.OFBizSecurity; import org.ofbiz.service.ExecutionContext; @@ -140,64 +138,4 @@ return new AccessControllerImpl<E>((ExecutionContext) executionContext, this.getTestPermission((ExecutionContext) executionContext)); } - protected static class AccessControllerImpl<E> implements AccessController<E> { - - protected final ExecutionContext executionContext; - protected final String executionPath; - protected final Permission permission; - // Temporary - will be removed later - protected boolean verbose = false; - protected List<String> serviceNameList = UtilMisc.toList("securityRedesignTest"); - - protected AccessControllerImpl(ExecutionContext executionContext, Permission permission) { - this.executionContext = executionContext; - this.executionPath = executionContext.getExecutionPath(); - this.permission = permission; - this.verbose = "true".equals(UtilProperties.getPropertyValue("api.properties", "authorizationManager.verbose")); - } - - public void checkPermission(Permission permission) throws AccessControlException { - if (this.verbose) { - Debug.logInfo("Checking permission: " + this.executionPath + "[" + permission + "]", module); - } - if (!this.permission.implies(permission)) { - throw new AccessControlException(this.executionPath); - } - } - - public List<E> applyFilters(List<E> list) { - String upperPath = this.executionPath.toUpperCase(); - if (upperPath.startsWith("OFBIZ/EXAMPLE")) { - if (this.verbose) { - Debug.logInfo("Applying List filter \"securityRedesignTest\" for path " + this.executionPath, module); - } - return new SecurityAwareList<E>(list, this.serviceNameList, this.executionContext); - } - return list; - } - - public ListIterator<E> applyFilters(ListIterator<E> listIterator) { - String upperPath = this.executionPath.toUpperCase(); - if (upperPath.startsWith("OFBIZ/EXAMPLE")) { - if (this.verbose) { - Debug.logInfo("Applying ListIterator filter \"securityRedesignTest\" for path " + this.executionPath, module); - } - return new SecurityAwareListIterator<E>(listIterator, this.serviceNameList, this.executionContext); - } - return listIterator; - } - - public EntityListIterator applyFilters(EntityListIterator listIterator) { - String upperPath = this.executionPath.toUpperCase(); - if (upperPath.startsWith("OFBIZ/EXAMPLE")) { - if (this.verbose) { - Debug.logInfo("Applying EntityListIterator filter \"securityRedesignTest\" for path " + this.executionPath, module); - } - // Commented out for now - causes problems with list pagination in UI -// return new SecurityAwareEli(listIterator, this.serviceNameList, this.executionContext); - } - return listIterator; - } - } - } Modified: ofbiz/branches/executioncontext20090812/framework/context/src/org/ofbiz/context/ExecutionContextImpl.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/context/src/org/ofbiz/context/ExecutionContextImpl.java?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/context/src/org/ofbiz/context/ExecutionContextImpl.java (original) +++ ofbiz/branches/executioncontext20090812/framework/context/src/org/ofbiz/context/ExecutionContextImpl.java Mon Aug 24 22:15:46 2009 @@ -22,9 +22,11 @@ import java.util.Map; import java.util.TimeZone; +import org.ofbiz.base.util.Debug; import org.ofbiz.entity.AccessController; import org.ofbiz.entity.DelegatorFactory; import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.security.AuthorizationManager; import org.ofbiz.security.SecurityFactory; @@ -65,6 +67,14 @@ } public GenericValue getUserLogin() { + if (this.userLogin == null) { + GenericDelegator localDelegator = this.getDelegator(); + try { + this.userLogin = localDelegator.findOne("UserLogin", false, "userLoginId", "NOT_LOGGED_IN"); + } catch (GenericEntityException e) { + Debug.logError(e, "Error while getting NOT_LOGGED_IN user: ", module); + } + } return this.userLogin; } Modified: ofbiz/branches/executioncontext20090812/framework/example/data/ExampleSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/example/data/ExampleSecurityData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/example/data/ExampleSecurityData.xml (original) +++ ofbiz/branches/executioncontext20090812/framework/example/data/ExampleSecurityData.xml Mon Aug 24 22:15:46 2009 @@ -31,4 +31,15 @@ <SecurityGroupPermission groupId="FLEXADMIN" permissionId="EXAMPLE_VIEW"/> <SecurityGroupPermission groupId="VIEWADMIN" permissionId="EXAMPLE_VIEW"/> <SecurityGroupPermission groupId="BIZADMIN" permissionId="EXAMPLE_ADMIN"/> + + <ArtifactPath artifactPath="ofbiz/example" description="Example Application"/> + <ArtifactPath artifactPath="ofbiz/exampleext" description="Extended Example 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. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/example" permissionValue="admin=true"/> + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/exampleext" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/framework/example/script/org/ofbiz/example/ExamplePermissionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/example/script/org/ofbiz/example/ExamplePermissionServices.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/example/script/org/ofbiz/example/ExamplePermissionServices.xml (original) +++ ofbiz/branches/executioncontext20090812/framework/example/script/org/ofbiz/example/ExamplePermissionServices.xml Mon Aug 24 22:15:46 2009 @@ -40,7 +40,7 @@ </simple-method> <simple-method method-name="securityRedesignTest" short-description="Security Redesign Test"> - <log level="info" message="candidateObject = ${parameters.candidateObject}"/> +<!-- <log level="info" message="candidateObject = ${parameters.candidateObject}"/> --> <set field="hasPermission" type="Boolean" value="true"/> <field-to-result field="hasPermission"/> </simple-method> Modified: ofbiz/branches/executioncontext20090812/framework/images/webapp/images/ecommain.css URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/images/webapp/images/ecommain.css?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/images/webapp/images/ecommain.css (original) +++ ofbiz/branches/executioncontext20090812/framework/images/webapp/images/ecommain.css Mon Aug 24 22:15:46 2009 @@ -24,10 +24,10 @@ General Styles ***********************************************/ body { -background: #fff; +background: #fff; color: #333; font-family: Arial, Helvetica, sans-serif; -font-size:.75em; +font-size:.65em; line-height:1.5em; text-align:center; } @@ -1015,4 +1015,4 @@ .fieldwitherrors .calendar_date_select { border:2px solid red; -} \ No newline at end of file +} Modified: ofbiz/branches/executioncontext20090812/framework/security/data/SecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/security/data/SecurityData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/security/data/SecurityData.xml (original) +++ ofbiz/branches/executioncontext20090812/framework/security/data/SecurityData.xml Mon Aug 24 22:15:46 2009 @@ -70,6 +70,6 @@ <ArtifactPermission permissionValue="update=false" description="Update access denied"/> <ArtifactPermission permissionValue="view=true" description="View access granted"/> <ArtifactPermission permissionValue="view=false" description="View access denied"/> - <UserToArtifactPermissionRel userLoginId="system" artifactPath="ofbiz" permissionValue="admin=true"/> + <UserToArtifactPermRel userLoginId="system" artifactPath="ofbiz" permissionValue="admin=true"/> </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/framework/security/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/security/entitydef/entitymodel.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/security/entitydef/entitymodel.xml (original) +++ ofbiz/branches/executioncontext20090812/framework/security/entitydef/entitymodel.xml Mon Aug 24 22:15:46 2009 @@ -316,7 +316,7 @@ <prim-key field="artifactPath"/> </entity> - <entity entity-name="UserToArtifactPermissionRel" + <entity entity-name="UserToArtifactPermRel" package-name="org.ofbiz.security.artifactsecurity" default-resource-name="SecurityEntityLabels" title="Security Component - User-To-Artifact Permission Relationship Entity"> @@ -337,7 +337,7 @@ </relation> </entity> - <entity entity-name="UserGroupToArtifactPermissionRel" + <entity entity-name="UserGroupToArtifactPermRel" package-name="org.ofbiz.security.artifactsecurity" default-resource-name="SecurityEntityLabels" title="Security Component - User Group-To-Artifact Permission Relationship Entity"> Modified: ofbiz/branches/executioncontext20090812/framework/webslinger/data/WebslingerSeedData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/webslinger/data/WebslingerSeedData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/webslinger/data/WebslingerSeedData.xml (original) +++ ofbiz/branches/executioncontext20090812/framework/webslinger/data/WebslingerSeedData.xml Mon Aug 24 22:15:46 2009 @@ -25,4 +25,11 @@ <WebslingerHostSuffix hostSuffixId="PREVIEW" hostSuffix=".preview"/> <WebslingerHostSuffix hostSuffixId="LOCALHOST" hostSuffix=".localhost"/> + <ArtifactPath artifactPath="ofbiz/webslinger" description="Webslinger URL"/> + + <!-- 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. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/webslinger" permissionValue="admin=true"/> </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/framework/webtools/data/WebtoolsSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/webtools/data/WebtoolsSecurityData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/webtools/data/WebtoolsSecurityData.xml (original) +++ ofbiz/branches/executioncontext20090812/framework/webtools/data/WebtoolsSecurityData.xml Mon Aug 24 22:15:46 2009 @@ -94,4 +94,13 @@ <SecurityGroupPermission groupId="FLEXADMIN" permissionId="UTIL_DEBUG_VIEW"/> <SecurityGroupPermission groupId="VIEWADMIN" permissionId="UTIL_CACHE_VIEW"/> <SecurityGroupPermission groupId="VIEWADMIN" permissionId="UTIL_DEBUG_VIEW"/> + + <ArtifactPath artifactPath="ofbiz/webtools" description="Webtools 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. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/webtools" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/assetmaint/data/AssetMaintSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/assetmaint/data/AssetMaintSecurityData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/assetmaint/data/AssetMaintSecurityData.xml (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/assetmaint/data/AssetMaintSecurityData.xml Mon Aug 24 22:15:46 2009 @@ -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. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/assetmaint" permissionValue="admin=true"/> + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/ismgr" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/cmssite/data/CmsSiteDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/cmssite/data/CmsSiteDemoData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/cmssite/data/CmsSiteDemoData.xml (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/cmssite/data/CmsSiteDemoData.xml Mon Aug 24 22:15:46 2009 @@ -171,4 +171,13 @@ <ContentAssoc contentId="OFBIZ_PPOINT" contentIdTo="OFBIZ_HOME" contentAssocTypeId="SUB_CONTENT" fromDate="2001-01-01 00:00:00" mapKey="demoHome"/> <WebSiteContent webSiteId="OfbizSite" contentId="OFBIZ_HOME" webSiteContentTypeId="DEFAULT_PAGE" fromDate="2001-01-01 00:00:00"/> + <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. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/cmssite" permissionValue="admin=true"/> + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/ofbizsite" permissionValue="admin=true"/> </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/ebay/data/EbaySecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/ebay/data/EbaySecurityData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/ebay/data/EbaySecurityData.xml (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/ebay/data/EbaySecurityData.xml Mon Aug 24 22:15:46 2009 @@ -27,4 +27,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. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/ebay" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/DemoProduct.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/DemoProduct.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/DemoProduct.xml (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/DemoProduct.xml Mon Aug 24 22:15:46 2009 @@ -84,7 +84,14 @@ <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_PAYPAL" paymentServiceTypeEnumId="PRDS_PAY_REFUND" paymentService="" paymentCustomMethodId="PAYPAL_REFUND" paymentGatewayConfigId="PAYPAL_CONFIG"/> <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_PAYPAL" paymentServiceTypeEnumId="PRDS_PAY_RELEASE" paymentService="" paymentCustomMethodId="PAYPAL_CAPTURE" paymentGatewayConfigId="PAYPAL_CONFIG"/> --> - + <!-- Example Orbital Gateway Settings + <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_REAUTH" paymentService="orbitalCCAuth" paymentCustomMethodId="CC_AUTH_ORBITAL" paymentGatewayConfigId="ORBITAL_CONFIG"/> + <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="orbitalCCAuthCapture" paymentCustomMethodId="CC_AUTH_CAPTR_ORBTL" paymentGatewayConfigId="ORBITAL_CONFIG"/> + <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_CAPTURE" paymentService="orbitalCCCapture" paymentCustomMethodId="CC_CAPTURE_ORBITAL" paymentGatewayConfigId="ORBITAL_CONFIG"/> + <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_REFUND" paymentService="orbitalCCRefund" paymentCustomMethodId="CC_REFUND_ORBITAL" paymentGatewayConfigId="ORBITAL_CONFIG"/> + <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_RELEASE" paymentService="orbitalCCRelease" paymentCustomMethodId="CC_RELEASE_ORBITAL" paymentGatewayConfigId="ORBITAL_CONFIG"/> + --> + <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_WORLDPAY" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId="" paymentGatewayConfigId="WORLDPAY_CONFIG"/> <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_OFFLINE" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/> <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_COD" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/DemoPurchasing.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/DemoPurchasing.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/DemoPurchasing.xml (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/DemoPurchasing.xml Mon Aug 24 22:15:46 2009 @@ -30,6 +30,7 @@ <PartyContactMechPurpose partyId="DemoSupplier" contactMechId="9001" contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2001-05-13 00:00:00.000"/> <PartyContactMechPurpose partyId="DemoSupplier" contactMechId="9001" contactMechPurposeTypeId="PAYMENT_LOCATION" fromDate="2001-05-13 00:00:00.000"/> <UserLogin userLoginId="DemoSupplier" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" partyId="DemoSupplier"/> + <UserToUserGroupRelationship userLoginId="DemoSupplier" groupId="OFBIZ_USERS"/> <Party partyId="BigSupplier" partyTypeId="PARTY_GROUP" supplierProductName="" supplierProductId=""/> @@ -42,6 +43,7 @@ <PartyContactMechPurpose partyId="BigSupplier" contactMechId="9002" contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2000-01-01 00:00:00.000"/> <PartyContactMechPurpose partyId="BigSupplier" contactMechId="9002" contactMechPurposeTypeId="PAYMENT_LOCATION" fromDate="2000-01-01 00:00:00.000"/> <UserLogin userLoginId="BigSupplier" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" partyId="BigSupplier"/> + <UserToUserGroupRelationship userLoginId="BigSupplier" groupId="OFBIZ_USERS"/> <Party partyId="EuroSupplier" partyTypeId="PARTY_GROUP" supplierProductName="" supplierProductId=""/> <PartyGroup partyId="EuroSupplier" groupName="European Supplier" supplierProductName="" supplierProductId=""/> @@ -53,6 +55,7 @@ <PartyContactMechPurpose partyId="EuroSupplier" contactMechId="9003" contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2000-01-01 00:00:00.000"/> <PartyContactMechPurpose partyId="EuroSupplier" contactMechId="9003" contactMechPurposeTypeId="PAYMENT_LOCATION" fromDate="2000-01-01 00:00:00.000"/> <UserLogin userLoginId="EuroSupplier" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" partyId="EuroSupplier"/> + <UserToUserGroupRelationship userLoginId="EuroSupplier" groupId="OFBIZ_USERS"/> <!-- supplier pricing --> <SupplierProduct partyId="DemoSupplier" supplierPrefOrderId="10_MAIN_SUPPL" minimumOrderQuantity="0" currencyUomId="USD" productId="GZ-1000" lastPrice="7.5" supplierProductId="GZ-1000-0" availableFromDate="2005-01-01 00:00:00.000"/> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/EcommerceTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/EcommerceTypeData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/EcommerceTypeData.xml (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/EcommerceTypeData.xml Mon Aug 24 22:15:46 2009 @@ -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. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/ecommerce" permissionValue="admin=true"/> + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/ecomclone" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/blog/menubar.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/blog/menubar.ftl?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/blog/menubar.ftl (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/blog/menubar.ftl Mon Aug 24 22:15:46 2009 @@ -1,3 +1,21 @@ +<#-- +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. +--> <div id="menubar"> <a href="<@ofbizUrl>/main</@ofbizUrl>" class="headerlink">${uiLabelMap.CommonHome}</a> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl Mon Aug 24 22:15:46 2009 @@ -17,61 +17,53 @@ under the License. --> -<div id="form-container" class="screenlet"> - <div class="screenlet-header"> - <div class='boxhead'> ${uiLabelMap.EcommerceMyAccount}</div> - </div> - <div class="screenlet-body"> - <form id="editUserForm" name="editUserForm" method="post" action="<@ofbizUrl>updateCustomerProfile</@ofbizUrl>"> +<div class="screenlet"> + <h3>${uiLabelMap.EcommerceMyAccount}</h3> + <form id="editUserForm" name="editUserForm" method="post" action="<@ofbizUrl>updateCustomerProfile</@ofbizUrl>"> + <fieldset> <input type="hidden" name="emailContactMechPurposeTypeId" value="PRIMARY_EMAIL"/> <input type="hidden" name="emailContactMechId" value="${emailContactMechId?if_exists}"/> - <div class="left center"> - <div class="screenlet-header"><div class='boxhead'> ${uiLabelMap.PartyContactInformation}</div></div> - <div class="screenlet-body"> - <div class="form-row"> - <div class="field-label"><label for="firstName">${uiLabelMap.PartyFirstName}*<span id="advice-required-firstName" style="display: none" class="errorMessage">(required)</span></label></div> - <div class="form-field"><input type="text" name="firstName" id="firstName" class="required" value="${firstName?if_exists}" size="30" maxlength="30"></div> - </div> - <div class="form-row"> - <div class="field-label"><label for="lastName">${uiLabelMap.PartyLastName}*<span id="advice-required-lastName" style="display: none" class="errorMessage">(required)</span></label></div> - <div class="form-field"><input type="text" name="lastName" id="lastName" class="required" value="${lastName?if_exists}" size="30" maxlength="30"></div> - </div> - <div class="form-row"> - <div class="field-label"> - <label for="emailAddress"> - ${uiLabelMap.CommonEmail}* - <span id="advice-required-emailAddress" style="display: none" class="errorMessage">(required)</span> - <span id="advice-validate-email-emailAddress" class="errorMessage" style="display:none">${uiLabelMap.PartyEmailAddressNotFormattedCorrectly}</span> - </label> - </div> - <div class="form-field"><input type="text" class="required validate-email" name="emailAddress" id="emailAddress" value="${emailAddress?if_exists}" size="30" maxlength="255"/></div> - </div> + <h3>${uiLabelMap.PartyContactInformation}</h3> + <div> + <label for="firstName">${uiLabelMap.PartyFirstName}*<span id="advice-required-firstName" style="display: none" class="errorMessage">(required)</span></label> + <input type="text" name="firstName" id="firstName" class="required" value="${firstName?if_exists}" size="30" maxlength="30" /> + </div> + <div> + <label for="lastName">${uiLabelMap.PartyLastName}*<span id="advice-required-lastName" style="display: none" class="errorMessage">(required)</span></label> + <input type="text" name="lastName" id="lastName" class="required" value="${lastName?if_exists}" size="30" maxlength="30" /> + </div> + <div> + <label for="emailAddress">${uiLabelMap.CommonEmail}* + <span id="advice-required-emailAddress" style="display: none" class="errorMessage">(required)</span> + <span id="advice-validate-email-emailAddress" class="errorMessage" style="display:none">${uiLabelMap.PartyEmailAddressNotFormattedCorrectly}</span> + </label> + <input type="text" class="required validate-email" name="emailAddress" id="emailAddress" value="${emailAddress?if_exists}" size="30" maxlength="255"/> </div> </div> + </fieldset> + <fieldset> <div class="center right"> - <div class="screenlet-header"><div class='boxhead'> ${uiLabelMap.EcommerceAccountInformation}</div></div> - <div class="screenlet-body"> - <div class="form-row"> - <div class="field-label"><label for="userName">${uiLabelMap.CommonUsername}*</label></div> - <div class="form-field"><input type="text" name="userLoginId" id="userLoginId" value="${userLogin.userLoginId?if_exists}" size="30" maxlength="255" <#if userLogin.userLoginId?exists>disabled</#if>></div> - </div> - <div class="form-row"> - <div class="field-label"><label for="currentPassword">${uiLabelMap.CommonCurrentPassword}*</label></div> - <div class="form-field"><input type="password" name="currentPassword" id="currentPassword" value="" size="30" maxlength="16"></div> - </div> - <div class="form-row"> - <div class="field-label"><label for="newPassword">${uiLabelMap.CommonNewPassword}*</label></div> - <div class="form-field"><input type="password" name="newPassword" id="newPassword" value="" size="30" maxlength="16"></div> - </div> - <div class="form-row"> - <div class="field-label"><label for="newPasswordVerify">${uiLabelMap.CommonNewPasswordVerify}*</label></div> - <div class="form-field"><input type="password" name="newPasswordVerify" id="newPasswordVerify" value="" size="30" maxlength="16"></div> - </div> + <h3>${uiLabelMap.EcommerceAccountInformation}</h3> + <div> + <label for="userLoginId">${uiLabelMap.CommonUsername}*</label> + <input type="text" name="userLoginId" id="userLoginId" value="${userLogin.userLoginId?if_exists}" size="30" maxlength="255" <#if userLogin.userLoginId?exists>disabled="disabled"</#if> /> + </div> + <div> + <label for="currentPassword">${uiLabelMap.CommonCurrentPassword}*</label> + <input type="password" name="currentPassword" id="currentPassword" value="" size="30" maxlength="16" /> + </div> + <div> + <label for="newPassword">${uiLabelMap.CommonNewPassword}*</label> + <input type="password" name="newPassword" id="newPassword" value="" size="30" maxlength="16" /> + </div> + <div> + <label for="newPasswordVerify">${uiLabelMap.CommonNewPasswordVerify}*</label> + <input type="password" name="newPasswordVerify" id="newPasswordVerify" value="" size="30" maxlength="16" /> </div> </div> - <div class="form-row"> <a id="submitEditUserForm" href="javascript:void(0);" class="buttontext">${uiLabelMap.CommonSubmit}</a></div> - </form> - </div> + </fieldset> + <div><a id="submitEditUserForm" href="javascript:void(0);" class="button">${uiLabelMap.CommonSubmit}</a></div> + </form> </div> \ No newline at end of file Modified: ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl Mon Aug 24 22:15:46 2009 @@ -18,78 +18,88 @@ --> <div class="screenlet"> - <div class="screenlet-header"> - <div class="boxhead"> ${uiLabelMap.EcommerceMyAccount}</div> - </div> + <h3>${uiLabelMap.EcommerceMyAccount}</h3> <div class="screenlet-body"> - <div align="right"><a class="buttontext" href="<@ofbizUrl>editProfile</@ofbizUrl>">${uiLabelMap.EcommerceEditProfile}</a> </div><br/> - <div class="screenlet-header"><div class="boxhead"> ${uiLabelMap.PartyContactInformation}</div></div> - <div class="screenlet-body"> - <div class="form-row"> - <div class="form-field">${firstName?if_exists} ${lastName?if_exists}</div> - </div> - - <div class="form-row"> - <input type="hidden" id="updatedEmailContactMechId" name="emailContactMechId" value="${emailContactMechId}"> - <input type="hidden" id="updatedEmailAddress" name="updatedEmailAddress" value="${emailAddress}"> - <div class="form-field" id="emailAddress">${emailAddress}</div> - <a href="mailto:${emailAddress}" class="linktext">(${uiLabelMap.PartySendEmail})</a> - </div> - <div class="form-row"><div id="serverError_${emailContactMechId}" class="errorMessage"></div></div> + <div> + <a class="button" href="<@ofbizUrl>editProfile</@ofbizUrl>">${uiLabelMap.EcommerceEditProfile}</a> + <h3>${uiLabelMap.PartyContactInformation}</h3> + <label>${firstName?if_exists} ${lastName?if_exists}</label> + <input type="hidden" id="updatedEmailContactMechId" name="emailContactMechId" value="${emailContactMechId}" /> + <input type="hidden" id="updatedEmailAddress" name="updatedEmailAddress" value="${emailAddress}" /> + <label>${emailAddress}</label> + <a href="mailto:${emailAddress}" class="linktext">(${uiLabelMap.PartySendEmail})</a> + <div id="serverError_${emailContactMechId}" class="errorMessage"></div> </div> - <#-- Manage Addresses --> - <div class="screenlet-header"><div class='boxhead'> ${uiLabelMap.EcommerceAddressBook}</div></div> - <div class="screenlet-body"> - <div align="right"><a class="buttontext" href="<@ofbizUrl>manageAddress</@ofbizUrl>">${uiLabelMap.EcommerceManageAddresses}</a> </div> + <h3>${uiLabelMap.EcommerceAddressBook}</h3> + <div> + <a class="button" href="<@ofbizUrl>manageAddress</@ofbizUrl>">${uiLabelMap.EcommerceManageAddresses}</a> <div class="left center"> - <div class="screenlet-header"><div class='boxhead'>${uiLabelMap.EcommercePrimaryShippingAddress}</div></div> - <div class="screenlet-body"> + <div class='boxhead'><h3>${uiLabelMap.EcommercePrimaryShippingAddress}</h3></div> + <div> + <ul> <#if shipToContactMechId?exists> - ${shipToAddress1?if_exists}<br/> - <#if shipToAddress2?has_content>${shipToAddress2?if_exists}<br/></#if> - <#if shipToStateProvinceGeoId?has_content && shipToStateProvinceGeoId != "_NA_"> - ${shipToStateProvinceGeoId} - </#if> - ${shipToCity?if_exists}, - ${shipToPostalCode?if_exists}<br/> - ${shipToCountryGeoId?if_exists}<br/> + <li>${shipToAddress1?if_exists}</li> + <#if shipToAddress2?has_content><li>${shipToAddress2?if_exists}</li></#if> + <li> + <ul> + <li> + <#if shipToStateProvinceGeoId?has_content && shipToStateProvinceGeoId != "_NA_"> + ${shipToStateProvinceGeoId} + </#if> + ${shipToCity?if_exists}, + ${shipToPostalCode?if_exists} + </li> + <li>${shipToCountryGeoId?if_exists}</li> + </ul> + </li> <#if shipToTelecomNumber?has_content> + <li> ${shipToTelecomNumber.countryCode?if_exists}- ${shipToTelecomNumber.areaCode?if_exists}- ${shipToTelecomNumber.contactNumber?if_exists} - <#if shipToExtension?exists>-${shipToExtension?if_exists}</#if><br/> + <#if shipToExtension?exists>-${shipToExtension?if_exists}</#if> + </li> </#if> <#else> - ${uiLabelMap.PartyPostalInformationNotFound} + <li>${uiLabelMap.PartyPostalInformationNotFound}</li> </#if> + </ul> </div> </div> - - <div class="center right"> - <div class="screenlet-header"><div class='boxhead'> ${uiLabelMap.EcommercePrimaryBillingAddress}</div></div> - <div class="screenlet-body"> + <div class="right center"> + <div class='boxhead'><h3>${uiLabelMap.EcommercePrimaryBillingAddress}</h3></div> + <div> + <ul> <#if billToContactMechId?exists> - ${billToAddress1?if_exists}<br/> - <#if billToAddress2?has_content>${billToAddress2?if_exists}<br/></#if> - <#if billToStateProvinceGeoId?has_content && billToStateProvinceGeoId != "_NA_"> - ${billToStateProvinceGeoId} - </#if> - ${billToCity?if_exists}, - ${billToPostalCode?if_exists}<br/> - ${billToCountryGeoId?if_exists}<br/> + <li>${billToAddress1?if_exists}</li> + <#if billToAddress2?has_content><li>${billToAddress2?if_exists}</li></#if> + <li> + <ul> + <li> + <#if billToStateProvinceGeoId?has_content && billToStateProvinceGeoId != "_NA_"> + ${billToStateProvinceGeoId} + </#if> + ${billToCity?if_exists}, + ${billToPostalCode?if_exists} + </li> + <li>${billToCountryGeoId?if_exists}</li> + </ul> + </li> <#if billToTelecomNumber?has_content> + <li> ${billToTelecomNumber.countryCode?if_exists}- ${billToTelecomNumber.areaCode?if_exists}- ${billToTelecomNumber.contactNumber?if_exists} - <#if billToExtension?exists>-${billToExtension?if_exists}</#if><br/> + <#if billToExtension?exists>-${billToExtension?if_exists}</#if> + </li> </#if> <#else> - ${uiLabelMap.PartyPostalInformationNotFound} + <li>${uiLabelMap.PartyPostalInformationNotFound}</li> </#if> + </ul> </div> </div> </div> - <div class="form-row"></div> </div> </div> \ No newline at end of file Modified: ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/images/blog.css URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/images/blog.css?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/images/blog.css (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/images/blog.css Mon Aug 24 22:15:46 2009 @@ -1,3 +1,22 @@ +/* + * 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. + */ + .blogs { position: inherit; width: inherit; Modified: ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/images/productAdditionalView.js URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/images/productAdditionalView.js?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/images/productAdditionalView.js (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/images/productAdditionalView.js Mon Aug 24 22:15:46 2009 @@ -1,3 +1,22 @@ +/* +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. +*/ + imgView = { init: function() { if (document.getElementById) { Modified: ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js Mon Aug 24 22:15:46 2009 @@ -1,3 +1,22 @@ +/* +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. +*/ + var validateNewUser = null; var validateEditUser = null; var validatePostalAddress = null; Modified: ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/images/quickAnonCustSettings.js URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/images/quickAnonCustSettings.js?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/images/quickAnonCustSettings.js (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/images/quickAnonCustSettings.js Mon Aug 24 22:15:46 2009 @@ -1,3 +1,22 @@ +/* +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. +*/ + Event.observe(window, 'load', isValidElement); function isValidElement(element){ Modified: ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/widget/CustRequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/widget/CustRequestScreens.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/widget/CustRequestScreens.xml (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/widget/CustRequestScreens.xml Mon Aug 24 22:15:46 2009 @@ -83,7 +83,7 @@ <decorator-section name="body"> <container style="lefthalf"> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/request/requestInfo.ftl"/></html> + <html><html-template location="component://ecommerce/webapp/ecommerce/request/requestInfo.ftl"/></html> </platform-specific> <platform-specific> <html><html-template location="component://order/webapp/ordermgr/request/ViewRequestItemInfo.ftl"/></html> @@ -97,7 +97,7 @@ <html><html-template location="component://order/webapp/ordermgr/request/requestContactMech.ftl"/></html> </platform-specific> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/request/requestRoles.ftl"/></html> + <html><html-template location="component://ecommerce/webapp/ecommerce/request/requestRoles.ftl"/></html> </platform-specific> </container> </decorator-section> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/googlebase/data/GoogleBaseSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/googlebase/data/GoogleBaseSecurityData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/googlebase/data/GoogleBaseSecurityData.xml (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/googlebase/data/GoogleBaseSecurityData.xml Mon Aug 24 22:15:46 2009 @@ -27,4 +27,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. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/googlebase" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityData.xml (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityData.xml Mon Aug 24 22:15:46 2009 @@ -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. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/googlecheckout" permissionValue="admin=true"/> + </entity-engine-xml> Added: ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/data/HhFacilitySecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/data/HhFacilitySecurityData.xml?rev=807412&view=auto ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/data/HhFacilitySecurityData.xml (added) +++ ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/data/HhFacilitySecurityData.xml Mon Aug 24 22:15:46 2009 @@ -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. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/hhfacility" permissionValue="admin=true"/> + +</entity-engine-xml> Propchange: ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/data/HhFacilitySecurityData.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/data/HhFacilitySecurityData.xml ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/data/HhFacilitySecurityData.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/ofbiz-component.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/ofbiz-component.xml (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/ofbiz-component.xml Mon Aug 24 22:15:46 2009 @@ -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/executioncontext20090812/specialpurpose/myportal/data/MyPortalSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/myportal/data/MyPortalSecurityData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/myportal/data/MyPortalSecurityData.xml (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/myportal/data/MyPortalSecurityData.xml Mon Aug 24 22:15:46 2009 @@ -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. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/myportal" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/myportal/widget/reloadCaptchaCode.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/myportal/widget/reloadCaptchaCode.ftl?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/myportal/widget/reloadCaptchaCode.ftl (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/myportal/widget/reloadCaptchaCode.ftl Mon Aug 24 22:15:46 2009 @@ -1,3 +1,22 @@ +<#-- +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. +--> + <#assign idkey = Static["org.ofbiz.common.Captcha"].ID_KEY> <input type="hidden" value="${idkey?if_exists}" name="captchaCode"/> \ No newline at end of file Modified: ofbiz/branches/executioncontext20090812/specialpurpose/myportal/widget/reloadCaptchaImage.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/myportal/widget/reloadCaptchaImage.ftl?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/myportal/widget/reloadCaptchaImage.ftl (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/myportal/widget/reloadCaptchaImage.ftl Mon Aug 24 22:15:46 2009 @@ -1,3 +1,22 @@ +<#-- +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. +--> + <#-- For add Captcha Capture --> <#assign fileName = Static["org.ofbiz.common.Captcha"].getCodeCaptcha(request,response)> <#assign fileName = Static["org.ofbiz.common.Captcha"].CAPTCHA_FILE_NAME> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/oagis/data/OagisSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/oagis/data/OagisSecurityData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/oagis/data/OagisSecurityData.xml (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/oagis/data/OagisSecurityData.xml Mon Aug 24 22:15:46 2009 @@ -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. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/oagis" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/pos/data/DemoRetail.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/pos/data/DemoRetail.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/pos/data/DemoRetail.xml (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/pos/data/DemoRetail.xml Mon Aug 24 22:15:46 2009 @@ -23,6 +23,8 @@ <UserLogin userLoginId="2" partyId="ltdadmin" currentPassword="a54bed37c5b3b28ee30760b5c8d1bbd735ef10cf" passwordHint="The Number Two, Yeah, Literally"/> <UserLoginSecurityGroup groupId="POSCLERK" userLoginId="1" fromDate="2001-01-01 12:00:00.0"/> <UserLoginSecurityGroup groupId="POSCLERK" userLoginId="2" fromDate="2001-01-01 12:00:00.0"/> + <UserToUserGroupRelationship userLoginId="1" groupId="OFBIZ_USERS"/> + <UserToUserGroupRelationship userLoginId="2" groupId="OFBIZ_USERS"/> <Facility facilityId="MyRetailStore" ownerPartyId="Company" facilityTypeId="RETAIL_STORE" facilityName="My Retail Store" description="Example Retail (POS) Store"/> <ContactMech contactMechId="9300" contactMechTypeId="POSTAL_ADDRESS"/> <ContactMech contactMechId="9301" contactMechTypeId="TELECOM_NUMBER"/> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml Mon Aug 24 22:15:46 2009 @@ -1,4 +1,23 @@ <?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> <!-- Resources --> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/data/ProjectMgrDemoPasswordData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/data/ProjectMgrDemoPasswordData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/data/ProjectMgrDemoPasswordData.xml (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/data/ProjectMgrDemoPasswordData.xml Mon Aug 24 22:15:46 2009 @@ -24,4 +24,10 @@ <UserLogin userLoginId="DemoEmployee1" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" passwordHint="" partyId="DemoEmployee1"/> <UserLogin userLoginId="DemoEmployee2" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" passwordHint="" partyId="DemoEmployee2"/> <UserLogin userLoginId="DemoEmployee3" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" passwordHint="" partyId="DemoEmployee3"/> + <UserToUserGroupRelationship userLoginId="DemoCustomer1" groupId="OFBIZ_USERS"/> + <UserToUserGroupRelationship userLoginId="DemoCustomer2" groupId="OFBIZ_USERS"/> + <UserToUserGroupRelationship userLoginId="DemoEmployee" groupId="OFBIZ_USERS"/> + <UserToUserGroupRelationship userLoginId="DemoEmployee1" groupId="OFBIZ_USERS"/> + <UserToUserGroupRelationship userLoginId="DemoEmployee2" groupId="OFBIZ_USERS"/> + <UserToUserGroupRelationship userLoginId="DemoEmployee3" groupId="OFBIZ_USERS"/> </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml Mon Aug 24 22:15:46 2009 @@ -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. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/projectmgr" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/main.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/main.ftl?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/main.ftl (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/main.ftl Mon Aug 24 22:15:46 2009 @@ -1,3 +1,21 @@ +<#-- +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. +--> <br/> <h2>${text1}</h2> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/webpos/data/DemoPosData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/webpos/data/DemoPosData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/webpos/data/DemoPosData.xml (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/webpos/data/DemoPosData.xml Mon Aug 24 22:15:46 2009 @@ -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. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/webpos" permissionValue="admin=true"/> + </entity-engine-xml> \ No newline at end of file Modified: ofbiz/branches/executioncontext20090812/specialpurpose/webpos/webapp/webpos/images/js/SearchProducts.js URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/webpos/webapp/webpos/images/js/SearchProducts.js?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/webpos/webapp/webpos/images/js/SearchProducts.js (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/webpos/webapp/webpos/images/js/SearchProducts.js Mon Aug 24 22:15:46 2009 @@ -1,3 +1,22 @@ +/* +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. +*/ + Event.observe(window, 'load', function() { // Autocompleter for good identification field Modified: ofbiz/branches/executioncontext20090812/themes/bizznesstime/data/BizznessTimeThemeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/themes/bizznesstime/data/BizznessTimeThemeData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/themes/bizznesstime/data/BizznessTimeThemeData.xml (original) +++ ofbiz/branches/executioncontext20090812/themes/bizznesstime/data/BizznessTimeThemeData.xml Mon Aug 24 22:15:46 2009 @@ -30,4 +30,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. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/bizznesstime" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/themes/bizznesstime/webapp/bizznesstime/css/links.css URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/themes/bizznesstime/webapp/bizznesstime/css/links.css?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/themes/bizznesstime/webapp/bizznesstime/css/links.css (original) +++ ofbiz/branches/executioncontext20090812/themes/bizznesstime/webapp/bizznesstime/css/links.css Mon Aug 24 22:15:46 2009 @@ -1,3 +1,22 @@ +/* + * 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. + */ + /* Make sure the icons are not cut */ a[href^="http:"], a[href^="mailto:"], a[href^="http:"]:visited, a[href$=".pdf"], a[href$=".doc"], a[href$=".xls"], a[href$=".rss"], Modified: ofbiz/branches/executioncontext20090812/themes/bluelight/data/BlueLightThemeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/themes/bluelight/data/BlueLightThemeData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/themes/bluelight/data/BlueLightThemeData.xml (original) +++ ofbiz/branches/executioncontext20090812/themes/bluelight/data/BlueLightThemeData.xml Mon Aug 24 22:15:46 2009 @@ -29,4 +29,13 @@ <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://bluelight/includes/appbar.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. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/bluelight" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/themes/bluelight/webapp/bluelight/dropdown.js URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/themes/bluelight/webapp/bluelight/dropdown.js?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/themes/bluelight/webapp/bluelight/dropdown.js (original) +++ ofbiz/branches/executioncontext20090812/themes/bluelight/webapp/bluelight/dropdown.js Mon Aug 24 22:15:46 2009 @@ -1,3 +1,22 @@ +/* +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. +*/ + var DropDownMenu = Class.create(); DropDownMenu.prototype = { initialize: function(menuElement) { Modified: ofbiz/branches/executioncontext20090812/themes/flatgrey/data/FlatGreyThemeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/themes/flatgrey/data/FlatGreyThemeData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/themes/flatgrey/data/FlatGreyThemeData.xml (original) +++ ofbiz/branches/executioncontext20090812/themes/flatgrey/data/FlatGreyThemeData.xml Mon Aug 24 22:15:46 2009 @@ -30,4 +30,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. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/flatgrey" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/themes/multiflex/data/MultiflexThemeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/themes/multiflex/data/MultiflexThemeData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/themes/multiflex/data/MultiflexThemeData.xml (original) +++ ofbiz/branches/executioncontext20090812/themes/multiflex/data/MultiflexThemeData.xml Mon Aug 24 22:15:46 2009 @@ -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. --> + + <UserGroupToArtifactPermRel 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 |