svn commit: r1355466 - in /ofbiz/trunk: framework/base/config/ framework/birt/ framework/entityext/ framework/jetty/ framework/start/src/org/ofbiz/
Locked
 
|
Author: jacopoc
Date: Fri Jun 29 16:43:51 2012 New Revision: 1355466 URL: http://svn.apache.org/viewvc?rev=1355466&view=rev Log: Moved a few container definitions from the base/config/*-containers.xml files to their own component's ofbiz-component.xml file; this is a demonstration of the usage of the new ability to define component level containers; this is still experimental and there is room for improvements (and I am working on them and going to discuss a few details in the dev list) but this should already give a good idea of how we can remove redundancy from the various *-containers.xml files, remove dependencies between framework components and make the components self deployable. Removed: ofbiz/trunk/framework/base/config/jetty-containers.xml Modified: ofbiz/trunk/framework/base/config/both-containers.xml ofbiz/trunk/framework/base/config/install-containers.xml ofbiz/trunk/framework/base/config/ofbiz-containers.xml ofbiz/trunk/framework/base/config/pos-containers.xml ofbiz/trunk/framework/base/config/test-containers.xml ofbiz/trunk/framework/birt/ofbiz-component.xml ofbiz/trunk/framework/entityext/ofbiz-component.xml ofbiz/trunk/framework/jetty/ofbiz-component.xml ofbiz/trunk/framework/start/src/org/ofbiz/base/start/jetty.properties ofbiz/trunk/framework/testtools/ofbiz-component.xml ofbiz/trunk/specialpurpose/pos/ofbiz-component.xml Modified: ofbiz/trunk/framework/base/config/both-containers.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/both-containers.xml?rev=1355466&r1=1355465&r2=1355466&view=diff ============================================================================== --- ofbiz/trunk/framework/base/config/both-containers.xml (original) +++ ofbiz/trunk/framework/base/config/both-containers.xml Fri Jun 29 16:43:51 2012 @@ -20,6 +20,8 @@ under the License. <ofbiz-containers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-containers.xsd"> + <loader name="main"/> + <loader name="pos"/> <!-- load the ofbiz component container (always first) --> <container name="component-container" class="org.ofbiz.base.container.ComponentContainer"/> @@ -238,35 +240,6 @@ under the License. </property> </container> - - <!-- load the JPOS devices --> - <container name="jpos.device-container" 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" 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> - <!-- load BeanShell remote telnet server --> <container name="beanshell-container" class="org.ofbiz.base.container.BeanShellContainer"> <!-- the port below and port-1 will be opened by beanshell --> Modified: ofbiz/trunk/framework/base/config/install-containers.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/install-containers.xml?rev=1355466&r1=1355465&r2=1355466&view=diff ============================================================================== --- ofbiz/trunk/framework/base/config/install-containers.xml (original) +++ ofbiz/trunk/framework/base/config/install-containers.xml Fri Jun 29 16:43:51 2012 @@ -20,16 +20,12 @@ under the License. <ofbiz-containers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-containers.xsd"> + <loader name="install"/> <!-- load the ofbiz component container (always first) --> <container name="component-container" class="org.ofbiz.base.container.ComponentContainer"/> <!-- load the cached classloader container (always second) --> <container name="classloader-container" class="org.ofbiz.base.container.ClassLoaderContainer"/> - <!-- load the data load container, runs the entity data load stuff --> - <container name="dataload-container" class="org.ofbiz.entityext.data.EntityDataLoadContainer"> - <property name="delegator-name" value="default"/> - <property name="entity-group-name" value="org.ofbiz"/> - </container> </ofbiz-containers> Modified: ofbiz/trunk/framework/base/config/ofbiz-containers.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/ofbiz-containers.xml?rev=1355466&r1=1355465&r2=1355466&view=diff ============================================================================== --- ofbiz/trunk/framework/base/config/ofbiz-containers.xml (original) +++ ofbiz/trunk/framework/base/config/ofbiz-containers.xml Fri Jun 29 16:43:51 2012 @@ -20,6 +20,7 @@ under the License. <ofbiz-containers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-containers.xsd"> + <loader name="main"/> <!-- load the ofbiz component container (always first) --> <container name="component-container" class="org.ofbiz.base.container.ComponentContainer"/> @@ -235,9 +236,6 @@ under the License. </property> </container> - <!-- load the BIRT container --> - <container name="birt-container" class="org.ofbiz.birt.container.BirtContainer"/> - <!-- load BeanShell remote telnet server --> <!-- Commented out by default for security reasons --> <!-- the port below and port-1 will be opened by Beanshell --> Modified: ofbiz/trunk/framework/base/config/pos-containers.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/pos-containers.xml?rev=1355466&r1=1355465&r2=1355466&view=diff ============================================================================== --- ofbiz/trunk/framework/base/config/pos-containers.xml (original) +++ ofbiz/trunk/framework/base/config/pos-containers.xml Fri Jun 29 16:43:51 2012 @@ -20,38 +20,11 @@ under the License. <ofbiz-containers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-containers.xsd"> + <loader name="pos"/> <!-- load the ofbiz component container (always first) --> <container name="component-container" class="org.ofbiz.base.container.ComponentContainer"/> <!-- load the cached classloader container (always second) --> <container name="classloader-container" class="org.ofbiz.base.container.ClassLoaderContainer"/> - <!-- load the JPOS devices --> - <container name="jpos.device-container" 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" 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-containers> Modified: ofbiz/trunk/framework/base/config/test-containers.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/test-containers.xml?rev=1355466&r1=1355465&r2=1355466&view=diff ============================================================================== --- ofbiz/trunk/framework/base/config/test-containers.xml (original) +++ ofbiz/trunk/framework/base/config/test-containers.xml Fri Jun 29 16:43:51 2012 @@ -20,6 +20,7 @@ under the License. <ofbiz-containers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-containers.xsd"> + <loader name="test"/> <!-- load the ofbiz component container (always first) --> <container name="component-container" class="org.ofbiz.base.container.ComponentContainer"> <property name="ofbiz.instrumenterClassName" value="org.ofbiz.base.config.CoberturaInstrumenter"/> @@ -206,6 +207,4 @@ under the License. <property name="ciphers" value=""/> </property> </container> - - <container name="testtools-container" class="org.ofbiz.testtools.TestRunContainer"/> </ofbiz-containers> Modified: ofbiz/trunk/framework/birt/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/ofbiz-component.xml?rev=1355466&r1=1355465&r2=1355466&view=diff ============================================================================== --- ofbiz/trunk/framework/birt/ofbiz-component.xml (original) +++ ofbiz/trunk/framework/birt/ofbiz-component.xml Fri Jun 29 16:43:51 2012 @@ -26,4 +26,6 @@ under the License. <classpath type="jar" location="build/lib/*"/> <classpath type="dir" location="config"/> <service-resource type="model" loader="main" location="servicedef/services.xml"/> + + <container name="birt-container" loaders="main" class="org.ofbiz.birt.container.BirtContainer"/> </ofbiz-component> Modified: ofbiz/trunk/framework/entityext/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/ofbiz-component.xml?rev=1355466&r1=1355465&r2=1355466&view=diff ============================================================================== --- ofbiz/trunk/framework/entityext/ofbiz-component.xml (original) +++ ofbiz/trunk/framework/entityext/ofbiz-component.xml Fri Jun 29 16:43:51 2012 @@ -34,4 +34,10 @@ under the License. <service-resource type="model" loader="main" location="servicedef/services.xml"/> <service-resource type="group" loader="main" location="servicedef/groups.xml"/> + + <!-- load the data load container, runs the entity data load stuff --> + <container name="dataload-container" loaders="install" class="org.ofbiz.entityext.data.EntityDataLoadContainer"> + <property name="delegator-name" value="default"/> + <property name="entity-group-name" value="org.ofbiz"/> + </container> </ofbiz-component> Modified: ofbiz/trunk/framework/jetty/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/jetty/ofbiz-component.xml?rev=1355466&r1=1355465&r2=1355466&view=diff ============================================================================== --- ofbiz/trunk/framework/jetty/ofbiz-component.xml (original) +++ ofbiz/trunk/framework/jetty/ofbiz-component.xml Fri Jun 29 16:43:51 2012 @@ -24,4 +24,61 @@ under the License. <resource-loader name="main" type="component"/> <classpath type="jar" location="lib/*"/> <classpath type="jar" location="build/lib/*"/> + + <container name="jetty-container" class="org.ofbiz.jetty.container.JettyContainer"> + <property name="default-server" value="server"> + <property name="send-server-version" value="false"/> + <!-- thread pool config --> + <property name="min-threads" value="5"/> + <property name="max-threads" value="100"/> + <property name="max-idle-time-ms" value="30000"/> + <property name="max-stop-time-ms" value="5000"/> + <!-- connectors --> + <!-- + <property name="http-connector" value="connector"> + <property name="type" value="http"/> + <property name="host" value="0.0.0.0"/> + <property name="port" value="8080"/> + </property> + <property name="https-connector" value="connector"> + <property name="type" value="https"/> + <property name="host" value="0.0.0.0"/> + <property name="port" value="8443"/> + <property name="keystore" value="framework/base/config/ofbizssl.jks"/> + <property name="password" value="changeit"/> + <property name="key-password" value="changeit"/> + <property name="client-auth" value="false"/> + </property> + --> + <property name="nio-http-connector" value="connector"> + <property name="type" value="nio-http"/> + <property name="host" value="0.0.0.0"/> + <property name="port" value="8080"/> + </property> + <property name="nio-https-connector" value="connector"> + <property name="type" value="nio-https"/> + <property name="host" value="0.0.0.0"/> + <property name="port" value="8443"/> + <property name="keystore" value="framework/base/config/ofbizssl.jks"/> + <property name="password" value="changeit"/> + <property name="key-password" value="changeit"/> + <property name="client-auth" value="false"/> + </property> + <!-- + <property name="ajp13-connector" value="connector"> + <property name="type" value="ajp13"/> + <property name="host" value="0.0.0.0"/> + <property name="port" value="8009"/> + </property> + --> + <!-- request logs --> + <property name="request-log" value="request-log"> + <property name="filename" value="runtime/logs/yyyy_mm_dd.request.log"/> + <property name="append" value="true"/> + <property name="extended" value="true"/> + <property name="timezone" value="GMT"/> + <property name="retain-days" value="90"/> + </property> + </property> + </container> </ofbiz-component> Modified: ofbiz/trunk/framework/start/src/org/ofbiz/base/start/jetty.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/src/org/ofbiz/base/start/jetty.properties?rev=1355466&r1=1355465&r2=1355466&view=diff ============================================================================== --- ofbiz/trunk/framework/start/src/org/ofbiz/base/start/jetty.properties (original) +++ ofbiz/trunk/framework/start/src/org/ofbiz/base/start/jetty.properties Fri Jun 29 16:43:51 2012 @@ -48,7 +48,7 @@ ofbiz.admin.key=so3du5kasd5dn #ofbiz.log.dir=runtime/logs # --- Location (relative to ofbiz.home) for (normal) container configuration -ofbiz.container.config=framework/base/config/jetty-containers.xml +#ofbiz.container.config=framework/base/config/ofbiz-containers.xml # --- StartupLoader implementations to load (in order) ofbiz.start.loader1=org.ofbiz.base.container.ContainerLoader Modified: ofbiz/trunk/framework/testtools/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/ofbiz-component.xml?rev=1355466&r1=1355465&r2=1355466&view=diff ============================================================================== --- ofbiz/trunk/framework/testtools/ofbiz-component.xml (original) +++ ofbiz/trunk/framework/testtools/ofbiz-component.xml Fri Jun 29 16:43:51 2012 @@ -33,5 +33,6 @@ <!-- service resources: model(s), eca(s) and group definitions --> <service-resource type="model" loader="main" location="servicedef/services.xml"/> - + + <container name="testtools-container" loaders="test" class="org.ofbiz.testtools.TestRunContainer"/> </ofbiz-component> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/pos/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/ofbiz-component.xml?rev=1355466&r1=1355465&r2=1355466&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/ofbiz-component.xml (original) +++ ofbiz/trunk/specialpurpose/pos/ofbiz-component.xml Fri Jun 29 16:43:51 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> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |