Author: jleroux
Date: Sat Apr 21 19:19:09 2012 New Revision: 1328727 URL: http://svn.apache.org/viewvc?rev=1328727&view=rev Log: Moves guiapp component inside POS component Closes https://issues.apache.org/jira/browse/OFBIZ-4807 Added: ofbiz/trunk/specialpurpose/pos/config/XuiUiLabels.xml (with props) ofbiz/trunk/specialpurpose/pos/config/xui.properties (with props) ofbiz/trunk/specialpurpose/pos/lib/XuiCoreSwing-v3.2rc2b.jar - copied unchanged from r1328712, ofbiz/trunk/framework/guiapp/lib/XuiCoreSwing-v3.2rc2b.jar ofbiz/trunk/specialpurpose/pos/lib/XuiOptional-v3.2rc2b.jar (with props) ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/guiapp/ - copied from r1328712, ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/ Removed: ofbiz/trunk/framework/guiapp/ Modified: ofbiz/trunk/.classpath ofbiz/trunk/LICENSE ofbiz/trunk/build.xml ofbiz/trunk/framework/build.xml ofbiz/trunk/framework/component-load.xml ofbiz/trunk/specialpurpose/hhfacility/build.xml ofbiz/trunk/specialpurpose/oagis/build.xml ofbiz/trunk/specialpurpose/pos/build.xml ofbiz/trunk/specialpurpose/pos/config/xpos.properties ofbiz/trunk/specialpurpose/pos/ofbiz-component.xml ofbiz/trunk/specialpurpose/projectmgr/build.xml Modified: ofbiz/trunk/.classpath URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1328727&r1=1328726&r2=1328727&view=diff ============================================================================== --- ofbiz/trunk/.classpath (original) +++ ofbiz/trunk/.classpath Sat Apr 21 19:19:09 2012 @@ -126,8 +126,6 @@ <classpathentry kind="lib" path="framework/entity/lib/ofbiz-minerva.jar"/> <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-2.1.1.jar"/> <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-2.1.1.jar"/> - <classpathentry kind="lib" path="framework/guiapp/lib/XuiCoreSwing-v3.2rc2b.jar"/> - <classpathentry kind="lib" path="framework/guiapp/lib/XuiOptional-v3.2rc2b.jar"/> <classpathentry kind="lib" path="framework/jcr/lib/concurrent-1.3.4.jar"/> <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-api-2.3.3.jar"/> <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-core-2.3.3.jar"/> @@ -175,9 +173,11 @@ <classpathentry kind="lib" path="framework/webapp/lib/velocity-1.6.1.jar"/> <classpathentry kind="lib" path="specialpurpose/googlecheckout/lib/checkout-sdk-0.8.8.jar"/> <classpathentry kind="lib" path="specialpurpose/ldap/lib/cas-server-core-3.3.jar"/> + <classpathentry kind="lib" path="specialpurpose/pos/lib/XuiCoreSwing-v3.2rc2b.jar"/> + <classpathentry kind="lib" path="specialpurpose/pos/lib/XuiOptional-v3.2rc2b.jar"/> <classpathentry kind="lib" path="specialpurpose/pos/lib/jcl.jar"/> <classpathentry kind="lib" path="specialpurpose/pos/lib/jpos18-controls.jar"/> - <classpathentry kind="lib" path="specialpurpose/pos/lib/looks-2.0.2.jar"/> + <classpathentry kind="lib" path="specialpurpose/pos/lib/looks-2.0.2.jar"/> <classpathentry kind="lib" path="specialpurpose/ebaystore/lib/attributes.jar"/> <classpathentry kind="lib" path="specialpurpose/ebaystore/lib/ebaycalls.jar"/> <classpathentry kind="lib" path="specialpurpose/ebaystore/lib/ebaysdkcore.jar"/> @@ -204,7 +204,6 @@ <classpathentry kind="src" path="framework/entityext/src"/> <classpathentry kind="src" path="framework/example/src"/> <classpathentry kind="src" path="framework/geronimo/src"/> - <classpathentry kind="src" path="framework/guiapp/src"/> <classpathentry kind="src" path="framework/jcr/src"/> <classpathentry kind="src" path="framework/jetty/src"/> <classpathentry kind="src" path="framework/minilang/src"/> Modified: ofbiz/trunk/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1328727&r1=1328726&r2=1328727&view=diff ============================================================================== --- ofbiz/trunk/LICENSE (original) +++ ofbiz/trunk/LICENSE Sat Apr 21 19:19:09 2012 @@ -529,8 +529,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE ========================================================================= The following libraries distributed with Apache OFBiz are licensed under the Mozilla Public License Version 1.1: -ofbiz/trunk/framework/guiapp/lib/XuiCoreSwing-v3.2rc2b.jar -ofbiz/trunk/framework/guiapp/lib/XuiOptional-v3.2rc2b.jar +ofbiz/trunk/specialpurpose/pos/lib/XuiCoreSwing-v3.2rc2b.jar +ofbiz/trunk/specialpurpose/pos/lib/XuiOptional-v3.2rc2b.jar ofbiz/trunk/framework/webapp/lib/iText-2.1.7.jar ========================================================================= MOZILLA PUBLIC LICENSE Modified: ofbiz/trunk/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1328727&r1=1328726&r2=1328727&view=diff ============================================================================== --- ofbiz/trunk/build.xml (original) +++ ofbiz/trunk/build.xml Sat Apr 21 19:19:09 2012 @@ -287,7 +287,6 @@ under the License. <fileset dir="${ofbiz.home.dir}/framework/catalina/lib" includes="*.jar"/> <fileset dir="${ofbiz.home.dir}/framework/entity/lib" includes="*.jar"/> <fileset dir="${ofbiz.home.dir}/framework/geronimo/lib" includes="*.jar"/> - <fileset dir="${ofbiz.home.dir}/framework/guiapp/lib" includes="*.jar"/> <fileset dir="${ofbiz.home.dir}/framework/jetty/lib" includes="*.jar"/> <fileset dir="${ofbiz.home.dir}/framework/service/lib" includes="*.jar"/> <fileset dir="${ofbiz.home.dir}/framework/testtools/lib" includes="*.jar"/> @@ -1028,7 +1027,7 @@ under the License. <property name="sonar.sources" value="framework/appserver/src, framework/base/src, framework/bi/src, framework/birt/src, framework/catalina/src, framework/common/src, framework/datafile/src, framework/entity/src, framework/entityext/src, - framework/example/src, framework/geronimo/src, framework/guiapp/src, framework/jetty/src, framework/jcr/src, + framework/example/src, framework/geronimo/src, framework/jetty/src, framework/jcr/src, framework/minilang/src, framework/security/src, framework/service/src, framework/sql/src, framework/start/src, framework/testtools/src, framework/webapp/src, framework/webtools/src, framework/widget/src, applications/accounting/src, applications/commonext/src, applications/content/src, applications/humanres/src, Modified: ofbiz/trunk/framework/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/build.xml?rev=1328727&r1=1328726&r2=1328727&view=diff ============================================================================== --- ofbiz/trunk/framework/build.xml (original) +++ ofbiz/trunk/framework/build.xml Sat Apr 21 19:19:09 2012 @@ -27,7 +27,7 @@ under the License. catalina/build.xml,jetty/build.xml, security/build.xml,service/build.xml,jcr/build.xml,entityext/build.xml, bi/build.xml,minilang/build.xml, - webapp/build.xml,guiapp/build.xml,widget/build.xml, + webapp/build.xml,widget/build.xml, common/build.xml,datafile/build.xml,birt/build.xml, testtools/build.xml, appserver/build.xml,webtools/build.xml"/> Modified: ofbiz/trunk/framework/component-load.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/component-load.xml?rev=1328727&r1=1328726&r2=1328727&view=diff ============================================================================== --- ofbiz/trunk/framework/component-load.xml (original) +++ ofbiz/trunk/framework/component-load.xml Sat Apr 21 19:19:09 2012 @@ -36,7 +36,6 @@ under the License. <load-component component-location="bi"/> <load-component component-location="birt"/> <load-component component-location="webapp"/> - <load-component component-location="guiapp"/> <load-component component-location="widget"/> <load-component component-location="appserver"/> <load-component component-location="testtools"/> Modified: ofbiz/trunk/specialpurpose/hhfacility/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/build.xml?rev=1328727&r1=1328726&r2=1328727&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/hhfacility/build.xml (original) +++ ofbiz/trunk/specialpurpose/hhfacility/build.xml Sat Apr 21 19:19:09 2012 @@ -40,8 +40,6 @@ under the License. <fileset dir="../../framework/service/lib" includes="*.jar"/> <fileset dir="../../framework/service/build/lib" includes="*.jar"/> <fileset dir="../../framework/entityext/build/lib" includes="*.jar"/> - <fileset dir="../../framework/guiapp/lib" includes="*.jar"/> - <fileset dir="../../framework/guiapp/build/lib" includes="*.jar"/> <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/> <fileset dir="../../applications/party/build/lib" includes="*.jar"/> <fileset dir="../../applications/product/build/lib" includes="*.jar"/> Modified: ofbiz/trunk/specialpurpose/oagis/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/build.xml?rev=1328727&r1=1328726&r2=1328727&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/build.xml (original) +++ ofbiz/trunk/specialpurpose/oagis/build.xml Sat Apr 21 19:19:09 2012 @@ -40,8 +40,6 @@ under the License. <fileset dir="../../framework/service/lib" includes="*.jar"/> <fileset dir="../../framework/service/build/lib" includes="*.jar"/> <fileset dir="../../framework/entityext/build/lib" includes="*.jar"/> - <fileset dir="../../framework/guiapp/lib" includes="*.jar"/> - <fileset dir="../../framework/guiapp/build/lib" includes="*.jar"/> <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/> <fileset dir="../../framework/widget/build/lib" includes="*.jar"/> <fileset dir="../../applications/party/build/lib" includes="*.jar"/> Modified: ofbiz/trunk/specialpurpose/pos/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/build.xml?rev=1328727&r1=1328726&r2=1328727&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/build.xml (original) +++ ofbiz/trunk/specialpurpose/pos/build.xml Sat Apr 21 19:19:09 2012 @@ -41,11 +41,13 @@ under the License. <fileset dir="../../framework/service/lib" includes="*.jar"/> <fileset dir="../../framework/service/build/lib" includes="*.jar"/> <fileset dir="../../framework/entityext/build/lib" includes="*.jar"/> - <fileset dir="../../framework/guiapp/lib" includes="*.jar"/> - <fileset dir="../../framework/guiapp/build/lib" includes="*.jar"/> + <fileset dir="../../framework/minilang/build/lib" includes="*.jar"/> + <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/> <fileset dir="../../applications/party/build/lib" includes="*.jar"/> <fileset dir="../../applications/product/build/lib" includes="*.jar"/> <fileset dir="../../applications/order/build/lib" includes="*.jar"/> <fileset dir="../../applications/accounting/build/lib" includes="*.jar"/> + + </path> </project> Added: ofbiz/trunk/specialpurpose/pos/config/XuiUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/config/XuiUiLabels.xml?rev=1328727&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/pos/config/XuiUiLabels.xml (added) +++ ofbiz/trunk/specialpurpose/pos/config/XuiUiLabels.xml Sat Apr 21 19:19:09 2012 @@ -0,0 +1,43 @@ +<?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. +--> +<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <property key="XuiUnableToLogIn"> + <value xml:lang="en">Unable to log in; XUI not configured properly</value> + <value xml:lang="fr">Impossible de continuer : XUI n'est pas configuré correctement</value> + <value xml:lang="it">Non è possibile fare il log in; XUI non configurato propriamente</value> + <value xml:lang="th">à¹à¸¡à¹à¸ªà¸²à¸¡à¸²à¸£à¸à¹à¸à¹à¸²à¸ªà¸¹à¹à¸£à¸°à¸à¸à¹à¸à¹ : XUI à¹à¸¡à¹à¸ªà¸²à¸¡à¸²à¸£à¸à¸à¸±à¸à¸à¸²à¸£à¸à¹à¸à¸¡à¸¹à¸¥à¹à¸à¹à¸à¸¢à¹à¸²à¸à¸à¸¹à¸à¸à¹à¸à¸</value> + <value xml:lang="zh">æ æ³ç»å½ï¼XUIé ç½®ä¸æ£ç¡®</value> + </property> + <property key="XuiUserLoginNotValid"> + <value xml:lang="en">UserLogin returned not valid (null)</value> + <value xml:lang="fr">Identifiant de connexion retourné non valide (null)</value> + <value xml:lang="it">UserLogin restituito non valido (null)</value> + <value xml:lang="th">à¸à¸·à¹à¸à¸à¸¹à¹à¹à¸à¹à¸²à¹à¸à¹à¸£à¸°à¸à¸à¹à¸¡à¹à¸à¸¹à¸à¸à¹à¸à¸ (à¸à¹à¸²à¸§à¹à¸²à¸)</value> + <value xml:lang="zh">è¿åçç¨æ·ç»å½æ æ(null)</value> + </property> + <property key="XuiUsernameDoesNotMatchLoggedUser"> + <value xml:lang="en">User name does not match already logged in user!</value> + <value xml:lang="fr">Cet identifiant ne correspond pas à celui en cours !</value> + <value xml:lang="it">Nome utente non confrontato per l'utente autenticato!</value> + <value xml:lang="th">à¸à¸·à¹à¸à¸à¸¹à¹à¹à¸à¹à¸²à¹à¸à¹à¸£à¸°à¸à¸à¹à¸¡à¹à¸à¸£à¸à¸à¸±à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸µà¹à¸à¸±à¸à¸à¸¶à¸à¹à¸§à¹à¸à¸£à¸¸à¸à¸²à¸à¸£à¸§à¸à¸ªà¸à¸</value> + <value xml:lang="zh">ç¨æ·åä¸å·²ç»ç»å½çç¨æ·ä¸ä¸è´ï¼</value> + </property> +</resource> Propchange: ofbiz/trunk/specialpurpose/pos/config/XuiUiLabels.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/pos/config/XuiUiLabels.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/pos/config/XuiUiLabels.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/specialpurpose/pos/config/xpos.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/config/xpos.properties?rev=1328727&r1=1328726&r2=1328727&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/config/xpos.properties (original) +++ ofbiz/trunk/specialpurpose/pos/config/xpos.properties Sat Apr 21 19:19:09 2012 @@ -1,35 +1,34 @@ ############################################################################### -# 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. +# 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. ############################################################################### # -# By default the screen is 1024x768 wide. If you want to use another screen size, -# you must create a new directory under specialpurpose/pos/screens, like the 800x600. -# You must also set the 3 related parameters (StartClass, ClientWidth, ClientHeight) accordingly. +# Dynamically modified by OFBiz Framework (org.ofbiz.base.util : UtilProperties.setPropertyValue) +# The comments have been removed, you may still find them on the OFBiz repository... # - -StartPackage=org.ofbiz.pos -StartClass=default/pospanel -LogLevel=0 -StyleFile=posstyles.xml +#Sat Apr 21 21:10:40 CEST 2012 CenterWin=true ClientHeight=768 +Language=XuiLabels_fr ClientWidth=1024 -Language=XuiLabels +StartClass=default/pospanel Title=OFBiz POS +StyleFile=posstyles.xml UseWindow=false UseFrames=false +LogLevel=0 +StartPackage=org.ofbiz.pos Added: ofbiz/trunk/specialpurpose/pos/config/xui.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/config/xui.properties?rev=1328727&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/pos/config/xui.properties (added) +++ ofbiz/trunk/specialpurpose/pos/config/xui.properties Sat Apr 21 19:19:09 2012 @@ -0,0 +1,24 @@ +##################################################################### +# 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. +##################################################################### + +# If isSameLogin equals "true", a logged off user (blocked, time out, ...) can only log in with the same login/pwd couple. isSameLogin is false by default (false used for that) +isSameLogin=false +# to force a language despite the default locale. Useful to test with another language for instance... +# However to force the PosUiLabels.xml side you still need to use something like "-Duser.language=en" on the command line +#languageSuffix=en Propchange: ofbiz/trunk/specialpurpose/pos/config/xui.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/pos/config/xui.properties ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/pos/config/xui.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/specialpurpose/pos/lib/XuiOptional-v3.2rc2b.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/lib/XuiOptional-v3.2rc2b.jar?rev=1328727&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/specialpurpose/pos/lib/XuiOptional-v3.2rc2b.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: ofbiz/trunk/specialpurpose/pos/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/ofbiz-component.xml?rev=1328727&r1=1328726&r2=1328727&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/ofbiz-component.xml (original) +++ ofbiz/trunk/specialpurpose/pos/ofbiz-component.xml Sat Apr 21 19:19:09 2012 @@ -28,7 +28,7 @@ under the License. <classpath type="jar" location="lib/*"/> <classpath type="jar" location="build/lib/*"/> <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> - + <entity-resource type="data" reader-name="seed" loader="main" location="data/PosSecurityData.xml"/> <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"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/build.xml?rev=1328727&r1=1328726&r2=1328727&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/build.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/build.xml Sat Apr 21 19:19:09 2012 @@ -40,8 +40,6 @@ under the License. <fileset dir="../../framework/service/lib" includes="*.jar"/> <fileset dir="../../framework/service/build/lib" includes="*.jar"/> <fileset dir="../../framework/entityext/build/lib" includes="*.jar"/> - <fileset dir="../../framework/guiapp/lib" includes="*.jar"/> - <fileset dir="../../framework/guiapp/build/lib" includes="*.jar"/> <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/> <fileset dir="../../applications/party/build/lib" includes="*.jar"/> <fileset dir="../../applications/product/build/lib" includes="*.jar"/> |
Free forum by Nabble | Edit this page |