svn commit: r1356181 [8/8] - in /ofbiz/branches/20120329_portl
Locked
svn commit: r1356181 [8/8] - in /ofbiz/branches/20120329_portl
 
|
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/pos/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/pos/ofbiz-component.xml?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/pos/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/pos/ofbiz-component.xml Mon Jul 2 11:02:34 2012 @@ -33,5 +33,34 @@ under the License. <entity-resource type="data" reader-name="seed" loader="main" location="data/PosTypeData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoRetail.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/PosSyncSettings.xml"/> + + <!-- load the JPOS devices --> + <container name="jpos.device-container" loaders="pos" class="org.ofbiz.pos.container.JposDeviceContainer"> + <property name="CashDrawer.1" value="NullCashDrawer"/> + <property name="Receipt" value="NullReceipt"/> + <!--property name="Receipt" value="TM-T88III"/--> + <!--property name="Receipt" value="StarTSP600"/--> + <property name="Keyboard" value="GenericKeyboard"/> + <property name="Scanner" value="GenericScanner"/> + <property name="Msr" value="TestMsr"/> + <property name="PinPad" value="[NOT IMPLEMENTED]"/> + <property name="Journal" value="[NOT IMPLEMENTED]"/> + <property name="LineDisplay" value="[NOT IMPLEMENTED]"/> + <property name="CheckScanner" value="[NOT IMPLEMENTED]"/> + <property name="SignatureCapture" value="[NOT IMPLEMENTED]"/> + </container> + + <!-- load the POS GUI --> + <container name="pos-container" loaders="pos" class="org.ofbiz.pos.container.PosContainer"> + <property name="startup-directory" value="specialpurpose/pos/config/"/> + <property name="startup-file" value="xpos.properties"/> + <property name="class-package-name " value="net.xoetrope.swing"/> + <property name="dispatcher-name" value="POSDispatcher"/> + <property name="delegator-name" value="default"/> + <property name="xui-session-id" value="pos-1"/> + <property name="facility-id" value="MyRetailStore"/> + <property name="look-and-feel" value="com.jgoodies.looks.plastic.PlasticLookAndFeel"/> + </container> + </ofbiz-component> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiContainer.java?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiContainer.java (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiContainer.java Mon Jul 2 11:02:34 2012 @@ -43,20 +43,22 @@ public abstract class XuiContainer imple protected String startupDir = null; protected String startupFile = null; protected String configFile = null; + protected String name; - public void init(String[] args, String configFile) throws ContainerException { + public void init(String[] args, String name, String configFile) throws ContainerException { + this.name = name; this.configFile = configFile; } public boolean start() throws ContainerException { // make sure the subclass sets the config name - if (this.getContainerConfigName() == null) { + if (name == null) { throw new ContainerException("Unknown container config name"); } // get the container config - ContainerConfig.Container cc = ContainerConfig.getContainer(this.getContainerConfigName(), configFile); + ContainerConfig.Container cc = ContainerConfig.getContainer(name, configFile); if (cc == null) { - throw new ContainerException("No " + this.getContainerConfigName() + " configuration found in container config!"); + throw new ContainerException("No " + name + " configuration found in container config!"); } // get the delegator @@ -71,7 +73,7 @@ public abstract class XuiContainer imple // get the pre-defined session ID String xuiSessionId = ContainerConfig.getPropertyValue(cc, "xui-session-id", null); if (UtilValidate.isEmpty(xuiSessionId)) { - throw new ContainerException("No xui-session-id value set in " + this.getContainerConfigName() + "!"); + throw new ContainerException("No xui-session-id value set in " + name + "!"); } String laf = ContainerConfig.getPropertyValue(cc, "look-and-feel", null); @@ -108,16 +110,15 @@ public abstract class XuiContainer imple public void stop() throws ContainerException { } + public String getName() { + return name; + } + public String getXuiPropertiesName() { return this.startupFile; } /** - * @return String the name of the container name property - */ - public abstract String getContainerConfigName(); - - /** * Implementation specific configuration from the container config * This method is called after the initial XUI configuration, after * the session creation; before the initial screen is rendered. Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/container/JposDeviceContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/container/JposDeviceContainer.java?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/container/JposDeviceContainer.java (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/container/JposDeviceContainer.java Mon Jul 2 11:02:34 2012 @@ -31,12 +31,16 @@ public class JposDeviceContainer impleme protected String configFile = null; - public void init(String[] args, String configFile) throws ContainerException { + private String name; + + public void init(String[] args, String name, String configFile) throws ContainerException { this.configFile = configFile; + this.name = name; } + public boolean start() throws ContainerException { - ContainerConfig.Container cc = ContainerConfig.getContainer("jpos.device-container", configFile); + ContainerConfig.Container cc = ContainerConfig.getContainer(name, configFile); if (cc == null) { throw new ContainerException("No jpos.device-container configuration found in container config!"); } @@ -63,4 +67,8 @@ public class JposDeviceContainer impleme } Debug.logInfo("JPOS Devices released and closed", module); } + + public String getName() { + return name; + } } Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/container/PosContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/container/PosContainer.java?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/container/PosContainer.java (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/container/PosContainer.java Mon Jul 2 11:02:34 2012 @@ -33,11 +33,6 @@ import org.ofbiz.product.store.ProductSt public class PosContainer extends XuiContainer { @Override - public String getContainerConfigName() { - return "pos-container"; - } - - @Override public void configure(ContainerConfig.Container cc) throws ContainerException { XuiSession session = XuiContainer.getSession(); GenericValue productStore = null; Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/ofbiz-component.xml?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/ofbiz-component.xml Mon Jul 2 11:02:34 2012 @@ -29,7 +29,8 @@ under the License. <entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrTypeData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrHelpData.xml"/> - <entity-resource type="data" reader-name="security" loader="main" location="data/ProjectMgrSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrSecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/ProjectMgrSecurityGroupDemoData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrPortletData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/ProjectMgrDemoData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/ProjectMgrDemoPasswordData.xml"/> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/ofbiz-component.xml?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/ofbiz-component.xml Mon Jul 2 11:02:34 2012 @@ -35,7 +35,8 @@ under the License. <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> <!-- <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/> --> <entity-resource type="data" reader-name="seed" loader="main" location="data/scrumTypeData.xml"/> - <entity-resource type="data" reader-name="security" loader="main" location="data/scrumSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/scrumSecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/scrumSecurityGroupDemoData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/scrumHelpData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/scrumDemoData.xml"/> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/testdef/scrumTests.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/testdef/scrumTests.xml?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/testdef/scrumTests.xml (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/testdef/scrumTests.xml Mon Jul 2 11:02:34 2012 @@ -59,7 +59,7 @@ under the License. <entity-xml action="load" entity-xml-url="component://scrum/data/scrumTypeData.xml"/> </test-case> <test-case case-name="scrum-security-data"> - <entity-xml action="load" entity-xml-url="component://scrum/data/scrumSecurityData.xml"/> + <entity-xml action="load" entity-xml-url="component://scrum/data/scrumSecurityGroupDemoData.xml"/> </test-case> <test-case case-name="scrum-demo-data"> <entity-xml action="load" entity-xml-url="component://scrum/data/scrumDemoData.xml"/> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/ofbiz-component.xml?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/ofbiz-component.xml Mon Jul 2 11:02:34 2012 @@ -26,7 +26,8 @@ under the License. <classpath type="jar" location="build/lib/*"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoPosData.xml"/> - <entity-resource type="data" reader-name="demo" loader="main" location="data/WebPosSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/WebPosSecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/WebPosSecurityGroupDemoData.xml"/> <service-resource type="model" loader="main" location="servicedef/services.xml"/> <service-resource type="model" loader="main" location="servicedef/services_cart.xml"/> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/ofbiz-component.xml?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/ofbiz-component.xml Mon Jul 2 11:02:34 2012 @@ -28,7 +28,8 @@ under the License. <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> - <entity-resource type="data" reader-name="security" loader="main" location="data/WorkFlowSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkFlowSecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/WorkFlowSecurityGroupDemoData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkFlowTypeData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/OrderProcessWorkflow.xml"/> Propchange: ofbiz/branches/20120329_portletWidget/tools/mergefromtrunk.bat ------------------------------------------------------------------------------ Merged /ofbiz/trunk/tools/mergefromtrunk.bat:r1351867-1355999 Propchange: ofbiz/branches/20120329_portletWidget/tools/mergefromtrunk.sh ------------------------------------------------------------------------------ Merged /ofbiz/trunk/tools/mergefromtrunk.sh:r1351867-1355999 |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |