OFBiz › OFBiz - Commits

svn commit: r664052 - in /ofbiz/branches/release4.0/framework: entity/fieldtype/ shark/ shark/entitydef/ shark/src/org/enhydra/shark/ shark/src/org/ofbiz/shark/container/ shark/src/org/ofbiz/shark/repository/ shark/webapp/shark/WEB-INF/ shark/widget/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jleroux@apache.org

svn commit: r664052 - in /ofbiz/branches/release4.0/framework: entity/fieldtype/ shark/ shark/entitydef/ shark/src/org/enhydra/shark/ shark/src/org/ofbiz/shark/container/ shark/src/org/ofbiz/shark/repository/ shark/webapp/shark/WEB-INF/ shark/widget/

Author: jleroux
Date: Fri Jun 6 10:40:05 2008
New Revision: 664052

URL: http://svn.apache.org/viewvc?rev=664052&view=rev
Log:
Applied fix from trunk for revision: 664048. I had to modify the build.xml file by hand since release4.0 is still using jdk 1.4
This is considered a bug fix (even if some stuff are not, but very specific to Shark component anyway) because it solves Shark fieltypes issues. See end of https://issues.apache.org/jira/browse/OFBIZ-552 for more - OFBIZ-552

Modified:
ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypeadvantage.xml
ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypeaxion.xml
ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypecloudscape.xml
ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypedaffodil.xml
ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypederby.xml
ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypefirebird.xml
ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypehsql.xml
ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypemssql.xml
ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypemysql.xml
ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypeoracle.xml
ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypepostgres.xml
ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypesapdb.xml
ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypesybase.xml
ofbiz/branches/release4.0/framework/shark/build.xml
ofbiz/branches/release4.0/framework/shark/entitydef/entitymodel.xml
ofbiz/branches/release4.0/framework/shark/src/org/enhydra/shark/ThreadedToolAgentManager.java
ofbiz/branches/release4.0/framework/shark/src/org/ofbiz/shark/container/SharkContainer.java
ofbiz/branches/release4.0/framework/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java
ofbiz/branches/release4.0/framework/shark/webapp/shark/WEB-INF/controller.xml
ofbiz/branches/release4.0/framework/shark/widget/TaskListScreens.xml

Modified: ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypeadvantage.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypeadvantage.xml?rev=664052&r1=664051&r2=664052&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypeadvantage.xml (original)
+++ ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypeadvantage.xml Fri Jun 6 10:40:05 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="Integer" 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/branches/release4.0/framework/entity/fieldtype/fieldtypefirebird.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypefirebird.xml?rev=664052&r1=664051&r2=664052&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypefirebird.xml (original)
+++ ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypefirebird.xml Fri Jun 6 10:40:05 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="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>
@@ -60,3 +61,4 @@

</fieldtypemodel>

+

Modified: ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypehsql.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypehsql.xml?rev=664052&r1=664051&r2=664052&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypehsql.xml (original)
+++ ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypehsql.xml Fri Jun 6 10:40:05 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/branches/release4.0/framework/entity/fieldtype/fieldtypemssql.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypemssql.xml?rev=664052&r1=664051&r2=664052&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypemssql.xml (original)
+++ ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypemssql.xml Fri Jun 6 10:40:05 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/branches/release4.0/framework/entity/fieldtype/fieldtypemysql.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypemysql.xml?rev=664052&r1=664051&r2=664052&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypemysql.xml (original)
+++ ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypemysql.xml Fri Jun 6 10:40:05 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/branches/release4.0/framework/entity/fieldtype/fieldtypeoracle.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypeoracle.xml?rev=664052&r1=664051&r2=664052&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypeoracle.xml (original)
+++ ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypeoracle.xml Fri Jun 6 10:40:05 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/branches/release4.0/framework/entity/fieldtype/fieldtypepostgres.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypepostgres.xml?rev=664052&r1=664051&r2=664052&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypepostgres.xml (original)
+++ ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypepostgres.xml Fri Jun 6 10:40:05 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/branches/release4.0/framework/entity/fieldtype/fieldtypesapdb.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypesapdb.xml?rev=664052&r1=664051&r2=664052&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypesapdb.xml (original)
+++ ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypesapdb.xml Fri Jun 6 10:40:05 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/branches/release4.0/framework/entity/fieldtype/fieldtypesybase.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypesybase.xml?rev=664052&r1=664051&r2=664052&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypesybase.xml (original)
+++ ofbiz/branches/release4.0/framework/entity/fieldtype/fieldtypesybase.xml Fri Jun 6 10:40:05 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/branches/release4.0/framework/shark/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/shark/build.xml?rev=664052&r1=664051&r2=664052&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/shark/build.xml (original)
+++ ofbiz/branches/release4.0/framework/shark/build.xml Fri Jun 6 10:40:05 2008
@@ -83,7 +83,7 @@


<target name="classes" depends="prepare,classpath">
- <javac debug="on" source="1.4" deprecation="on" destdir="${build.dir}/classes">
+ <javac debug="on" source="1.4" deprecation="on" destdir="${build.dir}/classes">
<classpath>
<path refid="local.class.path"/>
</classpath>

Modified: ofbiz/branches/release4.0/framework/shark/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/shark/entitydef/entitymodel.xml?rev=664052&r1=664051&r2=664052&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/shark/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/release4.0/framework/shark/entitydef/entitymodel.xml Fri Jun 6 10:40:05 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/branches/release4.0/framework/shark/src/org/enhydra/shark/ThreadedToolAgentManager.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/shark/src/org/enhydra/shark/ThreadedToolAgentManager.java?rev=664052&r1=664051&r2=664052&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/shark/src/org/enhydra/shark/ThreadedToolAgentManager.java (original)
+++ ofbiz/branches/release4.0/framework/shark/src/org/enhydra/shark/ThreadedToolAgentManager.java Fri Jun 6 10:40:05 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/branches/release4.0/framework/shark/src/org/ofbiz/shark/container/SharkContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/shark/src/org/ofbiz/shark/container/SharkContainer.java?rev=664052&r1=664051&r2=664052&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/shark/src/org/ofbiz/shark/container/SharkContainer.java (original)
+++ ofbiz/branches/release4.0/framework/shark/src/org/ofbiz/shark/container/SharkContainer.java Fri Jun 6 10:40:05 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/branches/release4.0/framework/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java?rev=664052&r1=664051&r2=664052&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java (original)
+++ ofbiz/branches/release4.0/framework/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java Fri Jun 6 10:40:05 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/branches/release4.0/framework/shark/webapp/shark/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/shark/webapp/shark/WEB-INF/controller.xml?rev=664052&r1=664051&r2=664052&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/shark/webapp/shark/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release4.0/framework/shark/webapp/shark/WEB-INF/controller.xml Fri Jun 6 10:40:05 2008
@@ -37,13 +37,13 @@
<handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/>

<preprocessor>
- 
- <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="check509CertLogin"/>
- <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkExternalLoginKey"/>
+ 
+ <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="check509CertLogin"/>
+ <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkExternalLoginKey"/>
</preprocessor>
<postprocessor>
- 
- 
+ 
+ 
</postprocessor>


@@ -85,7 +85,7 @@

<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="setSessionLocale">
@@ -96,27 +96,27 @@
</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>


Modified: ofbiz/branches/release4.0/framework/shark/widget/TaskListScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/shark/widget/TaskListScreens.xml?rev=664052&r1=664051&r2=664052&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/shark/widget/TaskListScreens.xml (original)
+++ ofbiz/branches/release4.0/framework/shark/widget/TaskListScreens.xml Fri Jun 6 10:40:05 2008
@@ -37,4 +37,4 @@
</widgets>
</section>
</screen>
-</screens>
\ No newline at end of file
+</screens>