svn commit: r960512 [4/7] - in /ofbiz/branches/jquery: ./ applications/accounting/config
Locked
svn commit: r960512 [4/7] - in /ofbiz/branches/jquery: ./ applications/accounting/config
 
|
Modified: ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypederby.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypederby.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypederby.xml (original) +++ ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypederby.xml Mon Jul 5 10:07:56 2010 @@ -22,40 +22,42 @@ under the License. xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/fieldtypemodel.xsd"> <!-- ===================== field-type-def ==================== --> <!-- General Types --> - <field-type-def type="blob" sql-type="BLOB" java-type="java.sql.Blob"></field-type-def> - - <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="currency-amount" sql-type="NUMERIC(18,2)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="currency-precise" sql-type="NUMERIC(18,3)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="fixed-point" sql-type="NUMERIC(18,6)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="floating-point" sql-type="DOUBLE" java-type="Double"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="numeric" sql-type="NUMERIC(20,0)" java-type="Long"><validate method="isSignedLong"/></field-type-def> - - <field-type-def type="id" sql-type="VARCHAR(20)" java-type="String"></field-type-def> - <field-type-def type="id-long" sql-type="VARCHAR(60)" java-type="String"></field-type-def> - <field-type-def type="id-vlong" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - - <field-type-def type="indicator" sql-type="CHAR(1)" java-type="String"></field-type-def> - <field-type-def type="very-short" sql-type="VARCHAR(10)" java-type="String"></field-type-def> - <field-type-def type="short-varchar" sql-type="VARCHAR(60)" java-type="String"></field-type-def> - <field-type-def type="long-varchar" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="very-long" sql-type="CLOB" java-type="String"></field-type-def> - - <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="description" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="name" sql-type="VARCHAR(100)" java-type="String"></field-type-def> - <field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"></field-type-def> + <field-type-def type="blob" sql-type="BLOB" java-type="java.sql.Blob"/> + <field-type-def type="byte-array" sql-type="BLOB" java-type="byte[]"/> + <field-type-def type="object" sql-type="BLOB" java-type="Object"/> + + <field-type-def type="date-time" sql-type="TIMESTAMP" java-type="java.sql.Timestamp"/> + <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"/> + <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"/> + + <field-type-def type="currency-amount" sql-type="NUMERIC(18,2)" java-type="java.math.BigDecimal"/> + <field-type-def type="currency-precise" sql-type="NUMERIC(18,3)" java-type="java.math.BigDecimal"/> + <field-type-def type="fixed-point" sql-type="NUMERIC(18,6)" java-type="java.math.BigDecimal"/> + <field-type-def type="floating-point" sql-type="DOUBLE" java-type="Double"/> + <field-type-def type="numeric" sql-type="NUMERIC(20,0)" java-type="Long"/> + + <field-type-def type="id" sql-type="VARCHAR(20)" java-type="String"/> + <field-type-def type="id-long" sql-type="VARCHAR(60)" java-type="String"/> + <field-type-def type="id-vlong" sql-type="VARCHAR(255)" java-type="String"/> + + <field-type-def type="indicator" sql-type="CHAR(1)" java-type="String"/> + <field-type-def type="very-short" sql-type="VARCHAR(10)" java-type="String"/> + <field-type-def type="short-varchar" sql-type="VARCHAR(60)" java-type="String"/> + <field-type-def type="long-varchar" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="very-long" sql-type="CLOB" java-type="String"/> + + <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="description" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="name" sql-type="VARCHAR(100)" java-type="String"/> + <field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"/> <!-- Specialized Types --> - <field-type-def type="credit-card-number" sql-type="VARCHAR(255)" java-type="String"><validate method="isAnyCard"/></field-type-def> - <field-type-def type="credit-card-date" sql-type="VARCHAR(20)" java-type="String"><validate method="isDateAfterToday"/></field-type-def> - <field-type-def type="email" sql-type="VARCHAR(255)" java-type="String"><validate method="isEmail"/></field-type-def> - <field-type-def type="url" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="id-ne" sql-type="VARCHAR(20)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-long-ne" sql-type="VARCHAR(60)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-vlong-ne" sql-type="VARCHAR(255)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="tel-number" sql-type="VARCHAR(60)" java-type="String"><validate method="isInternationalPhoneNumber"/></field-type-def> + <field-type-def type="credit-card-number" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="credit-card-date" sql-type="VARCHAR(20)" java-type="String"/> + <field-type-def type="email" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="url" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="id-ne" sql-type="VARCHAR(20)" java-type="String"/> + <field-type-def type="id-long-ne" sql-type="VARCHAR(60)" java-type="String"/> + <field-type-def type="id-vlong-ne" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="tel-number" sql-type="VARCHAR(60)" java-type="String"/> </fieldtypemodel> Modified: ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypefirebird.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypefirebird.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypefirebird.xml (original) +++ ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypefirebird.xml Mon Jul 5 10:07:56 2010 @@ -22,43 +22,44 @@ under the License. xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/fieldtypemodel.xsd"> <!-- ===================== field-type-def ==================== --> <!-- General Types --> - <field-type-def type="blob" sql-type="BLOB" java-type="java.sql.Blob"></field-type-def> - <field-type-def type="blob" sql-type="BLOB SUB_TYPE 2" java-type="java.lang.Object"></field-type-def> - - <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="currency-amount" sql-type="NUMERIC(18,2)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="currency-precise" sql-type="NUMERIC(18,3)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="fixed-point" sql-type="NUMERIC(18,6)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="floating-point" sql-type="FLOAT" java-type="Double"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="numeric" sql-type="NUMERIC(20,0)" java-type="Long"><validate method="isSignedLong"/></field-type-def> - - <field-type-def type="id" sql-type="VARCHAR(20)" java-type="String"></field-type-def> - <field-type-def type="id-long" sql-type="VARCHAR(60)" java-type="String"></field-type-def> - <field-type-def type="id-vlong" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - - <field-type-def type="indicator" sql-type="CHAR(1)" java-type="String"></field-type-def> - <field-type-def type="very-short" sql-type="VARCHAR(10)" java-type="String"></field-type-def> - <field-type-def type="short-varchar" sql-type="VARCHAR(60)" java-type="String"></field-type-def> - <field-type-def type="long-varchar" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="very-long" sql-type="BLOB SUB_TYPE 1" java-type="String"></field-type-def> - - <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="description" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="name" sql-type="VARCHAR(100)" java-type="String"></field-type-def> - <field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"></field-type-def> + <field-type-def type="blob" sql-type="BLOB" java-type="java.sql.Blob"/> + <field-type-def type="byte-array" sql-type="BLOB" java-type="byte[]"/> + <field-type-def type="object" sql-type="BLOB SUB_TYPE 2" java-type="Object"/> + + <field-type-def type="date-time" sql-type="TIMESTAMP" java-type="java.sql.Timestamp"/> + <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"/> + <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"/> + + <field-type-def type="currency-amount" sql-type="NUMERIC(18,2)" java-type="java.math.BigDecimal"/> + <field-type-def type="currency-precise" sql-type="NUMERIC(18,3)" java-type="java.math.BigDecimal"/> + <field-type-def type="fixed-point" sql-type="NUMERIC(18,6)" java-type="java.math.BigDecimal"/> + <field-type-def type="floating-point" sql-type="FLOAT" java-type="Double"/> + <field-type-def type="numeric" sql-type="NUMERIC(20,0)" java-type="Long"/> + + <field-type-def type="id" sql-type="VARCHAR(20)" java-type="String"/> + <field-type-def type="id-long" sql-type="VARCHAR(60)" java-type="String"/> + <field-type-def type="id-vlong" sql-type="VARCHAR(255)" java-type="String"/> + + <field-type-def type="indicator" sql-type="CHAR(1)" java-type="String"/> + <field-type-def type="very-short" sql-type="VARCHAR(10)" java-type="String"/> + <field-type-def type="short-varchar" sql-type="VARCHAR(60)" java-type="String"/> + <field-type-def type="long-varchar" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="very-long" sql-type="BLOB SUB_TYPE 1" java-type="String"/> + + <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="description" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="name" sql-type="VARCHAR(100)" java-type="String"/> + <field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"/> <!-- Specialized Types --> - <field-type-def type="credit-card-number" sql-type="VARCHAR(255)" java-type="String"><validate method="isAnyCard"/></field-type-def> - <field-type-def type="credit-card-date" sql-type="VARCHAR(20)" java-type="String"><validate method="isDateAfterToday"/></field-type-def> - <field-type-def type="email" sql-type="VARCHAR(255)" java-type="String"><validate method="isEmail"/></field-type-def> - <field-type-def type="url" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="id-ne" sql-type="VARCHAR(20)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-long-ne" sql-type="VARCHAR(60)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-vlong-ne" sql-type="VARCHAR(255)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="tel-number" sql-type="VARCHAR(60)" java-type="String"><validate method="isInternationalPhoneNumber"/></field-type-def> + <field-type-def type="credit-card-number" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="credit-card-date" sql-type="VARCHAR(20)" java-type="String"/> + <field-type-def type="email" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="url" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="id-ne" sql-type="VARCHAR(20)" java-type="String"/> + <field-type-def type="id-long-ne" sql-type="VARCHAR(60)" java-type="String"/> + <field-type-def type="id-vlong-ne" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="tel-number" sql-type="VARCHAR(60)" java-type="String"/> </fieldtypemodel> Modified: ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypehsql.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypehsql.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypehsql.xml (original) +++ ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypehsql.xml Mon Jul 5 10:07:56 2010 @@ -22,40 +22,42 @@ under the License. xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/fieldtypemodel.xsd"> <!-- ===================== field-type-def ==================== --> <!-- General Types --> - <field-type-def type="blob" sql-type="OBJECT" sql-type-alias="OTHER" java-type="java.sql.Blob"></field-type-def> - - <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="currency-amount" sql-type="DOUBLE" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="currency-precise" sql-type="DOUBLE" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="fixed-point" sql-type="DOUBLE" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="floating-point" sql-type="DOUBLE" java-type="Double"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="numeric" sql-type="BIGINT" java-type="Long"><validate method="isSignedLong"/></field-type-def> - - <field-type-def type="id" sql-type="VARCHAR(20)" java-type="String"></field-type-def> - <field-type-def type="id-long" sql-type="VARCHAR" java-type="String"></field-type-def> - <field-type-def type="id-vlong" sql-type="VARCHAR" java-type="String"></field-type-def> - - <field-type-def type="indicator" sql-type="CHAR" java-type="String"></field-type-def> - <field-type-def type="very-short" sql-type="VARCHAR" java-type="String"></field-type-def> - <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> - <field-type-def type="value" sql-type="VARCHAR" java-type="String"></field-type-def> + <field-type-def type="blob" sql-type="OBJECT" sql-type-alias="OTHER" java-type="java.sql.Blob"/> + <field-type-def type="byte-array" sql-type="OBJECT" sql-type-alias="OTHER" java-type="byte[]"/> + <field-type-def type="object" sql-type="OBJECT" sql-type-alias="OTHER" java-type="Object"/> + + <field-type-def type="date-time" sql-type="TIMESTAMP" java-type="java.sql.Timestamp"/> + <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"/> + <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"/> + + <field-type-def type="currency-amount" sql-type="DOUBLE" java-type="java.math.BigDecimal"/> + <field-type-def type="currency-precise" sql-type="DOUBLE" java-type="java.math.BigDecimal"/> + <field-type-def type="fixed-point" sql-type="DOUBLE" java-type="java.math.BigDecimal"/> + <field-type-def type="floating-point" sql-type="DOUBLE" java-type="Double"/> + <field-type-def type="numeric" sql-type="BIGINT" java-type="Long"/> + + <field-type-def type="id" sql-type="VARCHAR(20)" java-type="String"/> + <field-type-def type="id-long" sql-type="VARCHAR" java-type="String"/> + <field-type-def type="id-vlong" sql-type="VARCHAR" java-type="String"/> + + <field-type-def type="indicator" sql-type="CHAR" java-type="String"/> + <field-type-def type="very-short" sql-type="VARCHAR" java-type="String"/> + <field-type-def type="short-varchar" sql-type="VARCHAR" java-type="String"/> + <field-type-def type="long-varchar" sql-type="VARCHAR" java-type="String"/> + <field-type-def type="very-long" sql-type="VARCHAR" java-type="String"/> + + <field-type-def type="comment" sql-type="VARCHAR" java-type="String"/> + <field-type-def type="description" sql-type="VARCHAR" java-type="String"/> + <field-type-def type="name" sql-type="VARCHAR" java-type="String"/> + <field-type-def type="value" sql-type="VARCHAR" java-type="String"/> <!-- Specialized Types --> - <field-type-def type="credit-card-number" sql-type="VARCHAR" java-type="String"><validate method="isAnyCard"/></field-type-def> - <field-type-def type="credit-card-date" sql-type="VARCHAR" java-type="String"><validate method="isDateAfterToday"/></field-type-def> - <field-type-def type="email" sql-type="VARCHAR" java-type="String"><validate method="isEmail"/></field-type-def> - <field-type-def type="url" sql-type="VARCHAR" java-type="String"></field-type-def> - <field-type-def type="id-ne" sql-type="VARCHAR" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-long-ne" sql-type="VARCHAR" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-vlong-ne" sql-type="VARCHAR" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="tel-number" sql-type="VARCHAR" java-type="String"><validate method="isInternationalPhoneNumber"/></field-type-def> + <field-type-def type="credit-card-number" sql-type="VARCHAR" java-type="String"/> + <field-type-def type="credit-card-date" sql-type="VARCHAR" java-type="String"/> + <field-type-def type="email" sql-type="VARCHAR" java-type="String"/> + <field-type-def type="url" sql-type="VARCHAR" java-type="String"/> + <field-type-def type="id-ne" sql-type="VARCHAR" java-type="String"/> + <field-type-def type="id-long-ne" sql-type="VARCHAR" java-type="String"/> + <field-type-def type="id-vlong-ne" sql-type="VARCHAR" java-type="String"/> + <field-type-def type="tel-number" sql-type="VARCHAR" java-type="String"/> </fieldtypemodel> Modified: ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypemssql.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypemssql.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypemssql.xml (original) +++ ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypemssql.xml Mon Jul 5 10:07:56 2010 @@ -22,40 +22,42 @@ under the License. xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/fieldtypemodel.xsd"> <!-- ===================== field-type-def ==================== --> <!-- General Types --> - <field-type-def type="blob" sql-type="IMAGE" java-type="java.sql.Blob"></field-type-def> - - <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="currency-amount" sql-type="DECIMAL(18,2)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="currency-precise" sql-type="DECIMAL(18,3)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="fixed-point" sql-type="DECIMAL(18,6)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="floating-point" sql-type="FLOAT" java-type="Double"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="numeric" sql-type="INT" java-type="Long"><validate method="isSignedLong"/></field-type-def> - - <field-type-def type="id" sql-type="VARCHAR(20)" java-type="String"></field-type-def> - <field-type-def type="id-long" sql-type="VARCHAR(60)" java-type="String"></field-type-def> - <field-type-def type="id-vlong" sql-type="VARCHAR(250)" java-type="String"></field-type-def> - - <field-type-def type="indicator" sql-type="CHAR(1)" java-type="String"></field-type-def> - <field-type-def type="very-short" sql-type="VARCHAR(10)" java-type="String"></field-type-def> - <field-type-def type="short-varchar" sql-type="VARCHAR(60)" java-type="String"></field-type-def> - <field-type-def type="long-varchar" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="very-long" sql-type="TEXT" java-type="String"></field-type-def> - - <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="description" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="name" sql-type="VARCHAR(100)" java-type="String"></field-type-def> - <field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"></field-type-def> + <field-type-def type="blob" sql-type="IMAGE" java-type="java.sql.Blob"/> + <field-type-def type="byte-array" sql-type="IMAGE" java-type="byte[]"/> + <field-type-def type="object" sql-type="IMAGE" java-type="Object"/> + + <field-type-def type="date-time" sql-type="DATETIME" java-type="java.sql.Timestamp"/> + <field-type-def type="date" sql-type="DATETIME" java-type="java.sql.Date"/> + <field-type-def type="time" sql-type="DATETIME" java-type="java.sql.Time"/> + + <field-type-def type="currency-amount" sql-type="DECIMAL(18,2)" java-type="java.math.BigDecimal"/> + <field-type-def type="currency-precise" sql-type="DECIMAL(18,3)" java-type="java.math.BigDecimal"/> + <field-type-def type="fixed-point" sql-type="DECIMAL(18,6)" java-type="java.math.BigDecimal"/> + <field-type-def type="floating-point" sql-type="FLOAT" java-type="Double"/> + <field-type-def type="numeric" sql-type="INT" java-type="Long"/> + + <field-type-def type="id" sql-type="VARCHAR(20)" java-type="String"/> + <field-type-def type="id-long" sql-type="VARCHAR(60)" java-type="String"/> + <field-type-def type="id-vlong" sql-type="VARCHAR(250)" java-type="String"/> + + <field-type-def type="indicator" sql-type="CHAR(1)" java-type="String"/> + <field-type-def type="very-short" sql-type="VARCHAR(10)" java-type="String"/> + <field-type-def type="short-varchar" sql-type="VARCHAR(60)" java-type="String"/> + <field-type-def type="long-varchar" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="very-long" sql-type="TEXT" java-type="String"/> + + <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="description" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="name" sql-type="VARCHAR(100)" java-type="String"/> + <field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"/> <!-- Specialized Types --> - <field-type-def type="credit-card-number" sql-type="VARCHAR(255)" java-type="String"><validate method="isAnyCard"/></field-type-def> - <field-type-def type="credit-card-date" sql-type="VARCHAR(20)" java-type="String"><validate method="isDateAfterToday"/></field-type-def> - <field-type-def type="email" sql-type="VARCHAR(255)" java-type="String"><validate method="isEmail"/></field-type-def> - <field-type-def type="url" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="id-ne" sql-type="VARCHAR(20)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-long-ne" sql-type="VARCHAR(60)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-vlong-ne" sql-type="VARCHAR(250)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="tel-number" sql-type="VARCHAR(60)" java-type="String"><validate method="isInternationalPhoneNumber"/></field-type-def> + <field-type-def type="credit-card-number" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="credit-card-date" sql-type="VARCHAR(20)" java-type="String"/> + <field-type-def type="email" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="url" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="id-ne" sql-type="VARCHAR(20)" java-type="String"/> + <field-type-def type="id-long-ne" sql-type="VARCHAR(60)" java-type="String"/> + <field-type-def type="id-vlong-ne" sql-type="VARCHAR(250)" java-type="String"/> + <field-type-def type="tel-number" sql-type="VARCHAR(60)" java-type="String"/> </fieldtypemodel> Modified: ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypemysql.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypemysql.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypemysql.xml (original) +++ ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypemysql.xml Mon Jul 5 10:07:56 2010 @@ -22,40 +22,42 @@ under the License. xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/fieldtypemodel.xsd"> <!-- ===================== field-type-def ==================== --> <!-- General Types --> - <field-type-def type="blob" sql-type="LONGBLOB" java-type="java.sql.Blob"></field-type-def> - - <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="currency-amount" sql-type="DECIMAL(18,2)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="currency-precise" sql-type="DECIMAL(18,3)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="fixed-point" sql-type="DECIMAL(18,6)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="floating-point" sql-type="DECIMAL(18,6)" java-type="Double"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="numeric" sql-type="DECIMAL(20,0)" java-type="Long"><validate method="isSignedLong"/></field-type-def> - - <field-type-def type="id" sql-type="VARCHAR(20)" java-type="String"></field-type-def> - <field-type-def type="id-long" sql-type="VARCHAR(60)" java-type="String"></field-type-def> - <field-type-def type="id-vlong" sql-type="VARCHAR(250)" java-type="String"></field-type-def> - - <field-type-def type="indicator" sql-type="CHAR(1)" java-type="String"></field-type-def> - <field-type-def type="very-short" sql-type="VARCHAR(10)" java-type="String"></field-type-def> - <field-type-def type="short-varchar" sql-type="VARCHAR(60)" java-type="String"></field-type-def> - <field-type-def type="long-varchar" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="very-long" sql-type="LONGTEXT" java-type="String"></field-type-def> - - <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="description" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="name" sql-type="VARCHAR(100)" java-type="String"></field-type-def> - <field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"></field-type-def> + <field-type-def type="blob" sql-type="LONGBLOB" java-type="java.sql.Blob"/> + <field-type-def type="byte-array" sql-type="LONGBLOB" java-type="byte[]"/> + <field-type-def type="object" sql-type="LONGBLOB" java-type="Object"/> + + <field-type-def type="date-time" sql-type="DATETIME" java-type="java.sql.Timestamp"/> + <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"/> + <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"/> + + <field-type-def type="currency-amount" sql-type="DECIMAL(18,2)" java-type="java.math.BigDecimal"/> + <field-type-def type="currency-precise" sql-type="DECIMAL(18,3)" java-type="java.math.BigDecimal"/> + <field-type-def type="fixed-point" sql-type="DECIMAL(18,6)" java-type="java.math.BigDecimal"/> + <field-type-def type="floating-point" sql-type="DOUBLE" java-type="Double"/> + <field-type-def type="numeric" sql-type="DECIMAL(20,0)" java-type="Long"/> + + <field-type-def type="id" sql-type="VARCHAR(20)" java-type="String"/> + <field-type-def type="id-long" sql-type="VARCHAR(60)" java-type="String"/> + <field-type-def type="id-vlong" sql-type="VARCHAR(250)" java-type="String"/> + + <field-type-def type="indicator" sql-type="CHAR(1)" java-type="String"/> + <field-type-def type="very-short" sql-type="VARCHAR(10)" java-type="String"/> + <field-type-def type="short-varchar" sql-type="VARCHAR(60)" java-type="String"/> + <field-type-def type="long-varchar" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="very-long" sql-type="LONGTEXT" java-type="String"/> + + <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="description" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="name" sql-type="VARCHAR(100)" java-type="String"/> + <field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"/> <!-- Specialized Types --> - <field-type-def type="credit-card-number" sql-type="VARCHAR(255)" java-type="String"><validate method="isAnyCard"/></field-type-def> - <field-type-def type="credit-card-date" sql-type="VARCHAR(20)" java-type="String"><validate method="isDateAfterToday"/></field-type-def> - <field-type-def type="email" sql-type="VARCHAR(255)" java-type="String"><validate method="isEmail"/></field-type-def> - <field-type-def type="url" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="id-ne" sql-type="VARCHAR(20)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-long-ne" sql-type="VARCHAR(60)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-vlong-ne" sql-type="VARCHAR(250)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="tel-number" sql-type="VARCHAR(60)" java-type="String"><validate method="isInternationalPhoneNumber"/></field-type-def> + <field-type-def type="credit-card-number" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="credit-card-date" sql-type="VARCHAR(20)" java-type="String"/> + <field-type-def type="email" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="url" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="id-ne" sql-type="VARCHAR(20)" java-type="String"/> + <field-type-def type="id-long-ne" sql-type="VARCHAR(60)" java-type="String"/> + <field-type-def type="id-vlong-ne" sql-type="VARCHAR(250)" java-type="String"/> + <field-type-def type="tel-number" sql-type="VARCHAR(60)" java-type="String"/> </fieldtypemodel> Modified: ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypeoracle.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypeoracle.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypeoracle.xml (original) +++ ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypeoracle.xml Mon Jul 5 10:07:56 2010 @@ -22,21 +22,23 @@ under the License. xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/fieldtypemodel.xsd"> <!-- ===================== field-type-def ==================== --> <!-- General Types --> - <field-type-def type="blob" sql-type="BLOB" java-type="java.sql.Blob"></field-type-def> - - <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="currency-amount" sql-type="NUMBER(18,2)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="currency-precise" sql-type="NUMBER(18,3)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="fixed-point" sql-type="NUMBER(18,6)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="floating-point" sql-type="NUMBER(18,6)" java-type="Double"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="numeric" sql-type="NUMBER(20,0)" java-type="Long"><validate method="isSignedLong"/></field-type-def> - - <field-type-def type="id" sql-type="VARCHAR2(20)" java-type="String"></field-type-def> - <field-type-def type="id-long" sql-type="VARCHAR2(60)" java-type="String"></field-type-def> - <field-type-def type="id-vlong" sql-type="VARCHAR2(255)" java-type="String"></field-type-def> + <field-type-def type="blob" sql-type="BLOB" java-type="java.sql.Blob"/> + <field-type-def type="byte-array" sql-type="BLOB" java-type="byte[]"/> + <field-type-def type="object" sql-type="BLOB" java-type="Object"/> + + <field-type-def type="date-time" sql-type="TIMESTAMP" sql-type-alias="TIMESTAMP(6)" java-type="java.sql.Timestamp"/> + <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"/> + <field-type-def type="time" sql-type="DATE" java-type="java.sql.Time"/> + + <field-type-def type="currency-amount" sql-type="NUMBER(18,2)" java-type="java.math.BigDecimal"/> + <field-type-def type="currency-precise" sql-type="NUMBER(18,3)" java-type="java.math.BigDecimal"/> + <field-type-def type="fixed-point" sql-type="NUMBER(18,6)" java-type="java.math.BigDecimal"/> + <field-type-def type="floating-point" sql-type="NUMBER(18,6)" java-type="Double"/> + <field-type-def type="numeric" sql-type="NUMBER(20,0)" java-type="Long"/> + + <field-type-def type="id" sql-type="VARCHAR2(20)" java-type="String"/> + <field-type-def type="id-long" sql-type="VARCHAR2(60)" java-type="String"/> + <field-type-def type="id-vlong" sql-type="VARCHAR2(255)" java-type="String"/> <!-- we had a customer using Oracle 11g with the following error after running any service in webtools. Service dispatcher threw an exceptionResult set was empty for entity: @@ -46,30 +48,30 @@ under the License. [GenericEntity:RuntimeData][runtimeDataId,10205(java.lang.String)])) adding the fieldtype - <field-type-def type="long" sql-type="LONG" java-type="String"><validate method="isNotEmpty"/></field-type-def> + <field-type-def type="long" sql-type="LONG" java-type="String"><validate method="isNotEmpty"//> and changing the fieldtype in RunTimeData: <field name="runtimeInfo" type="long"></field> cured the problem. (HB) --> - <field-type-def type="indicator" sql-type="CHAR(1)" java-type="String"></field-type-def> - <field-type-def type="very-short" sql-type="VARCHAR2(10)" java-type="String"></field-type-def> - <field-type-def type="short-varchar" sql-type="VARCHAR2(60)" java-type="String"></field-type-def> - <field-type-def type="long-varchar" sql-type="VARCHAR2(255)" java-type="String"></field-type-def> - <field-type-def type="very-long" sql-type="CLOB" java-type="String"></field-type-def> - - <field-type-def type="comment" sql-type="VARCHAR2(255)" java-type="String"></field-type-def> - <field-type-def type="description" sql-type="VARCHAR2(255)" java-type="String"></field-type-def> - <field-type-def type="name" sql-type="VARCHAR2(100)" java-type="String"></field-type-def> - <field-type-def type="value" sql-type="VARCHAR2(255)" java-type="String"></field-type-def> + <field-type-def type="indicator" sql-type="CHAR(1)" java-type="String"/> + <field-type-def type="very-short" sql-type="VARCHAR2(10)" java-type="String"/> + <field-type-def type="short-varchar" sql-type="VARCHAR2(60)" java-type="String"/> + <field-type-def type="long-varchar" sql-type="VARCHAR2(255)" java-type="String"/> + <field-type-def type="very-long" sql-type="CLOB" java-type="String"/> + + <field-type-def type="comment" sql-type="VARCHAR2(255)" java-type="String"/> + <field-type-def type="description" sql-type="VARCHAR2(255)" java-type="String"/> + <field-type-def type="name" sql-type="VARCHAR2(100)" java-type="String"/> + <field-type-def type="value" sql-type="VARCHAR2(255)" java-type="String"/> <!-- Specialized Types --> - <field-type-def type="credit-card-number" sql-type="VARCHAR2(255)" java-type="String"><validate method="isAnyCard"/></field-type-def> - <field-type-def type="credit-card-date" sql-type="VARCHAR2(20)" java-type="String"><validate method="isDateAfterToday"/></field-type-def> - <field-type-def type="email" sql-type="VARCHAR2(255)" java-type="String"><validate method="isEmail"/></field-type-def> - <field-type-def type="url" sql-type="VARCHAR2(255)" java-type="String"></field-type-def> - <field-type-def type="id-ne" sql-type="VARCHAR2(20)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-long-ne" sql-type="VARCHAR2(60)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-vlong-ne" sql-type="VARCHAR2(255)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="tel-number" sql-type="VARCHAR2(60)" java-type="String"><validate method="isInternationalPhoneNumber"/></field-type-def> + <field-type-def type="credit-card-number" sql-type="VARCHAR2(255)" java-type="String"/> + <field-type-def type="credit-card-date" sql-type="VARCHAR2(20)" java-type="String"/> + <field-type-def type="email" sql-type="VARCHAR2(255)" java-type="String"/> + <field-type-def type="url" sql-type="VARCHAR2(255)" java-type="String"/> + <field-type-def type="id-ne" sql-type="VARCHAR2(20)" java-type="String"/> + <field-type-def type="id-long-ne" sql-type="VARCHAR2(60)" java-type="String"/> + <field-type-def type="id-vlong-ne" sql-type="VARCHAR2(255)" java-type="String"/> + <field-type-def type="tel-number" sql-type="VARCHAR2(60)" java-type="String"/> </fieldtypemodel> Modified: ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypepostgres.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypepostgres.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypepostgres.xml (original) +++ ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypepostgres.xml Mon Jul 5 10:07:56 2010 @@ -22,40 +22,42 @@ under the License. xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/fieldtypemodel.xsd"> <!-- ===================== field-type-def ==================== --> <!-- General Types --> - <field-type-def type="blob" sql-type="BYTEA" java-type="java.sql.Blob"></field-type-def> - - <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="currency-amount" sql-type="NUMERIC(18,2)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="currency-precise" sql-type="NUMERIC(18,3)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="fixed-point" sql-type="NUMERIC(18,6)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="floating-point" sql-type="FLOAT8" java-type="Double"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="numeric" sql-type="NUMERIC(20,0)" java-type="Long"><validate method="isSignedLong"/></field-type-def> - - <field-type-def type="id" sql-type="VARCHAR(20)" java-type="String"></field-type-def> - <field-type-def type="id-long" sql-type="VARCHAR(60)" java-type="String"></field-type-def> - <field-type-def type="id-vlong" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - - <field-type-def type="indicator" sql-type="CHAR(1)" sql-type-alias="BPCHAR" java-type="String"></field-type-def> - <field-type-def type="very-short" sql-type="VARCHAR(10)" java-type="String"></field-type-def> - <field-type-def type="short-varchar" sql-type="VARCHAR(60)" java-type="String"></field-type-def> - <field-type-def type="long-varchar" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="very-long" sql-type="TEXT" java-type="String"></field-type-def> - - <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="description" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="name" sql-type="VARCHAR(100)" java-type="String"></field-type-def> - <field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"></field-type-def> + <field-type-def type="blob" sql-type="BYTEA" java-type="java.sql.Blob"/> + <field-type-def type="byte-array" sql-type="BYTEA" java-type="byte[]"/> + <field-type-def type="object" sql-type="BYTEA" java-type="Object"/> + + <field-type-def type="date-time" sql-type="TIMESTAMPTZ" java-type="java.sql.Timestamp"/> + <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"/> + <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"/> + + <field-type-def type="currency-amount" sql-type="NUMERIC(18,2)" java-type="java.math.BigDecimal"/> + <field-type-def type="currency-precise" sql-type="NUMERIC(18,3)" java-type="java.math.BigDecimal"/> + <field-type-def type="fixed-point" sql-type="NUMERIC(18,6)" java-type="java.math.BigDecimal"/> + <field-type-def type="floating-point" sql-type="FLOAT8" java-type="Double"/> + <field-type-def type="numeric" sql-type="NUMERIC(20,0)" java-type="Long"/> + + <field-type-def type="id" sql-type="VARCHAR(20)" java-type="String"/> + <field-type-def type="id-long" sql-type="VARCHAR(60)" java-type="String"/> + <field-type-def type="id-vlong" sql-type="VARCHAR(255)" java-type="String"/> + + <field-type-def type="indicator" sql-type="CHAR(1)" sql-type-alias="BPCHAR" java-type="String"/> + <field-type-def type="very-short" sql-type="VARCHAR(10)" java-type="String"/> + <field-type-def type="short-varchar" sql-type="VARCHAR(60)" java-type="String"/> + <field-type-def type="long-varchar" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="very-long" sql-type="TEXT" java-type="String"/> + + <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="description" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="name" sql-type="VARCHAR(100)" java-type="String"/> + <field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"/> <!-- Specialized Types --> - <field-type-def type="credit-card-number" sql-type="VARCHAR(255)" java-type="String"><validate method="isAnyCard"/></field-type-def> - <field-type-def type="credit-card-date" sql-type="VARCHAR(20)" java-type="String"><validate method="isDateAfterToday"/></field-type-def> - <field-type-def type="email" sql-type="VARCHAR(255)" java-type="String"><validate method="isEmail"/></field-type-def> - <field-type-def type="url" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="id-ne" sql-type="VARCHAR(20)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-long-ne" sql-type="VARCHAR(60)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-vlong-ne" sql-type="VARCHAR(255)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="tel-number" sql-type="VARCHAR(60)" java-type="String"><validate method="isInternationalPhoneNumber"/></field-type-def> + <field-type-def type="credit-card-number" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="credit-card-date" sql-type="VARCHAR(20)" java-type="String"/> + <field-type-def type="email" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="url" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="id-ne" sql-type="VARCHAR(20)" java-type="String"/> + <field-type-def type="id-long-ne" sql-type="VARCHAR(60)" java-type="String"/> + <field-type-def type="id-vlong-ne" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="tel-number" sql-type="VARCHAR(60)" java-type="String"/> </fieldtypemodel> Modified: ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypepostnew.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypepostnew.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypepostnew.xml (original) +++ ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypepostnew.xml Mon Jul 5 10:07:56 2010 @@ -53,40 +53,42 @@ under the License. xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/fieldtypemodel.xsd"> <!-- ===================== field-type-def ==================== --> <!-- General Types --> - <field-type-def type="blob" sql-type="BYTEA" java-type="java.sql.Blob"></field-type-def> - - <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="currency-amount" sql-type="NUMERIC(18,2)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="currency-precise" sql-type="NUMERIC(18,3)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="fixed-point" sql-type="NUMERIC(18,6)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="floating-point" sql-type="FLOAT8" java-type="Double"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="numeric" sql-type="NUMERIC(20,0)" java-type="Long"><validate method="isSignedLong"/></field-type-def> - - <field-type-def type="id" sql-type="TEXT" java-type="String"></field-type-def> - <field-type-def type="id-long" sql-type="TEXT" java-type="String"></field-type-def> - <field-type-def type="id-vlong" sql-type="TEXT" java-type="String"></field-type-def> - - <field-type-def type="indicator" sql-type="CHAR(1)" sql-type-alias="BPCHAR" java-type="String"></field-type-def> - <field-type-def type="very-short" sql-type="TEXT" java-type="String"></field-type-def> - <field-type-def type="short-varchar" sql-type="TEXT" java-type="String"></field-type-def> - <field-type-def type="long-varchar" sql-type="TEXT" java-type="String"></field-type-def> - <field-type-def type="very-long" sql-type="TEXT" java-type="String"></field-type-def> - - <field-type-def type="comment" sql-type="TEXT" java-type="String"></field-type-def> - <field-type-def type="description" sql-type="TEXT" java-type="String"></field-type-def> - <field-type-def type="name" sql-type="TEXT" java-type="String"></field-type-def> - <field-type-def type="value" sql-type="TEXT" java-type="String"></field-type-def> + <field-type-def type="blob" sql-type="BYTEA" java-type="java.sql.Blob"/> + <field-type-def type="byte-array" sql-type="BYTEA" java-type="byte[]"/> + <field-type-def type="object" sql-type="BYTEA" java-type="Object"/> + + <field-type-def type="date-time" sql-type="TIMESTAMPTZ" java-type="java.sql.Timestamp"/> + <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"/> + <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"/> + + <field-type-def type="currency-amount" sql-type="NUMERIC(18,2)" java-type="java.math.BigDecimal"/> + <field-type-def type="currency-precise" sql-type="NUMERIC(18,3)" java-type="java.math.BigDecimal"/> + <field-type-def type="fixed-point" sql-type="NUMERIC(18,6)" java-type="java.math.BigDecimal"/> + <field-type-def type="floating-point" sql-type="FLOAT8" java-type="Double"/> + <field-type-def type="numeric" sql-type="NUMERIC(20,0)" java-type="Long"/> + + <field-type-def type="id" sql-type="TEXT" java-type="String"/> + <field-type-def type="id-long" sql-type="TEXT" java-type="String"/> + <field-type-def type="id-vlong" sql-type="TEXT" java-type="String"/> + + <field-type-def type="indicator" sql-type="CHAR(1)" sql-type-alias="BPCHAR" java-type="String"/> + <field-type-def type="very-short" sql-type="TEXT" java-type="String"/> + <field-type-def type="short-varchar" sql-type="TEXT" java-type="String"/> + <field-type-def type="long-varchar" sql-type="TEXT" java-type="String"/> + <field-type-def type="very-long" sql-type="TEXT" java-type="String"/> + + <field-type-def type="comment" sql-type="TEXT" java-type="String"/> + <field-type-def type="description" sql-type="TEXT" java-type="String"/> + <field-type-def type="name" sql-type="TEXT" java-type="String"/> + <field-type-def type="value" sql-type="TEXT" java-type="String"/> <!-- Specialized Types --> - <field-type-def type="credit-card-number" sql-type="TEXT" java-type="String"><validate method="isAnyCard"/></field-type-def> - <field-type-def type="credit-card-date" sql-type="TEXT" java-type="String"><validate method="isDateAfterToday"/></field-type-def> - <field-type-def type="email" sql-type="TEXT" java-type="String"><validate method="isEmail"/></field-type-def> - <field-type-def type="url" sql-type="TEXT" java-type="String"></field-type-def> - <field-type-def type="id-ne" sql-type="TEXT" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-long-ne" sql-type="TEXT" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-vlong-ne" sql-type="TEXT" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="tel-number" sql-type="TEXT" java-type="String"><validate method="isInternationalPhoneNumber"/></field-type-def> + <field-type-def type="credit-card-number" sql-type="TEXT" java-type="String"/> + <field-type-def type="credit-card-date" sql-type="TEXT" java-type="String"/> + <field-type-def type="email" sql-type="TEXT" java-type="String"/> + <field-type-def type="url" sql-type="TEXT" java-type="String"/> + <field-type-def type="id-ne" sql-type="TEXT" java-type="String"/> + <field-type-def type="id-long-ne" sql-type="TEXT" java-type="String"/> + <field-type-def type="id-vlong-ne" sql-type="TEXT" java-type="String"/> + <field-type-def type="tel-number" sql-type="TEXT" java-type="String"/> </fieldtypemodel> Modified: ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypesapdb.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypesapdb.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypesapdb.xml (original) +++ ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypesapdb.xml Mon Jul 5 10:07:56 2010 @@ -22,41 +22,43 @@ under the License. xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/fieldtypemodel.xsd"> <!-- ===================== field-type-def ==================== --> <!-- General Types --> - <field-type-def type="blob" sql-type="LONG BYTE" sql-type-alias="LONG BYTE" java-type="java.sql.Blob"></field-type-def> - - <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="currency-amount" sql-type="FIXED(18,2)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="currency-precise" sql-type="FIXED(18,3)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="fixed-point" sql-type="FIXED(18,6)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="floating-point" sql-type="FIXED(18,6)" java-type="Double"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="numeric" sql-type="FIXED(20,0)" java-type="Long"><validate method="isSignedLong"/></field-type-def> - - <field-type-def type="id" sql-type="VARCHAR(20) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"></field-type-def> - <field-type-def type="id-long" sql-type="VARCHAR(60) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"></field-type-def> - <field-type-def type="id-vlong" sql-type="VARCHAR(255) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"></field-type-def> - - <field-type-def type="indicator" sql-type="CHAR(1) UNICODE" sql-type-alias="CHAR() UNICODE" java-type="String"></field-type-def> - <field-type-def type="very-short" sql-type="VARCHAR(10) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"></field-type-def> - <field-type-def type="short-varchar" sql-type="VARCHAR(60) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"></field-type-def> - <field-type-def type="long-varchar" sql-type="VARCHAR(255) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"></field-type-def> - <field-type-def type="very-long" sql-type="LONG UNICODE" sql-type-alias="LONG UNICODE" java-type="String"></field-type-def> - - <field-type-def type="comment" sql-type="VARCHAR(255) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"></field-type-def> - <field-type-def type="description" sql-type="VARCHAR(255) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"></field-type-def> - <field-type-def type="name" sql-type="VARCHAR(100) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"></field-type-def> - <field-type-def type="value" sql-type="VARCHAR(255) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"></field-type-def> + <field-type-def type="blob" sql-type="LONG BYTE" sql-type-alias="LONG BYTE" java-type="java.sql.Blob"/> + <field-type-def type="byte-array" sql-type="LONG BYTE" sql-type-alias="LONG BYTE" java-type="byte[]"/> + <field-type-def type="object" sql-type="LONG BYTE" sql-type-alias="LONG BYTE" java-type="Object"/> + + <field-type-def type="date-time" sql-type="TIMESTAMP" java-type="java.sql.Timestamp"/> + <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"/> + <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"/> + + <field-type-def type="currency-amount" sql-type="FIXED(18,2)" java-type="java.math.BigDecimal"/> + <field-type-def type="currency-precise" sql-type="FIXED(18,3)" java-type="java.math.BigDecimal"/> + <field-type-def type="fixed-point" sql-type="FIXED(18,6)" java-type="java.math.BigDecimal"/> + <field-type-def type="floating-point" sql-type="FIXED(18,6)" java-type="Double"/> + <field-type-def type="numeric" sql-type="FIXED(20,0)" java-type="Long"/> + + <field-type-def type="id" sql-type="VARCHAR(20) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"/> + <field-type-def type="id-long" sql-type="VARCHAR(60) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"/> + <field-type-def type="id-vlong" sql-type="VARCHAR(255) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"/> + + <field-type-def type="indicator" sql-type="CHAR(1) UNICODE" sql-type-alias="CHAR() UNICODE" java-type="String"/> + <field-type-def type="very-short" sql-type="VARCHAR(10) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"/> + <field-type-def type="short-varchar" sql-type="VARCHAR(60) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"/> + <field-type-def type="long-varchar" sql-type="VARCHAR(255) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"/> + <field-type-def type="very-long" sql-type="LONG UNICODE" sql-type-alias="LONG UNICODE" java-type="String"/> + + <field-type-def type="comment" sql-type="VARCHAR(255) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"/> + <field-type-def type="description" sql-type="VARCHAR(255) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"/> + <field-type-def type="name" sql-type="VARCHAR(100) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"/> + <field-type-def type="value" sql-type="VARCHAR(255) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"/> <!-- Specialized Types --> - <field-type-def type="credit-card-number" sql-type="VARCHAR(255) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"><validate method="isAnyCard"/></field-type-def> - <field-type-def type="credit-card-date" sql-type="VARCHAR(20) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"><validate method="isDateAfterToday"/></field-type-def> - <field-type-def type="email" sql-type="VARCHAR(255) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"><validate method="isEmail"/></field-type-def> - <field-type-def type="url" sql-type="VARCHAR(255) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"></field-type-def> - <field-type-def type="id-ne" sql-type="VARCHAR(20) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-long-ne" sql-type="VARCHAR(60) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-vlong-ne" sql-type="VARCHAR(255) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="tel-number" sql-type="VARCHAR(60) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"><validate method="isInternationalPhoneNumber"/></field-type-def> + <field-type-def type="credit-card-number" sql-type="VARCHAR(255) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"/> + <field-type-def type="credit-card-date" sql-type="VARCHAR(20) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"/> + <field-type-def type="email" sql-type="VARCHAR(255) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"/> + <field-type-def type="url" sql-type="VARCHAR(255) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"/> + <field-type-def type="id-ne" sql-type="VARCHAR(20) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"/> + <field-type-def type="id-long-ne" sql-type="VARCHAR(60) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"/> + <field-type-def type="id-vlong-ne" sql-type="VARCHAR(255) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"/> + <field-type-def type="tel-number" sql-type="VARCHAR(60) UNICODE" sql-type-alias="VARCHAR() UNICODE" java-type="String"/> </fieldtypemodel> Modified: ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypesybase.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypesybase.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypesybase.xml (original) +++ ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypesybase.xml Mon Jul 5 10:07:56 2010 @@ -22,40 +22,42 @@ under the License. xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/fieldtypemodel.xsd"> <!-- ===================== field-type-def ==================== --> <!-- General Types --> - <field-type-def type="blob" sql-type="IMAGE" java-type="java.sql.Blob"></field-type-def> - - <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="currency-amount" sql-type="NUMERIC(18,2)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="currency-precise" sql-type="NUMERIC(18,3)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="fixed-point" sql-type="NUMERIC(18,6)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="floating-point" sql-type="NUMERIC(18,6)" java-type="Double"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="numeric" sql-type="NUMERIC(20,0)" java-type="Long"><validate method="isSignedLong"/></field-type-def> - - <field-type-def type="id" sql-type="VARCHAR(20)" java-type="String"></field-type-def> - <field-type-def type="id-long" sql-type="VARCHAR(60)" java-type="String"></field-type-def> - <field-type-def type="id-vlong" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - - <field-type-def type="indicator" sql-type="CHAR(1)" java-type="String"></field-type-def> - <field-type-def type="very-short" sql-type="VARCHAR(10)" java-type="String"></field-type-def> - <field-type-def type="short-varchar" sql-type="VARCHAR(60)" java-type="String"></field-type-def> - <field-type-def type="long-varchar" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="very-long" sql-type="TEXT" java-type="String"></field-type-def> - - <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="description" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="name" sql-type="VARCHAR(100)" java-type="String"></field-type-def> - <field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"></field-type-def> + <field-type-def type="blob" sql-type="IMAGE" java-type="java.sql.Blob"/> + <field-type-def type="byte-array" sql-type="IMAGE" java-type="byte[]"/> + <field-type-def type="object" sql-type="IMAGE" java-type="Object"/> + + <field-type-def type="date-time" sql-type="DATETIME" java-type="Timestamp"/> + <field-type-def type="date" sql-type="DATETIME" java-type="java.sql.Date"/> + <field-type-def type="time" sql-type="DATETIME" java-type="java.sql.Time"/> + + <field-type-def type="currency-amount" sql-type="NUMERIC(18,2)" java-type="java.math.BigDecimal"/> + <field-type-def type="currency-precise" sql-type="NUMERIC(18,3)" java-type="java.math.BigDecimal"/> + <field-type-def type="fixed-point" sql-type="NUMERIC(18,6)" java-type="java.math.BigDecimal"/> + <field-type-def type="floating-point" sql-type="NUMERIC(18,6)" java-type="Double"/> + <field-type-def type="numeric" sql-type="NUMERIC(20,0)" java-type="Long"/> + + <field-type-def type="id" sql-type="VARCHAR(20)" java-type="String"/> + <field-type-def type="id-long" sql-type="VARCHAR(60)" java-type="String"/> + <field-type-def type="id-vlong" sql-type="VARCHAR(255)" java-type="String"/> + + <field-type-def type="indicator" sql-type="CHAR(1)" java-type="String"/> + <field-type-def type="very-short" sql-type="VARCHAR(10)" java-type="String"/> + <field-type-def type="short-varchar" sql-type="VARCHAR(60)" java-type="String"/> + <field-type-def type="long-varchar" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="very-long" sql-type="TEXT" java-type="String"/> + + <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="description" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="name" sql-type="VARCHAR(100)" java-type="String"/> + <field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"/> <!-- Specialized Types --> - <field-type-def type="credit-card-number" sql-type="VARCHAR(255)" java-type="String"><validate method="isAnyCard"/></field-type-def> - <field-type-def type="credit-card-date" sql-type="VARCHAR(20)" java-type="String"><validate method="isDateAfterToday"/></field-type-def> - <field-type-def type="email" sql-type="VARCHAR(255)" java-type="String"><validate method="isEmail"/></field-type-def> - <field-type-def type="url" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="id-ne" sql-type="VARCHAR(20)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-long-ne" sql-type="VARCHAR(60)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-vlong-ne" sql-type="VARCHAR(255)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="tel-number" sql-type="VARCHAR(60)" java-type="String"><validate method="isInternationalPhoneNumber"/></field-type-def> + <field-type-def type="credit-card-number" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="credit-card-date" sql-type="VARCHAR(20)" java-type="String"/> + <field-type-def type="email" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="url" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="id-ne" sql-type="VARCHAR(20)" java-type="String"/> + <field-type-def type="id-long-ne" sql-type="VARCHAR(60)" java-type="String"/> + <field-type-def type="id-vlong-ne" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="tel-number" sql-type="VARCHAR(60)" java-type="String"/> </fieldtypemodel> Modified: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/EntityCryptoException.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/EntityCryptoException.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/EntityCryptoException.java (original) +++ ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/EntityCryptoException.java Mon Jul 5 10:07:56 2010 @@ -18,6 +18,7 @@ *******************************************************************************/ package org.ofbiz.entity; +@SuppressWarnings("serial") public class EntityCryptoException extends GenericEntityException { public EntityCryptoException() { Modified: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/EntityLockedException.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/EntityLockedException.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/EntityLockedException.java (original) +++ ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/EntityLockedException.java Mon Jul 5 10:07:56 2010 @@ -22,6 +22,7 @@ package org.ofbiz.entity; * EntityLockedException * */ +@SuppressWarnings("serial") public class EntityLockedException extends GenericEntityException { public EntityLockedException() { Modified: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityComparisonOperator.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityComparisonOperator.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityComparisonOperator.java (original) +++ ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityComparisonOperator.java Mon Jul 5 10:07:56 2010 @@ -40,8 +40,9 @@ import org.ofbiz.entity.model.ModelEntit import org.ofbiz.entity.model.ModelField; /** - * Encapsulates operations between entities and entity fields. This is a immutable class. + * Base class for comparisons. */ +@SuppressWarnings("serial") public abstract class EntityComparisonOperator<L, R> extends EntityOperator<L, R, Boolean> { public static final String module = EntityComparisonOperator.class.getName(); @@ -255,7 +256,7 @@ public abstract class EntityComparisonOp } else { return true; } - } else if (rhs instanceof Collection) { + } else if (rhs instanceof Collection<?>) { if (((Collection<?>) rhs).contains(lhs)) { return true; } else { Modified: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java (original) +++ ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java Mon Jul 5 10:07:56 2010 @@ -44,6 +44,7 @@ import org.ofbiz.entity.model.ModelEntit * These can be used in various combinations using the EntityConditionList and EntityExpr objects. * */ +@SuppressWarnings("serial") public abstract class EntityCondition extends EntityConditionBase implements IsEmpty, Reusable { public static <L,R,LL,RR> EntityExpr makeCondition(L lhs, EntityComparisonOperator<LL,RR> operator, R rhs) { Modified: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionBuilder.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionBuilder.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionBuilder.java (original) +++ ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionBuilder.java Mon Jul 5 10:07:56 2010 @@ -80,7 +80,7 @@ public class EntityConditionBuilder exte } if (child instanceof EntityCondition) { tempList.add((EntityCondition)child); - } else if (child instanceof List) { + } else if (child instanceof List<?>) { tempList.addAll(UtilGenerics.<EntityCondition>checkList(child)); } parentConList.init(tempList, parentConList.getOperator()); Modified: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java (original) +++ ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java Mon Jul 5 10:07:56 2010 @@ -28,9 +28,10 @@ import org.ofbiz.entity.config.Datasourc import org.ofbiz.entity.model.ModelEntity; /** - * Encapsulates operations between entities and entity fields. This is a immutable class. + * Base class for entity condition functions. * */ +@SuppressWarnings("serial") public abstract class EntityConditionFunction extends EntityCondition { public static final int ID_NOT = 1; Modified: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionList.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionList.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionList.java (original) +++ ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionList.java Mon Jul 5 10:07:56 2010 @@ -26,6 +26,7 @@ import javolution.context.ObjectFactory; * Encapsulates a list of EntityConditions to be used as a single EntityCondition combined as specified * */ +@SuppressWarnings("serial") public class EntityConditionList<T extends EntityCondition> extends EntityConditionListBase<T> { public static final String module = EntityConditionList.class.getName(); Modified: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java (original) +++ ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java Mon Jul 5 10:07:56 2010 @@ -33,6 +33,7 @@ import org.ofbiz.entity.model.ModelEntit * Encapsulates a list of EntityConditions to be used as a single EntityCondition combined as specified * */ +@SuppressWarnings("serial") public abstract class EntityConditionListBase<T extends EntityCondition> extends EntityCondition { public static final String module = EntityConditionListBase.class.getName(); @@ -123,7 +124,7 @@ public abstract class EntityConditionLis @Override public boolean equals(Object obj) { - if (!(obj instanceof EntityConditionListBase)) return false; + if (!(obj instanceof EntityConditionListBase<?>)) return false; EntityConditionListBase<?> other = UtilGenerics.cast(obj); boolean isEqual = conditionList.equals(other.conditionList) && operator.equals(other.operator); Modified: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionParam.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionParam.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionParam.java (original) +++ ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionParam.java Mon Jul 5 10:07:56 2010 @@ -26,6 +26,7 @@ import org.ofbiz.entity.model.ModelField * Represents a single parameter to be used in the preparedStatement * */ +@SuppressWarnings("serial") public class EntityConditionParam implements Serializable { protected ModelField modelField; protected Object fieldValue; Modified: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java (original) +++ ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java Mon Jul 5 10:07:56 2010 @@ -31,6 +31,11 @@ import org.ofbiz.entity.model.ModelEntit import org.ofbiz.entity.model.ModelField; import org.ofbiz.entity.model.ModelViewEntity; +/** + * Sub-query action. + * + */ +@SuppressWarnings("serial") public class EntityConditionSubSelect extends EntityConditionValue { public static final String module = EntityConditionSubSelect.class.getName(); Modified: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java (original) +++ ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java Mon Jul 5 10:07:56 2010 @@ -30,7 +30,7 @@ import org.ofbiz.entity.model.ModelEntit import org.ofbiz.entity.model.ModelField; /** - * Encapsulates operations between entities and entity fields. This is a immutable class. + * Base class for condition expression values. * */ @SuppressWarnings("serial") Modified: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java (original) +++ ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java Mon Jul 5 10:07:56 2010 @@ -30,6 +30,11 @@ import org.ofbiz.entity.GenericModelExce import org.ofbiz.entity.config.DatasourceInfo; import org.ofbiz.entity.model.ModelEntity; +/** + * Date-range condition. + * + */ +@SuppressWarnings("serial") public class EntityDateFilterCondition extends EntityCondition { protected static final ObjectFactory<EntityDateFilterCondition> entityDateFilterConditionFactory = new ObjectFactory<EntityDateFilterCondition>() { Modified: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java (original) +++ ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java Mon Jul 5 10:07:56 2010 @@ -42,6 +42,7 @@ import org.ofbiz.entity.model.ModelField * Encapsulates simple expressions used for specifying queries * */ +@SuppressWarnings("serial") public class EntityExpr extends EntityCondition { public static final String module = EntityExpr.class.getName(); @@ -73,7 +74,7 @@ public class EntityExpr extends EntityCo } if (EntityOperator.BETWEEN.equals(operator)) { - if (!(rhs instanceof Collection) || (((Collection<?>) rhs).size() != 2)) { + if (!(rhs instanceof Collection<?>) || (((Collection<?>) rhs).size() != 2)) { throw new IllegalArgumentException("BETWEEN Operator requires a Collection with 2 elements for the right/rhs argument"); } } @@ -198,11 +199,11 @@ public class EntityExpr extends EntityCo if (this.rhs == null || this.rhs == GenericEntity.NULL_FIELD || modelEntity == null) return; Object value = this.rhs; - if (this.rhs instanceof EntityFunction) { + if (this.rhs instanceof EntityFunction<?>) { value = UtilGenerics.<EntityFunction<?>>cast(this.rhs).getOriginalValue(); } - if (value instanceof Collection) { + if (value instanceof Collection<?>) { Collection<?> valueCol = UtilGenerics.cast(value); if (valueCol.size() > 0) { value = valueCol.iterator().next(); Modified: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java (original) +++ ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java Mon Jul 5 10:07:56 2010 @@ -34,6 +34,7 @@ import org.ofbiz.entity.util.EntityUtil; * Encapsulates simple expressions used for specifying queries * */ +@SuppressWarnings("serial") public class EntityFieldMap extends EntityConditionListBase<EntityExpr> { protected static final ObjectFactory<EntityFieldMap> entityFieldMapFactory = new ObjectFactory<EntityFieldMap>() { Modified: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java (original) +++ ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java Mon Jul 5 10:07:56 2010 @@ -38,7 +38,7 @@ import org.ofbiz.entity.model.ModelViewE import org.ofbiz.entity.model.ModelViewEntity.ModelAlias; /** - * Encapsulates operations between entities and entity fields. This is a immutable class. + * Field value expression. * */ @SuppressWarnings("serial") Modified: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java (original) +++ ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java Mon Jul 5 10:07:56 2010 @@ -33,9 +33,10 @@ import org.ofbiz.entity.model.ModelEntit import org.ofbiz.entity.model.ModelField; /** - * Encapsulates operations between entities and entity fields. This is a immutable class. + * Base class for entity functions. * */ +@SuppressWarnings("serial") public abstract class EntityFunction<T extends Comparable<?>> extends EntityConditionValue implements Reusable { public static interface Fetcher<T> { @@ -77,6 +78,10 @@ public abstract class EntityFunction<T e public static EntityFunction<String> LOWER(EntityConditionValue nested) { return LOWER.lowerFactory.createFunction(nested); } public static EntityFunction<String> LOWER(Object value) { return LOWER.lowerFactory.createFunction(value); } + /** + * Length() entity function. + * + */ public static class LENGTH extends EntityFunction<Integer> { public static Fetcher<Integer> FETCHER = new Fetcher<Integer>() { public Integer getValue(Object value) { return value.toString().length(); } @@ -98,6 +103,10 @@ public abstract class EntityFunction<T e } } + /** + * Trim() entity function. + * + */ public static class TRIM extends EntityFunction<String> { public static Fetcher<String> FETCHER = new Fetcher<String>() { public String getValue(Object value) { return value.toString().trim(); } @@ -119,6 +128,10 @@ public abstract class EntityFunction<T e } } + /** + * Upper() entity function. + * + */ public static class UPPER extends EntityFunction<String> { public static Fetcher<String> FETCHER = new Fetcher<String>() { public String getValue(Object value) { return value.toString().toUpperCase(); } @@ -140,6 +153,10 @@ public abstract class EntityFunction<T e } } + /** + * Lower() entity function. + * + */ public static class LOWER extends EntityFunction<String> { public static Fetcher<String> FETCHER = new Fetcher<String>() { public String getValue(Object value) { return value.toString().toLowerCase(); } @@ -181,8 +198,6 @@ public abstract class EntityFunction<T e this.function = function; if (value instanceof EntityConditionValue) { this.nested = (EntityConditionValue) value; - } else if (value instanceof String) { - this.value = ((String) value).replaceAll("'", "''"); } else { this.value = value; } @@ -223,7 +238,7 @@ public abstract class EntityFunction<T e @Override public boolean equals(Object obj) { - if (!(obj instanceof EntityFunction)) return false; + if (!(obj instanceof EntityFunction<?>)) return false; EntityFunction<?> otherFunc = UtilGenerics.cast(obj); return (this.function == otherFunc.function && (this.nested != null ? nested.equals(otherFunc.nested) : otherFunc.nested == null) && Modified: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java (original) +++ ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java Mon Jul 5 10:07:56 2010 @@ -34,9 +34,10 @@ import org.ofbiz.entity.config.Datasourc import org.ofbiz.entity.model.ModelEntity; /** - * Encapsulates operations between entities and entity fields. This is a immutable class. + * Join operator (AND/OR). * */ +@SuppressWarnings("serial") public class EntityJoinOperator extends EntityOperator<EntityCondition, EntityCondition, Boolean> { protected boolean shortCircuitValue; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |