You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by jb...@apache.org on 2010/09/08 00:18:50 UTC
svn commit: r993546 - in /incubator/aries/trunk/samples/ariestrader:
assemblies/equinox-test-harness/src/main/resources/
modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/
modules/ariestrader-web/src/main/java/org...
Author: jbohn
Date: Tue Sep 7 22:18:50 2010
New Revision: 993546
URL: http://svn.apache.org/viewvc?rev=993546&view=rev
Log:
ARIES-402 update AriesTrader to load sql files from the bundle and make the column lengths consistent
Removed:
incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/resources/tradeDB.sql
Modified:
incubator/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountDataBeanImpl.java
incubator/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountProfileDataBeanImpl.java
incubator/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/HoldingDataBeanImpl.java
incubator/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/OrderDataBeanImpl.java
incubator/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/QuoteDataBeanImpl.java
incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeBuildDB.java
incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeConfigServlet.java
incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/db2/Table.ddl
incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/derby/Table.ddl
incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/oracle/Table.ddl
incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/other/Table.ddl
Modified: incubator/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountDataBeanImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountDataBeanImpl.java?rev=993546&r1=993545&r2=993546&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountDataBeanImpl.java (original)
+++ incubator/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountDataBeanImpl.java Tue Sep 7 22:18:50 2010
@@ -103,7 +103,7 @@ public class AccountDataBeanImpl impleme
private Collection<HoldingDataBeanImpl> holdings;
@OneToOne(fetch=FetchType.LAZY)
- @JoinColumn(name="PROFILE_USERID", columnDefinition="VARCHAR(250)")
+ @JoinColumn(name="PROFILE_USERID", columnDefinition="VARCHAR(255)")
private AccountProfileDataBeanImpl profile;
/* Accessor methods for relationship fields are only included for the AccountProfile profileID */
Modified: incubator/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountProfileDataBeanImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountProfileDataBeanImpl.java?rev=993546&r1=993545&r2=993546&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountProfileDataBeanImpl.java (original)
+++ incubator/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountProfileDataBeanImpl.java Tue Sep 7 22:18:50 2010
@@ -43,22 +43,22 @@ import org.apache.aries.samples.ariestra
public class AccountProfileDataBeanImpl implements AccountProfileDataBean, java.io.Serializable {
@Id
- @Column(name = "USERID", nullable = false, length = 250)
+ @Column(name = "USERID", nullable = false, length = 255)
private String userID; /* userID */
- @Column(name = "PASSWD", length = 250)
+ @Column(name = "PASSWD", length = 255)
private String passwd; /* password */
- @Column(name = "FULLNAME", length = 250)
+ @Column(name = "FULLNAME", length = 255)
private String fullName; /* fullName */
- @Column(name = "ADDRESS", length = 250)
+ @Column(name = "ADDRESS", length = 255)
private String address; /* address */
- @Column(name = "email", length = 250)
+ @Column(name = "email", length = 255)
private String email; /* email */
- @Column(name = "creditcard", length = 250)
+ @Column(name = "creditcard", length = 255)
//why was it credit?
private String creditCard; /* creditCard */
Modified: incubator/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/HoldingDataBeanImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/HoldingDataBeanImpl.java?rev=993546&r1=993545&r2=993546&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/HoldingDataBeanImpl.java (original)
+++ incubator/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/HoldingDataBeanImpl.java Tue Sep 7 22:18:50 2010
@@ -74,7 +74,7 @@ public class HoldingDataBeanImpl impleme
private AccountDataBeanImpl account;
@ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "QUOTE_SYMBOL", columnDefinition="VARCHAR(250)")
+ @JoinColumn(name = "QUOTE_SYMBOL", columnDefinition="VARCHAR(255)")
private QuoteDataBeanImpl quote;
public HoldingDataBeanImpl() {
Modified: incubator/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/OrderDataBeanImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/OrderDataBeanImpl.java?rev=993546&r1=993545&r2=993546&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/OrderDataBeanImpl.java (original)
+++ incubator/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/OrderDataBeanImpl.java Tue Sep 7 22:18:50 2010
@@ -70,10 +70,10 @@ public class OrderDataBeanImpl implement
@Column(name = "ORDERID", nullable = false)
private Integer orderID; /* orderID */
- @Column(name = "ORDERTYPE", length = 250)
+ @Column(name = "ORDERTYPE", length = 255)
private String orderType; /* orderType (buy, sell, etc.) */
- @Column(name = "ORDERSTATUS", length = 250)
+ @Column(name = "ORDERSTATUS", length = 255)
private String orderStatus; /*
* orderStatus (open, processing, completed,
* closed, canceled)
@@ -100,7 +100,7 @@ public class OrderDataBeanImpl implement
private AccountDataBeanImpl account;
@ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "QUOTE_SYMBOL", columnDefinition="VARCHAR(250)")
+ @JoinColumn(name = "QUOTE_SYMBOL", columnDefinition="VARCHAR(255)")
private QuoteDataBeanImpl quote;
@OneToOne(fetch = FetchType.LAZY)
Modified: incubator/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/QuoteDataBeanImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/QuoteDataBeanImpl.java?rev=993546&r1=993545&r2=993546&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/QuoteDataBeanImpl.java (original)
+++ incubator/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/QuoteDataBeanImpl.java Tue Sep 7 22:18:50 2010
@@ -58,10 +58,10 @@ public class QuoteDataBeanImpl implement
private static final long serialVersionUID = 8476917690278143517L;
@Id
- @Column(name = "SYMBOL", nullable = false, length = 250)
+ @Column(name = "SYMBOL", nullable = false, length = 255)
private String symbol; /* symbol */
- @Column(name = "COMPANYNAME", length = 250)
+ @Column(name = "COMPANYNAME", length = 255)
private String companyName; /* companyName */
@Column(name = "VOLUME", nullable = false)
Modified: incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeBuildDB.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeBuildDB.java?rev=993546&r1=993545&r2=993546&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeBuildDB.java (original)
+++ incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeBuildDB.java Tue Sep 7 22:18:50 2010
@@ -18,9 +18,10 @@ package org.apache.aries.samples.ariestr
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileReader;
+import java.io.InputStreamReader;
import java.io.IOException;
import java.math.BigDecimal;
+import java.net.URL;
import java.util.ArrayList;
import org.apache.aries.samples.ariestrader.api.TradeDBManager;
@@ -48,14 +49,14 @@ public class TradeBuildDB {
* Populate a Trade DB using standard out as a log
*/
public TradeBuildDB() throws Exception {
- this(new java.io.PrintWriter(System.out), null);
+ this(new java.io.PrintWriter(System.out), false);
}
/**
* Re-create the AriesTrader db tables and populate them OR just populate a
* AriesTrader DB, logging to the provided output stream
*/
- public TradeBuildDB(java.io.PrintWriter out, String warPath)
+ public TradeBuildDB(java.io.PrintWriter out, boolean createTables)
throws Exception {
String symbol, companyName;
int errorCount = 0; // Give up gracefully after 10 errors
@@ -73,10 +74,11 @@ public class TradeBuildDB {
+ "This operation will take several minutes. Please wait...</HEAD>");
out.println("<BODY>");
- if (warPath != null) {
+ if (createTables) {
boolean success = false;
String dbProductName = null;
- File ddlFile = null;
+ String fileLocation = null;
+ URL ddlFile = null;
Object[] sqlBuffer = null;
// Find out the Database being used
@@ -95,37 +97,20 @@ public class TradeBuildDB {
try {
out.println("<BR>TradeBuildDB: **** Database Product detected: "
+ dbProductName + " ****</BR>");
- if (warPath.equals("")) { // if empty warPath provided assume this is Aries under the Equinox test harness
- ddlFile = new File("tradeDB.sql");
- } else if (dbProductName.startsWith("DB2/")) { // if db is DB2
- ddlFile = new File(warPath + File.separatorChar + "dbscripts"
- + File.separatorChar + "db2" + File.separatorChar + "Table.ddl");
+ if (dbProductName.startsWith("DB2/")) { // if db is DB2
+ fileLocation = File.separatorChar + "dbscripts" + File.separatorChar + "db2" + File.separatorChar + "Table.ddl";
} else if (dbProductName.startsWith("Apache Derby")) { // if db is Derby
- ddlFile = new File(warPath + File.separatorChar + "dbscripts"
- + File.separatorChar + "derby" + File.separatorChar + "Table.ddl");
+ fileLocation = File.separatorChar + "dbscripts" + File.separatorChar + "derby" + File.separatorChar + "Table.ddl";
} else if (dbProductName.startsWith("Oracle")) { // if the Db is Oracle
- ddlFile = new File(warPath + File.separatorChar + "dbscripts"
- + File.separatorChar + "oracle" + File.separatorChar + "Table.ddl");
+ fileLocation = File.separatorChar + "dbscripts" + File.separatorChar + "oracle" + File.separatorChar + "Table.ddl";
} else { // Unsupported "Other" Database
- ddlFile = new File(warPath + File.separatorChar + "dbscripts"
- + File.separatorChar + "other" + File.separatorChar + "Table.ddl");
+ fileLocation = File.separatorChar + "dbscripts" + File.separatorChar + "other" + File.separatorChar + "Table.ddl";
out.println("<BR>TradeBuildDB: **** This Database is "
+ "unsupported/untested use at your own risk ****</BR>");
}
- if (!ddlFile.exists()) {
- Log.error("TradeBuildDB: DDL file doesnt exist at path "
- + ddlFile.getCanonicalPath()
- + " , please provide the file and retry");
- out.println("<BR>TradeBuildDB: DDL file doesnt exist at path <I>"
- + ddlFile.getCanonicalPath() +
- "</I> , please provide the file and retry ****</BR></BODY>");
- return;
- }
- out.println("<BR>TradeBuildDB: **** The DDL file at path <I>"
- + ddlFile.getCanonicalPath()
- + "</I> will be used ****</BR>");
- out.flush();
+ ddlFile = this.getClass().getResource(fileLocation);
+
} catch (Exception e) {
Log.error(e,
"TradeBuildDB: Unable to locate DDL file for the specified database");
@@ -259,15 +244,17 @@ public class TradeBuildDB {
out.println("</BODY>");
}
- public Object[] parseDDLToBuffer(File ddlFile) throws Exception {
+ public Object[] parseDDLToBuffer(URL ddlFile) throws Exception {
BufferedReader br = null;
+ InputStreamReader ir = null;
ArrayList sqlBuffer = new ArrayList(30); // initial capacity 30 assuming we have 30 ddl-sql statements to read
try {
if (Log.doTrace())
Log.traceEnter("TradeBuildDB:parseDDLToBuffer - " + ddlFile);
- br = new BufferedReader(new FileReader(ddlFile));
+ ir = new InputStreamReader(ddlFile.openStream());
+ br = new BufferedReader(ir);
String s;
String sql = new String();
while ((s = br.readLine()) != null) {
Modified: incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeConfigServlet.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeConfigServlet.java?rev=993546&r1=993545&r2=993546&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeConfigServlet.java (original)
+++ incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeConfigServlet.java Tue Sep 7 22:18:50 2010
@@ -409,15 +409,13 @@ public class TradeConfigServlet extends
else if (action.equals("buildDB"))
{
resp.setContentType("text/html");
- new TradeBuildDB(resp.getWriter(), null);
+ new TradeBuildDB(resp.getWriter(), false);
result = "AriesTrader Database Built - " + TradeConfig.getMAX_USERS() + "users created";
}
else if (action.equals("buildDBTables"))
{
resp.setContentType("text/html");
- String path = getServletConfig().getServletContext().getRealPath("/");
- if (path == null) path=""; // if there is no real path assume this is Apache Aries in Equinox test harness
- new TradeBuildDB(resp.getWriter(), path);
+ new TradeBuildDB(resp.getWriter(), true);
}
doConfigDisplay(req, resp, result + "Current AriesTrader Configuration:");
}
Modified: incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/db2/Table.ddl
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/db2/Table.ddl?rev=993546&r1=993545&r2=993546&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/db2/Table.ddl (original)
+++ incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/db2/Table.ddl Tue Sep 7 22:18:50 2010
@@ -28,18 +28,18 @@ CREATE TABLE HOLDINGEJB
QUANTITY DOUBLE NOT NULL,
PURCHASEDATE TIMESTAMP,
ACCOUNT_ACCOUNTID INTEGER,
- QUOTE_SYMBOL VARCHAR(250));
+ QUOTE_SYMBOL VARCHAR(255));
ALTER TABLE HOLDINGEJB
ADD CONSTRAINT PK_HOLDINGEJB PRIMARY KEY (HOLDINGID);
CREATE TABLE ACCOUNTPROFILEEJB
- (ADDRESS VARCHAR(250),
- PASSWD VARCHAR(250),
- USERID VARCHAR(250) NOT NULL,
- EMAIL VARCHAR(250),
- CREDITCARD VARCHAR(250),
- FULLNAME VARCHAR(250));
+ (ADDRESS VARCHAR(255),
+ PASSWD VARCHAR(255),
+ USERID VARCHAR(255) NOT NULL,
+ EMAIL VARCHAR(255),
+ CREDITCARD VARCHAR(255),
+ FULLNAME VARCHAR(255));
ALTER TABLE ACCOUNTPROFILEEJB
ADD CONSTRAINT PK_ACCOUNTPROFILE2 PRIMARY KEY (USERID);
@@ -50,8 +50,8 @@ CREATE TABLE QUOTEEJB
VOLUME DOUBLE NOT NULL,
PRICE DECIMAL(14, 2),
HIGH DECIMAL(14, 2),
- COMPANYNAME VARCHAR(250),
- SYMBOL VARCHAR(250) NOT NULL,
+ COMPANYNAME VARCHAR(255),
+ SYMBOL VARCHAR(255) NOT NULL,
CHANGE1 DOUBLE NOT NULL);
ALTER TABLE QUOTEEJB
@@ -59,7 +59,7 @@ ALTER TABLE QUOTEEJB
CREATE TABLE KEYGENEJB
(KEYVAL INTEGER NOT NULL,
- KEYNAME VARCHAR(250) NOT NULL);
+ KEYNAME VARCHAR(255) NOT NULL);
ALTER TABLE KEYGENEJB
ADD CONSTRAINT PK_KEYGENEJB PRIMARY KEY (KEYNAME);
@@ -72,7 +72,7 @@ CREATE TABLE ACCOUNTEJB
ACCOUNTID INTEGER NOT NULL,
LASTLOGIN TIMESTAMP,
LOGINCOUNT INTEGER NOT NULL,
- PROFILE_USERID VARCHAR(250));
+ PROFILE_USERID VARCHAR(255));
ALTER TABLE ACCOUNTEJB
ADD CONSTRAINT PK_ACCOUNTEJB PRIMARY KEY (ACCOUNTID);
@@ -80,14 +80,14 @@ ALTER TABLE ACCOUNTEJB
CREATE TABLE ORDEREJB
(ORDERFEE DECIMAL(14, 2),
COMPLETIONDATE TIMESTAMP,
- ORDERTYPE VARCHAR(250),
- ORDERSTATUS VARCHAR(250),
+ ORDERTYPE VARCHAR(255),
+ ORDERSTATUS VARCHAR(255),
PRICE DECIMAL(14, 2),
QUANTITY DOUBLE NOT NULL,
OPENDATE TIMESTAMP,
ORDERID INTEGER NOT NULL,
ACCOUNT_ACCOUNTID INTEGER,
- QUOTE_SYMBOL VARCHAR(250),
+ QUOTE_SYMBOL VARCHAR(255),
HOLDING_HOLDINGID INTEGER);
ALTER TABLE ORDEREJB
Modified: incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/derby/Table.ddl
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/derby/Table.ddl?rev=993546&r1=993545&r2=993546&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/derby/Table.ddl (original)
+++ incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/derby/Table.ddl Tue Sep 7 22:18:50 2010
@@ -34,18 +34,18 @@ CREATE TABLE HOLDINGEJB
QUANTITY DOUBLE NOT NULL,
PURCHASEDATE TIMESTAMP,
ACCOUNT_ACCOUNTID INTEGER,
- QUOTE_SYMBOL VARCHAR(250));
+ QUOTE_SYMBOL VARCHAR(255));
ALTER TABLE HOLDINGEJB
ADD CONSTRAINT PK_HOLDINGEJB PRIMARY KEY (HOLDINGID);
CREATE TABLE ACCOUNTPROFILEEJB
- (ADDRESS VARCHAR(250),
- PASSWD VARCHAR(250),
- USERID VARCHAR(250) NOT NULL,
- EMAIL VARCHAR(250),
- CREDITCARD VARCHAR(250),
- FULLNAME VARCHAR(250));
+ (ADDRESS VARCHAR(255),
+ PASSWD VARCHAR(255),
+ USERID VARCHAR(255) NOT NULL,
+ EMAIL VARCHAR(255),
+ CREDITCARD VARCHAR(255),
+ FULLNAME VARCHAR(255));
ALTER TABLE ACCOUNTPROFILEEJB
ADD CONSTRAINT PK_ACCOUNTPROFILE2 PRIMARY KEY (USERID);
@@ -56,8 +56,8 @@ CREATE TABLE QUOTEEJB
VOLUME DOUBLE NOT NULL,
PRICE DECIMAL(14, 2),
HIGH DECIMAL(14, 2),
- COMPANYNAME VARCHAR(250),
- SYMBOL VARCHAR(250) NOT NULL,
+ COMPANYNAME VARCHAR(255),
+ SYMBOL VARCHAR(255) NOT NULL,
CHANGE1 DOUBLE NOT NULL);
ALTER TABLE QUOTEEJB
@@ -65,7 +65,7 @@ ALTER TABLE QUOTEEJB
CREATE TABLE KEYGENEJB
(KEYVAL INTEGER NOT NULL,
- KEYNAME VARCHAR(250) NOT NULL);
+ KEYNAME VARCHAR(255) NOT NULL);
ALTER TABLE KEYGENEJB
ADD CONSTRAINT PK_KEYGENEJB PRIMARY KEY (KEYNAME);
@@ -78,7 +78,7 @@ CREATE TABLE ACCOUNTEJB
ACCOUNTID INTEGER NOT NULL,
LASTLOGIN TIMESTAMP,
LOGINCOUNT INTEGER NOT NULL,
- PROFILE_USERID VARCHAR(250));
+ PROFILE_USERID VARCHAR(255));
ALTER TABLE ACCOUNTEJB
ADD CONSTRAINT PK_ACCOUNTEJB PRIMARY KEY (ACCOUNTID);
@@ -86,14 +86,14 @@ ALTER TABLE ACCOUNTEJB
CREATE TABLE ORDEREJB
(ORDERFEE DECIMAL(14, 2),
COMPLETIONDATE TIMESTAMP,
- ORDERTYPE VARCHAR(250),
- ORDERSTATUS VARCHAR(250),
+ ORDERTYPE VARCHAR(255),
+ ORDERSTATUS VARCHAR(255),
PRICE DECIMAL(14, 2),
QUANTITY DOUBLE NOT NULL,
OPENDATE TIMESTAMP,
ORDERID INTEGER NOT NULL,
ACCOUNT_ACCOUNTID INTEGER,
- QUOTE_SYMBOL VARCHAR(250),
+ QUOTE_SYMBOL VARCHAR(255),
HOLDING_HOLDINGID INTEGER);
ALTER TABLE ORDEREJB
Modified: incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/oracle/Table.ddl
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/oracle/Table.ddl?rev=993546&r1=993545&r2=993546&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/oracle/Table.ddl (original)
+++ incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/oracle/Table.ddl Tue Sep 7 22:18:50 2010
@@ -28,18 +28,18 @@ CREATE TABLE HOLDINGEJB
QUANTITY NUMBER NOT NULL,
PURCHASEDATE DATE NULL,
ACCOUNT_ACCOUNTID INTEGER NULL,
- QUOTE_SYMBOL VARCHAR2(250) NULL);
+ QUOTE_SYMBOL VARCHAR2(255) NULL);
ALTER TABLE HOLDINGEJB
ADD CONSTRAINT PK_HOLDINGEJB PRIMARY KEY (HOLDINGID);
CREATE TABLE ACCOUNTPROFILEEJB
- (ADDRESS VARCHAR2(250) NULL,
- PASSWD VARCHAR2(250) NULL,
- USERID VARCHAR2(250) NOT NULL,
- EMAIL VARCHAR2(250) NULL,
- CREDITCARD VARCHAR2(250) NULL,
- FULLNAME VARCHAR2(250) NULL);
+ (ADDRESS VARCHAR2(255) NULL,
+ PASSWD VARCHAR2(255) NULL,
+ USERID VARCHAR2(255) NOT NULL,
+ EMAIL VARCHAR2(255) NULL,
+ CREDITCARD VARCHAR2(255) NULL,
+ FULLNAME VARCHAR2(255) NULL);
ALTER TABLE ACCOUNTPROFILEEJB
ADD CONSTRAINT PK_ACCOUNTPROFILEEJB PRIMARY KEY (USERID);
@@ -50,8 +50,8 @@ CREATE TABLE QUOTEEJB
VOLUME NUMBER NOT NULL,
PRICE DECIMAL(14, 2) NULL,
HIGH DECIMAL(14, 2) NULL,
- COMPANYNAME VARCHAR2(250) NULL,
- SYMBOL VARCHAR2(250) NOT NULL,
+ COMPANYNAME VARCHAR2(255) NULL,
+ SYMBOL VARCHAR2(255) NOT NULL,
CHANGE1 NUMBER NOT NULL);
ALTER TABLE QUOTEEJB
@@ -59,7 +59,7 @@ ALTER TABLE QUOTEEJB
CREATE TABLE KEYGENEJB
(KEYVAL INTEGER NOT NULL,
- KEYNAME VARCHAR2(250) NOT NULL);
+ KEYNAME VARCHAR2(255) NOT NULL);
ALTER TABLE KEYGENEJB
ADD CONSTRAINT PK_KEYGENEJB PRIMARY KEY (KEYNAME);
@@ -72,7 +72,7 @@ CREATE TABLE ACCOUNTEJB
ACCOUNTID INTEGER NOT NULL,
LASTLOGIN DATE NULL,
LOGINCOUNT INTEGER NOT NULL,
- PROFILE_USERID VARCHAR2(250) NULL);
+ PROFILE_USERID VARCHAR2(255) NULL);
ALTER TABLE ACCOUNTEJB
ADD CONSTRAINT PK_ACCOUNTEJB PRIMARY KEY (ACCOUNTID);
@@ -80,14 +80,14 @@ ALTER TABLE ACCOUNTEJB
CREATE TABLE ORDEREJB
(ORDERFEE DECIMAL(14, 2) NULL,
COMPLETIONDATE DATE NULL,
- ORDERTYPE VARCHAR2(250) NULL,
- ORDERSTATUS VARCHAR2(250) NULL,
+ ORDERTYPE VARCHAR2(255) NULL,
+ ORDERSTATUS VARCHAR2(255) NULL,
PRICE DECIMAL(14, 2) NULL,
QUANTITY NUMBER NOT NULL,
OPENDATE DATE NULL,
ORDERID INTEGER NOT NULL,
ACCOUNT_ACCOUNTID INTEGER NULL,
- QUOTE_SYMBOL VARCHAR2(250) NULL,
+ QUOTE_SYMBOL VARCHAR2(255) NULL,
HOLDING_HOLDINGID INTEGER NULL);
ALTER TABLE ORDEREJB
Modified: incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/other/Table.ddl
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/other/Table.ddl?rev=993546&r1=993545&r2=993546&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/other/Table.ddl (original)
+++ incubator/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/other/Table.ddl Tue Sep 7 22:18:50 2010
@@ -28,18 +28,18 @@ CREATE TABLE HOLDINGEJB
QUANTITY DOUBLE NOT NULL,
PURCHASEDATE TIMESTAMP,
ACCOUNT_ACCOUNTID INTEGER,
- QUOTE_SYMBOL VARCHAR(250));
+ QUOTE_SYMBOL VARCHAR(255));
ALTER TABLE HOLDINGEJB
ADD CONSTRAINT PK_HOLDINGEJB PRIMARY KEY (HOLDINGID);
CREATE TABLE ACCOUNTPROFILEEJB
- (ADDRESS VARCHAR(250),
- PASSWD VARCHAR(250),
- USERID VARCHAR(250) NOT NULL,
- EMAIL VARCHAR(250),
- CREDITCARD VARCHAR(250),
- FULLNAME VARCHAR(250));
+ (ADDRESS VARCHAR(255),
+ PASSWD VARCHAR(255),
+ USERID VARCHAR(255) NOT NULL,
+ EMAIL VARCHAR(255),
+ CREDITCARD VARCHAR(255),
+ FULLNAME VARCHAR(255));
ALTER TABLE ACCOUNTPROFILEEJB
ADD CONSTRAINT PK_ACCOUNTPROFILE2 PRIMARY KEY (USERID);
@@ -50,8 +50,8 @@ CREATE TABLE QUOTEEJB
VOLUME DOUBLE NOT NULL,
PRICE DECIMAL(14, 2),
HIGH DECIMAL(14, 2),
- COMPANYNAME VARCHAR(250),
- SYMBOL VARCHAR(250) NOT NULL,
+ COMPANYNAME VARCHAR(255),
+ SYMBOL VARCHAR(255) NOT NULL,
CHANGE1 DOUBLE NOT NULL);
ALTER TABLE QUOTEEJB
@@ -59,7 +59,7 @@ ALTER TABLE QUOTEEJB
CREATE TABLE KEYGENEJB
(KEYVAL INTEGER NOT NULL,
- KEYNAME VARCHAR(250) NOT NULL);
+ KEYNAME VARCHAR(255) NOT NULL);
ALTER TABLE KEYGENEJB
ADD CONSTRAINT PK_KEYGENEJB PRIMARY KEY (KEYNAME);
@@ -72,7 +72,7 @@ CREATE TABLE ACCOUNTEJB
ACCOUNTID INTEGER NOT NULL,
LASTLOGIN TIMESTAMP,
LOGINCOUNT INTEGER NOT NULL,
- PROFILE_USERID VARCHAR(250));
+ PROFILE_USERID VARCHAR(255));
ALTER TABLE ACCOUNTEJB
ADD CONSTRAINT PK_ACCOUNTEJB PRIMARY KEY (ACCOUNTID);
@@ -80,14 +80,14 @@ ALTER TABLE ACCOUNTEJB
CREATE TABLE ORDEREJB
(ORDERFEE DECIMAL(14, 2),
COMPLETIONDATE TIMESTAMP,
- ORDERTYPE VARCHAR(250),
- ORDERSTATUS VARCHAR(250),
+ ORDERTYPE VARCHAR(255),
+ ORDERSTATUS VARCHAR(255),
PRICE DECIMAL(14, 2),
QUANTITY DOUBLE NOT NULL,
OPENDATE TIMESTAMP,
ORDERID INTEGER NOT NULL,
ACCOUNT_ACCOUNTID INTEGER,
- QUOTE_SYMBOL VARCHAR(250),
+ QUOTE_SYMBOL VARCHAR(255),
HOLDING_HOLDINGID INTEGER);
ALTER TABLE ORDEREJB