svn commit: r664048 - in /ofbiz/trunk/framework: entity/fieldtype/ shark/ shark/config/ shark/entitydef/ shark/src/org/enhydra/shark/ shark/src/org/ofbiz/shark/cont
Locked
svn commit: r664048 - in /ofbiz/trunk/framework: entity/fieldtype/ shark/ shark/config/ shark/entitydef/ shark/src/org/enhydra/shark/ shark/src/org/ofbiz/shark/cont
 
|
Author: jleroux
Date: Fri Jun 6 10:32:55 2008 New Revision: 664048 URL: http://svn.apache.org/viewvc?rev=664048&view=rev Log: Last patch (forgotten for more than one year) from Sergey Shutov "Integration Shark 1.1_2 into OfBiz" (https://issues.apache.org/jira/browse/OFBIZ-552) - OFBIZ-552 Added: ofbiz/trunk/framework/shark/config/SharkUiLabels.properties (with props) ofbiz/trunk/framework/shark/config/SharkUiLabels_it.properties (with props) Modified: ofbiz/trunk/framework/entity/fieldtype/fieldtypeadvantage.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypeaxion.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypecloudscape.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypedaffodil.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypederby.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypefirebird.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypehsql.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypemssql.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypemysql.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypeoracle.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypepostgres.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypesapdb.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypesybase.xml ofbiz/trunk/framework/shark/build.xml ofbiz/trunk/framework/shark/entitydef/entitymodel.xml ofbiz/trunk/framework/shark/src/org/enhydra/shark/ThreadedToolAgentManager.java ofbiz/trunk/framework/shark/src/org/ofbiz/shark/container/SharkContainer.java ofbiz/trunk/framework/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java ofbiz/trunk/framework/shark/webapp/shark/WEB-INF/controller.xml ofbiz/trunk/framework/shark/widget/TaskListScreens.xml Modified: ofbiz/trunk/framework/entity/fieldtype/fieldtypeadvantage.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/fieldtype/fieldtypeadvantage.xml?rev=664048&r1=664047&r2=664048&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/fieldtype/fieldtypeadvantage.xml (original) +++ ofbiz/trunk/framework/entity/fieldtype/fieldtypeadvantage.xml Fri Jun 6 10:32:55 2008 @@ -30,6 +30,7 @@ <field-type-def type="date-time" sql-type="TimeStamp" java-type="java.sql.Timestamp"></field-type-def> <field-type-def type="date" sql-type="Date" java-type="java.sql.Date"></field-type-def> <field-type-def type="time" sql-type="Time" java-type="java.sql.Time"></field-type-def> + <field-type-def type="long" sql-type="Integer" java-type="java.lang.Long"><validate method="isSignedLong" /></field-type-def> <field-type-def type="currency-amount" sql-type="Money" java-type="Double"><validate method="isSignedDouble" /></field-type-def> <field-type-def type="currency-precise" sql-type="Double" java-type="Double"><validate method="isSignedDouble" /></field-type-def> Modified: ofbiz/trunk/framework/entity/fieldtype/fieldtypeaxion.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/fieldtype/fieldtypeaxion.xml?rev=664048&r1=664047&r2=664048&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/fieldtype/fieldtypeaxion.xml (original) +++ ofbiz/trunk/framework/entity/fieldtype/fieldtypeaxion.xml Fri Jun 6 10:32:55 2008 @@ -27,6 +27,7 @@ <field-type-def type="date-time" sql-type="TIMESTAMP" java-type="java.sql.Timestamp"></field-type-def> <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"></field-type-def> <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"></field-type-def> + <field-type-def type="long" sql-type="NUMBER(19,0)" java-type="java.lang.Long"><validate method="isSignedLong" /></field-type-def> <field-type-def type="currency-amount" sql-type="NUMBER(18,2)" java-type="Double"><validate method="isSignedDouble" /></field-type-def> <field-type-def type="currency-precise" sql-type="NUMBER(18,3)" java-type="Double"><validate method="isSignedDouble" /></field-type-def> @@ -60,3 +61,4 @@ </fieldtypemodel> + Modified: ofbiz/trunk/framework/entity/fieldtype/fieldtypecloudscape.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/fieldtype/fieldtypecloudscape.xml?rev=664048&r1=664047&r2=664048&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/fieldtype/fieldtypecloudscape.xml (original) +++ ofbiz/trunk/framework/entity/fieldtype/fieldtypecloudscape.xml Fri Jun 6 10:32:55 2008 @@ -27,6 +27,7 @@ <field-type-def type="date-time" sql-type="DATE" java-type="java.sql.Timestamp"></field-type-def> <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"></field-type-def> <field-type-def type="time" sql-type="DATE" java-type="java.sql.Time"></field-type-def> + <field-type-def type="long" sql-type="NUMERIC(19,0)" java-type="java.lang.Long"><validate method="isSignedLong" /></field-type-def> <field-type-def type="currency-amount" sql-type="NUMERIC(18,2)" java-type="Double"><validate method="isSignedDouble" /></field-type-def> <field-type-def type="currency-precise" sql-type="NUMERIC(18,3)" java-type="Double"><validate method="isSignedDouble" /></field-type-def> Modified: ofbiz/trunk/framework/entity/fieldtype/fieldtypedaffodil.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/fieldtype/fieldtypedaffodil.xml?rev=664048&r1=664047&r2=664048&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/fieldtype/fieldtypedaffodil.xml (original) +++ ofbiz/trunk/framework/entity/fieldtype/fieldtypedaffodil.xml Fri Jun 6 10:32:55 2008 @@ -27,6 +27,7 @@ <field-type-def type="date-time" sql-type="TIMESTAMP" java-type="java.sql.Timestamp"></field-type-def> <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"></field-type-def> <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"></field-type-def> + <field-type-def type="long" sql-type="NUMBER(19,0)" java-type="java.lang.Long"><validate method="isSignedLong" /></field-type-def> <field-type-def type="currency-amount" sql-type="NUMBER(18,2)" java-type="Double"><validate method="isSignedDouble" /></field-type-def> <field-type-def type="currency-precise" sql-type="NUMBER(18,3)" java-type="Double"><validate method="isSignedDouble" /></field-type-def> Modified: ofbiz/trunk/framework/entity/fieldtype/fieldtypederby.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/fieldtype/fieldtypederby.xml?rev=664048&r1=664047&r2=664048&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/fieldtype/fieldtypederby.xml (original) +++ ofbiz/trunk/framework/entity/fieldtype/fieldtypederby.xml Fri Jun 6 10:32:55 2008 @@ -27,8 +27,8 @@ <field-type-def type="date-time" sql-type="TIMESTAMP" java-type="java.sql.Timestamp"></field-type-def> <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"></field-type-def> <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"></field-type-def> - - <field-type-def type="long" sql-type="BIGINT" java-type="java.lang.Long"></field-type-def> + <field-type-def type="long" sql-type="NUMERIC(19,0)" java-type="java.lang.Long"><validate method="isSignedLong" /></field-type-def> + <!-- <field-type-def type="long" sql-type="BIGINT" java-type="java.lang.Long"></field-type-def> --> <field-type-def type="currency-amount" sql-type="NUMERIC(18,2)" java-type="Double"><validate method="isSignedDouble" /></field-type-def> <field-type-def type="currency-precise" sql-type="NUMERIC(18,3)" java-type="Double"><validate method="isSignedDouble" /></field-type-def> Modified: ofbiz/trunk/framework/entity/fieldtype/fieldtypefirebird.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/fieldtype/fieldtypefirebird.xml?rev=664048&r1=664047&r2=664048&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/fieldtype/fieldtypefirebird.xml (original) +++ ofbiz/trunk/framework/entity/fieldtype/fieldtypefirebird.xml Fri Jun 6 10:32:55 2008 @@ -28,6 +28,7 @@ <field-type-def type="date-time" sql-type="TIMESTAMP" java-type="java.sql.Timestamp"></field-type-def> <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"></field-type-def> <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"></field-type-def> + <field-type-def type="long" sql-type="NUMERIC(19,0)" java-type="java.lang.Long"><validate method="isSignedLong" /></field-type-def> <field-type-def type="currency-amount" sql-type="NUMERIC(18,2)" java-type="Double"><validate method="isSignedDouble" /></field-type-def> <field-type-def type="currency-precise" sql-type="NUMERIC(18,3)" java-type="Double"><validate method="isSignedDouble" /></field-type-def> @@ -61,3 +62,4 @@ </fieldtypemodel> + Modified: ofbiz/trunk/framework/entity/fieldtype/fieldtypehsql.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/fieldtype/fieldtypehsql.xml?rev=664048&r1=664047&r2=664048&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/fieldtype/fieldtypehsql.xml (original) +++ ofbiz/trunk/framework/entity/fieldtype/fieldtypehsql.xml Fri Jun 6 10:32:55 2008 @@ -27,6 +27,7 @@ <field-type-def type="date-time" sql-type="TIMESTAMP" java-type="java.sql.Timestamp"></field-type-def> <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"></field-type-def> <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"></field-type-def> + <field-type-def type="long" sql-type="BIGINT" java-type="java.lang.Long"><validate method="isSignedLong" /></field-type-def> <field-type-def type="currency-amount" sql-type="DOUBLE" java-type="Double"><validate method="isSignedDouble" /></field-type-def> <field-type-def type="currency-precise" sql-type="DOUBLE" java-type="Double"><validate method="isSignedDouble" /></field-type-def> @@ -42,7 +43,7 @@ <field-type-def type="short-varchar" sql-type="VARCHAR" java-type="String"></field-type-def> <field-type-def type="long-varchar" sql-type="VARCHAR" java-type="String"></field-type-def> <field-type-def type="very-long" sql-type="VARCHAR" java-type="String"></field-type-def> - + <field-type-def type="comment" sql-type="VARCHAR" java-type="String"></field-type-def> <field-type-def type="description" sql-type="VARCHAR" java-type="String"></field-type-def> <field-type-def type="name" sql-type="VARCHAR" java-type="String"></field-type-def> Modified: ofbiz/trunk/framework/entity/fieldtype/fieldtypemssql.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/fieldtype/fieldtypemssql.xml?rev=664048&r1=664047&r2=664048&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/fieldtype/fieldtypemssql.xml (original) +++ ofbiz/trunk/framework/entity/fieldtype/fieldtypemssql.xml Fri Jun 6 10:32:55 2008 @@ -27,6 +27,7 @@ <field-type-def type="date-time" sql-type="DATETIME" java-type="java.sql.Timestamp"></field-type-def> <field-type-def type="date" sql-type="DATETIME" java-type="java.sql.Date"></field-type-def> <field-type-def type="time" sql-type="DATETIME" java-type="java.sql.Time"></field-type-def> + <field-type-def type="long" sql-type="INT" java-type="java.lang.Long"><validate method="isSignedLong" /></field-type-def> <field-type-def type="currency-amount" sql-type="DECIMAL(18,2)" java-type="Double"><validate method="isSignedDouble" /></field-type-def> <field-type-def type="currency-precise" sql-type="DECIMAL(18,3)" java-type="Double"><validate method="isSignedDouble" /></field-type-def> Modified: ofbiz/trunk/framework/entity/fieldtype/fieldtypemysql.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/fieldtype/fieldtypemysql.xml?rev=664048&r1=664047&r2=664048&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/fieldtype/fieldtypemysql.xml (original) +++ ofbiz/trunk/framework/entity/fieldtype/fieldtypemysql.xml Fri Jun 6 10:32:55 2008 @@ -27,6 +27,7 @@ <field-type-def type="date-time" sql-type="DATETIME" java-type="java.sql.Timestamp"></field-type-def> <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"></field-type-def> <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"></field-type-def> + <field-type-def type="long" sql-type="DECIMAL(19,0)" java-type="java.lang.Long"><validate method="isSignedLong" /></field-type-def> <field-type-def type="currency-amount" sql-type="DECIMAL(18,2)" java-type="Double"><validate method="isSignedDouble" /></field-type-def> <field-type-def type="currency-precise" sql-type="DECIMAL(18,3)" java-type="Double"><validate method="isSignedDouble" /></field-type-def> Modified: ofbiz/trunk/framework/entity/fieldtype/fieldtypeoracle.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/fieldtype/fieldtypeoracle.xml?rev=664048&r1=664047&r2=664048&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/fieldtype/fieldtypeoracle.xml (original) +++ ofbiz/trunk/framework/entity/fieldtype/fieldtypeoracle.xml Fri Jun 6 10:32:55 2008 @@ -27,6 +27,7 @@ <field-type-def type="date-time" sql-type="TIMESTAMP" sql-type-alias="TIMESTAMP(6)" java-type="java.sql.Timestamp"></field-type-def> <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"></field-type-def> <field-type-def type="time" sql-type="DATE" java-type="java.sql.Time"></field-type-def> + <field-type-def type="long" sql-type="NUMBER(19,0)" java-type="java.lang.Long"><validate method="isSignedLong" /></field-type-def> <field-type-def type="currency-amount" sql-type="NUMBER(18,2)" java-type="Double"><validate method="isSignedDouble" /></field-type-def> <field-type-def type="currency-precise" sql-type="NUMBER(18,3)" java-type="Double"><validate method="isSignedDouble" /></field-type-def> Modified: ofbiz/trunk/framework/entity/fieldtype/fieldtypepostgres.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/fieldtype/fieldtypepostgres.xml?rev=664048&r1=664047&r2=664048&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/fieldtype/fieldtypepostgres.xml (original) +++ ofbiz/trunk/framework/entity/fieldtype/fieldtypepostgres.xml Fri Jun 6 10:32:55 2008 @@ -27,6 +27,7 @@ <field-type-def type="date-time" sql-type="TIMESTAMPTZ" java-type="java.sql.Timestamp"></field-type-def> <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"></field-type-def> <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"></field-type-def> + <field-type-def type="long" sql-type="NUMERIC(19,0)" java-type="java.lang.Long"><validate method="isSignedLong" /></field-type-def> <field-type-def type="currency-amount" sql-type="NUMERIC(18,2)" java-type="Double"><validate method="isSignedDouble" /></field-type-def> <field-type-def type="currency-precise" sql-type="NUMERIC(18,3)" java-type="Double"><validate method="isSignedDouble" /></field-type-def> Modified: ofbiz/trunk/framework/entity/fieldtype/fieldtypesapdb.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/fieldtype/fieldtypesapdb.xml?rev=664048&r1=664047&r2=664048&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/fieldtype/fieldtypesapdb.xml (original) +++ ofbiz/trunk/framework/entity/fieldtype/fieldtypesapdb.xml Fri Jun 6 10:32:55 2008 @@ -27,6 +27,7 @@ <field-type-def type="date-time" sql-type="TIMESTAMP" java-type="java.sql.Timestamp"></field-type-def> <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"></field-type-def> <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"></field-type-def> + <field-type-def type="long" sql-type="FIXED(19,0)" java-type="java.lang.Long"><validate method="isSignedLong" /></field-type-def> <field-type-def type="currency-amount" sql-type="FIXED(18,2)" java-type="Double"><validate method="isSignedDouble" /></field-type-def> <field-type-def type="currency-precise" sql-type="FIXED(18,3)" java-type="Double"><validate method="isSignedDouble" /></field-type-def> Modified: ofbiz/trunk/framework/entity/fieldtype/fieldtypesybase.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/fieldtype/fieldtypesybase.xml?rev=664048&r1=664047&r2=664048&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/fieldtype/fieldtypesybase.xml (original) +++ ofbiz/trunk/framework/entity/fieldtype/fieldtypesybase.xml Fri Jun 6 10:32:55 2008 @@ -27,6 +27,7 @@ <field-type-def type="date-time" sql-type="DATETIME" java-type="Timestamp"></field-type-def> <field-type-def type="date" sql-type="DATETIME" java-type="java.sql.Date"></field-type-def> <field-type-def type="time" sql-type="DATETIME" java-type="java.sql.Time"></field-type-def> + <field-type-def type="long" sql-type="NUMERIC(19,0)" java-type="java.lang.Long"><validate method="isSignedLong" /></field-type-def> <field-type-def type="currency-amount" sql-type="NUMERIC(18,2)" java-type="Double"><validate method="isSignedDouble" /></field-type-def> <field-type-def type="currency-precise" sql-type="NUMERIC(18,3)" java-type="Double"><validate method="isSignedDouble" /></field-type-def> Modified: ofbiz/trunk/framework/shark/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/build.xml?rev=664048&r1=664047&r2=664048&view=diff ============================================================================== --- ofbiz/trunk/framework/shark/build.xml (original) +++ ofbiz/trunk/framework/shark/build.xml Fri Jun 6 10:32:55 2008 @@ -83,7 +83,7 @@ <!-- ================================================================== --> <target name="classes" depends="prepare,classpath"> - <javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes"> + <javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes"> <classpath> <path refid="local.class.path"/> </classpath> Added: ofbiz/trunk/framework/shark/config/SharkUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/config/SharkUiLabels.properties?rev=664048&view=auto ============================================================================== --- ofbiz/trunk/framework/shark/config/SharkUiLabels.properties (added) +++ ofbiz/trunk/framework/shark/config/SharkUiLabels.properties Fri Jun 6 10:32:55 2008 @@ -0,0 +1,27 @@ +############################################################################### +# 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. +############################################################################### +# +# OFBiz UiLabel Properties +# +#### + +SharkCompanyName=OFBiz\: Shark +SharkCompanySubtitle=Part of the Open For Business Family of Open Source Software +FrameworkShark=Framework Shark +SharkMainPage=Shark Manager Main Page Propchange: ofbiz/trunk/framework/shark/config/SharkUiLabels.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/shark/config/SharkUiLabels.properties ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/framework/shark/config/SharkUiLabels.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/framework/shark/config/SharkUiLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/config/SharkUiLabels_it.properties?rev=664048&view=auto ============================================================================== --- ofbiz/trunk/framework/shark/config/SharkUiLabels_it.properties (added) +++ ofbiz/trunk/framework/shark/config/SharkUiLabels_it.properties Fri Jun 6 10:32:55 2008 @@ -0,0 +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. +############################################################################### +SharkCompanyName=OFBiz\: Flussi di Lavoro +SharkCompanySubtitle=Part of the Open For Business Family of Open Source Software +FrameworkShark=Applicazione Flussi di Lavoro +SharkMainPage=Pagina Principale Propchange: ofbiz/trunk/framework/shark/config/SharkUiLabels_it.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/shark/config/SharkUiLabels_it.properties ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/framework/shark/config/SharkUiLabels_it.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/framework/shark/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/entitydef/entitymodel.xml?rev=664048&r1=664047&r2=664048&view=diff ============================================================================== --- ofbiz/trunk/framework/shark/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/framework/shark/entitydef/entitymodel.xml Fri Jun 6 10:32:55 2008 @@ -150,7 +150,7 @@ <field name="activityName" type="long-varchar"></field> <field name="description" type="long-varchar"></field> <field name="currentState" type="long-varchar"></field> - <field name="priority" type="numeric"></field> + <field name="priority" type="long"></field> <field name="accepted" type="indicator"></field> <field name="timeLimit" type="long"></field> <field name="activatedTime" type="long"></field> @@ -173,7 +173,7 @@ <field name="definitionId" type="long-varchar"></field> <field name="valueField" type="name"></field> <field name="strValue" type="long-varchar"></field> - <field name="numValue" type="numeric"></field> + <field name="numValue" type="long"></field> <field name="dblValue" type="floating-point"></field> <field name="objValue" type="blob"></field> <field name="isModified" type="indicator"></field> @@ -243,7 +243,7 @@ <field name="processName" type="long-varchar"></field> <field name="description" type="long-varchar"></field> <field name="currentState" type="long-varchar"></field> - <field name="priority" type="numeric"></field> + <field name="priority" type="long"></field> <field name="externalReq" type="blob"></field> <field name="createdTime" type="long"></field> <field name="startedTime" type="long"></field> @@ -262,7 +262,7 @@ <field name="packageVer" type="long-varchar"></field> <field name="definitionId" type="long-varchar"></field> <field name="created" type="long"></field> - <field name="currentState" type="numeric"></field> + <field name="currentState" type="long"></field> <prim-key field="mgrName"/> </entity> <entity entity-name="WfProcessVariable" @@ -273,7 +273,7 @@ <field name="definitionId" type="long-varchar"></field> <field name="valueField" type="name"></field> <field name="strValue" type="long-varchar"></field> - <field name="numValue" type="numeric"></field> + <field name="numValue" type="long"></field> <field name="dblValue" type="floating-point"></field> <field name="objValue" type="blob"></field> <prim-key field="processVariableId"/> @@ -299,7 +299,7 @@ <field name="userName" type="long-varchar"></field> <field name="passwd" type="long-varchar"></field> <field name="applicationName" type="long-varchar"></field> - <field name="applicationMode" type="numeric"></field> + <field name="applicationMode" type="long"></field> <prim-key field="packageId"/> <prim-key field="processDefId"/> <prim-key field="applicationDefId"/> Modified: ofbiz/trunk/framework/shark/src/org/enhydra/shark/ThreadedToolAgentManager.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/enhydra/shark/ThreadedToolAgentManager.java?rev=664048&r1=664047&r2=664048&view=diff ============================================================================== --- ofbiz/trunk/framework/shark/src/org/enhydra/shark/ThreadedToolAgentManager.java (original) +++ ofbiz/trunk/framework/shark/src/org/enhydra/shark/ThreadedToolAgentManager.java Fri Jun 6 10:32:55 2008 @@ -25,8 +25,7 @@ import java.util.Map; import java.util.Properties; -//import org.enhydra.jawe.xml.elements.Implementation; -//import org.enhydra.jawe.xml.elements.Tools; + import org.enhydra.shark.SharkEngineManager; import org.enhydra.shark.api.ApplicationMappingTransaction; import org.enhydra.shark.api.RootException; @@ -261,3 +260,4 @@ + Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/container/SharkContainer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/container/SharkContainer.java?rev=664048&r1=664047&r2=664048&view=diff ============================================================================== --- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/container/SharkContainer.java (original) +++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/container/SharkContainer.java Fri Jun 6 10:32:55 2008 @@ -18,6 +18,7 @@ *******************************************************************************/ package org.ofbiz.shark.container; +import java.io.IOException; import java.util.Properties; import java.util.StringTokenizer; @@ -59,6 +60,7 @@ private static GenericValue adminUser = null; private static String adminPass = null; private static Shark shark = null; + private static Process p = null; protected String configFile = null; private SharkCORBAServer corbaServer = null; @@ -130,7 +132,32 @@ // set the Shark configuration Properties props = UtilProperties.getProperties("shark.properties"); Shark.configure(props); - + + String java_home = System.getenv("JAVA_HOME"); + if((java_home == null) && (java_home.length() > 0)) + { + Debug.logError("OUT :Java home variable is undefined", module); + } else + if (iiopHost != null && iiopHost.value != null && iiopHost.value.length() > 0) { + if (iiopPort != null && iiopPort.value != null && iiopPort.value.length() > 0) { + try { + p = Runtime.getRuntime().exec( java_home + "\\" + "bin\\tnameserv" + + " -ORBInitialPort " + + iiopPort.value); + Thread.sleep(5000); + } catch (IOException e) { + Debug.logError("OUT : Could not start SERVER", module); + e.printStackTrace(); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + else + Debug.logError("OUT : Error in iiop port property", module); + } + else + Debug.logError("OUT : Error in iiop host property", module); + SharkContainer.shark = Shark.getInstance(); Debug.logInfo("Started Shark workflow service", module); @@ -184,6 +211,9 @@ if (dispatcher != null) { dispatcher.deregister(); } + if(p != null){ + p.destroy(); + } // shutdown the corba server if (corbaServer != null) { Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java?rev=664048&r1=664047&r2=664048&view=diff ============================================================================== --- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java (original) +++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java Fri Jun 6 10:32:55 2008 @@ -189,7 +189,7 @@ public List getExistingXPDLIds(RepositoryTransaction t) throws RepositoryException { Debug.log("Get Existing XPDL IDs", module); - List lookupList = this.getXpdlValues(null, null, false); + List lookupList = this.getXpdlValues(null, null, true); List idList = new ArrayList(); if (UtilValidate.isNotEmpty(lookupList)) { Iterator i = lookupList.iterator(); Modified: ofbiz/trunk/framework/shark/webapp/shark/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/webapp/shark/WEB-INF/controller.xml?rev=664048&r1=664047&r2=664048&view=diff ============================================================================== --- ofbiz/trunk/framework/shark/webapp/shark/WEB-INF/controller.xml (original) +++ ofbiz/trunk/framework/shark/webapp/shark/WEB-INF/controller.xml Fri Jun 6 10:32:55 2008 @@ -37,13 +37,13 @@ <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/> <preprocessor> - <!-- Events to run on every request before security (chains exempt) --> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="check509CertLogin"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkExternalLoginKey"/> + <!-- Events to run on every request before security (chains exempt) --> + <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="check509CertLogin"/> + <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkExternalLoginKey"/> </preprocessor> <postprocessor> - <!-- Events to run on every request after all other processing (chains exempt) --> - <!-- <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> --> + <!-- Events to run on every request after all other processing (chains exempt) --> + <!-- <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> --> </postprocessor> <!-- Security Mappings --> @@ -108,32 +108,32 @@ <request-map uri="main"> <security https="true" auth="true"/> - <response name="success" type="view" value="main"/> + <response name="success" type="view" value="main"/> </request-map> <request-map uri="repository"> <security https="true" auth="true"/> - <response name="success" type="view" value="repository"/> + <response name="success" type="view" value="repository"/> </request-map> <request-map uri="processes"> <security https="true" auth="true"/> - <response name="success" type="view" value="processList"/> + <response name="success" type="view" value="processList"/> </request-map> <request-map uri="processDetailList"> <security https="true" auth="true"/> - <response name="success" type="view" value="processDetailList"/> + <response name="success" type="view" value="processDetailList"/> </request-map> <request-map uri="processHistory"> <security https="true" auth="true"/> - <response name="success" type="view" value="processHistory"/> + <response name="success" type="view" value="processHistory"/> </request-map> <request-map uri="processSteps"> <security https="true" auth="true"/> - <response name="success" type="view" value="processSteps"/> + <response name="success" type="view" value="processSteps"/> </request-map> <request-map uri="worklist"> <security https="true" auth="true"/> - <response name="success" type="view" value="worklist"/> + <response name="success" type="view" value="worklist"/> </request-map> <!-- end of request mappings --> Modified: ofbiz/trunk/framework/shark/widget/TaskListScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/widget/TaskListScreens.xml?rev=664048&r1=664047&r2=664048&view=diff ============================================================================== --- ofbiz/trunk/framework/shark/widget/TaskListScreens.xml (original) +++ ofbiz/trunk/framework/shark/widget/TaskListScreens.xml Fri Jun 6 10:32:55 2008 @@ -37,4 +37,4 @@ </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |