[jboss-svn-commits] JBL Code SVN: r33747 - in labs/jbossesb/trunk/product: samples/quickstarts/spring_jpetstore/hsqldb and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jul 6 09:19:55 EDT 2010
Author: tfennelly
Date: 2010-07-06 09:19:53 -0400 (Tue, 06 Jul 2010)
New Revision: 33747
Added:
labs/jbossesb/trunk/product/services/spring/lib/ext/aopalliance-1.0.jar
labs/jbossesb/trunk/product/services/spring/lib/ext/com.springsource.net.sf.cglib-2.2.0.jar
labs/jbossesb/trunk/product/services/spring/lib/ext/com.springsource.org.aspectj.tools-1.6.6.RELEASE.jar
labs/jbossesb/trunk/product/services/spring/lib/ext/com.springsource.org.aspectj.weaver-1.6.8.RELEASE.jar
labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.aop-3.0.2.RELEASE.jar
labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.asm-3.0.2.RELEASE.jar
labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.aspects-3.0.2.RELEASE.jar
labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.beans-3.0.2.RELEASE.jar
labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.context-3.0.2.RELEASE.jar
labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.context.support-3.0.2.RELEASE.jar
labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.core-3.0.2.RELEASE.jar
labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.expression-3.0.2.RELEASE.jar
labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.jdbc-3.0.2.RELEASE.jar
labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.jms-3.0.2.RELEASE.jar
labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.orm-3.0.2.RELEASE.jar
labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.oxm-3.0.2.RELEASE.jar
labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.test-3.0.2.RELEASE.jar
labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.transaction-3.0.2.RELEASE.jar
labs/jbossesb/trunk/product/services/spring/lib/ext/snowdrop/
labs/jbossesb/trunk/product/services/spring/lib/ext/snowdrop/snowdrop-deployers-1.1.0.GA.jar
labs/jbossesb/trunk/product/services/spring/lib/ext/snowdrop/snowdrop-vfs-1.1.0.GA.jar
labs/jbossesb/trunk/product/services/spring/lib/ext/snowdrop/snowdrop-weaving-1.1.0.GA.jar
Removed:
labs/jbossesb/trunk/product/services/spring/lib/ext/aspectjrt-1.6.1.jar
labs/jbossesb/trunk/product/services/spring/lib/ext/aspectjweaver-1.6.1.jar
labs/jbossesb/trunk/product/services/spring/lib/ext/cglib-nodep-2.1_3.jar
labs/jbossesb/trunk/product/services/spring/lib/ext/spring-2.5.6.SEC01.jar
labs/jbossesb/trunk/product/services/spring/lib/ext/spring-aspects-2.5.6.SEC01.jar
labs/jbossesb/trunk/product/services/spring/lib/ext/spring-mock-2.0.8.jar
Modified:
labs/jbossesb/trunk/product/.classpath
labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.properties
labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.script
labs/jbossesb/trunk/product/services/spring/build.xml
labs/jbossesb/trunk/product/services/spring/src/main/java/org/jboss/soa/esb/actions/AbstractSpringAction.java
Log:
https://jira.jboss.org/browse/JBESB-3292
Spring Integration needs to be updated to use SNOWDROP's VFSClassPathXmlApplicationContext
Modified: labs/jbossesb/trunk/product/.classpath
===================================================================
--- labs/jbossesb/trunk/product/.classpath 2010-07-06 12:31:56 UTC (rev 33746)
+++ labs/jbossesb/trunk/product/.classpath 2010-07-06 13:19:53 UTC (rev 33747)
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="**/.svn/" kind="src" path="rosetta/src"/>
+ <classpathentry kind="src" path="samples/quickstarts/spring_aop/src"/>
+ <classpathentry kind="src" path="samples/quickstarts/spring_jpetstore/src"/>
<classpathentry excluding="**/.svn/" kind="src" path="rosetta/tests/resources"/>
<classpathentry excluding="**/.svn/" kind="src" path="rosetta/tests/src"/>
<classpathentry excluding="**/.svn/" kind="src" path="services/jbossesb/src/main/java"/>
@@ -168,10 +170,26 @@
<classpathentry kind="lib" path="services/soapui-client/src/lib/soapui-1.7.1.jar"/>
<classpathentry kind="lib" path="services/soapui-client/src/lib/soapui-xmlbeans-1.7.jar"/>
<classpathentry kind="lib" path="services/soapui-client/src/lib/soap-xmlbeans-1.2.jar"/>
- <classpathentry kind="lib" path="services/spring/lib/ext/spring-2.5.6.SEC01.jar"/>
<classpathentry kind="var" path="ESB_ROOT/testlib/hsqldb.jar"/>
<classpathentry kind="var" path="ESB_ROOT/testlib/junit-4.1.jar"/>
<classpathentry kind="var" path="ESB_ROOT/testlib/mockejb.jar"/>
<classpathentry kind="var" path="ESB_ROOT/testlib/mockito-all-1.8.0.jar"/>
+ <classpathentry kind="lib" path="services/spring/lib/ext/ibatis-sqlmap-2.3.4.726.jar"/>
+ <classpathentry kind="lib" path="services/spring/lib/ext/org.springframework.aop-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="services/spring/lib/ext/org.springframework.asm-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="services/spring/lib/ext/org.springframework.aspects-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="services/spring/lib/ext/org.springframework.beans-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="services/spring/lib/ext/org.springframework.context-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="services/spring/lib/ext/org.springframework.context.support-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="services/spring/lib/ext/org.springframework.core-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="services/spring/lib/ext/org.springframework.expression-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="services/spring/lib/ext/org.springframework.jms-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="services/spring/lib/ext/org.springframework.orm-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="services/spring/lib/ext/org.springframework.oxm-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="services/spring/lib/ext/org.springframework.test-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="services/spring/lib/ext/aopalliance-1.0.jar"/>
+ <classpathentry kind="lib" path="services/spring/lib/ext/snowdrop/snowdrop-deployers-1.1.0.GA.jar"/>
+ <classpathentry kind="lib" path="services/spring/lib/ext/snowdrop/snowdrop-vfs-1.1.0.GA.jar"/>
+ <classpathentry kind="lib" path="services/spring/lib/ext/snowdrop/snowdrop-weaving-1.1.0.GA.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.properties
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.properties 2010-07-06 12:31:56 UTC (rev 33746)
+++ labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.properties 2010-07-06 13:19:53 UTC (rev 33747)
@@ -1,17 +1,17 @@
-#HSQL Database Engine
-#Wed Jul 08 13:43:11 BST 2009
-hsqldb.script_format=0
-runtime.gc_interval=0
-sql.enforce_strict_size=false
-hsqldb.cache_size_scale=8
-readonly=false
-hsqldb.nio_data_file=true
-hsqldb.cache_scale=14
-version=1.8.0
-hsqldb.default_table_type=memory
-hsqldb.cache_file_scale=1
-hsqldb.log_size=200
-modified=yes
-hsqldb.cache_version=1.7.0
-hsqldb.original_version=1.8.0
-hsqldb.compatible_version=1.8.0
+#HSQL Database Engine 1.8.0.8
+#Tue Jul 06 14:02:39 IST 2010
+hsqldb.script_format=0
+runtime.gc_interval=0
+sql.enforce_strict_size=false
+hsqldb.cache_size_scale=8
+readonly=false
+hsqldb.nio_data_file=true
+hsqldb.cache_scale=14
+version=1.8.0
+hsqldb.default_table_type=memory
+hsqldb.cache_file_scale=1
+hsqldb.log_size=200
+modified=yes
+hsqldb.cache_version=1.7.0
+hsqldb.original_version=1.8.0
+hsqldb.compatible_version=1.8.0
Modified: labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.script
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.script 2010-07-06 12:31:56 UTC (rev 33746)
+++ labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.script 2010-07-06 13:19:53 UTC (rev 33747)
@@ -1,133 +1,137 @@
-CREATE SCHEMA PUBLIC AUTHORIZATION DBA
-CREATE MEMORY TABLE SUPPLIER(SUPPID INTEGER NOT NULL PRIMARY KEY,NAME VARCHAR(80),STATUS VARCHAR(2) NOT NULL,ADDR1 VARCHAR(80),ADDR2 VARCHAR(80),CITY VARCHAR(80),STATE VARCHAR(80),ZIP VARCHAR(5),PHONE VARCHAR(80))
-CREATE MEMORY TABLE SIGNON(USERNAME VARCHAR(25) NOT NULL PRIMARY KEY,PASSWORD VARCHAR(25) NOT NULL)
-CREATE MEMORY TABLE ACCOUNT(USERID VARCHAR(80) NOT NULL PRIMARY KEY,EMAIL VARCHAR(80) NOT NULL,FIRSTNAME VARCHAR(80) NOT NULL,LASTNAME VARCHAR(80) NOT NULL,STATUS VARCHAR(2),ADDR1 VARCHAR(80) NOT NULL,ADDR2 VARCHAR(40),CITY VARCHAR(80) NOT NULL,STATE VARCHAR(80) NOT NULL,ZIP VARCHAR(20) NOT NULL,COUNTRY VARCHAR(20) NOT NULL,PHONE VARCHAR(80) NOT NULL)
-CREATE MEMORY TABLE PROFILE(USERID VARCHAR(80) NOT NULL PRIMARY KEY,LANGPREF VARCHAR(80) NOT NULL,FAVCATEGORY VARCHAR(30),MYLISTOPT INTEGER,BANNEROPT INTEGER)
-CREATE MEMORY TABLE BANNERDATA(FAVCATEGORY VARCHAR(80) NOT NULL PRIMARY KEY,BANNERNAME VARCHAR(255))
-CREATE MEMORY TABLE ORDERS(ORDERID INTEGER NOT NULL PRIMARY KEY,USERID VARCHAR(80) NOT NULL,ORDERDATE DATE NOT NULL,SHIPADDR1 VARCHAR(80) NOT NULL,SHIPADDR2 VARCHAR(80),SHIPCITY VARCHAR(80) NOT NULL,SHIPSTATE VARCHAR(80) NOT NULL,SHIPZIP VARCHAR(20) NOT NULL,SHIPCOUNTRY VARCHAR(20) NOT NULL,BILLADDR1 VARCHAR(80) NOT NULL,BILLADDR2 VARCHAR(80),BILLCITY VARCHAR(80) NOT NULL,BILLSTATE VARCHAR(80) NOT NULL,BILLZIP VARCHAR(20) NOT NULL,BILLCOUNTRY VARCHAR(20) NOT NULL,COURIER VARCHAR(80) NOT NULL,TOTALPRICE DECIMAL(10,2) NOT NULL,BILLTOFIRSTNAME VARCHAR(80) NOT NULL,BILLTOLASTNAME VARCHAR(80) NOT NULL,SHIPTOFIRSTNAME VARCHAR(80) NOT NULL,SHIPTOLASTNAME VARCHAR(80) NOT NULL,CREDITCARD VARCHAR(80) NOT NULL,EXPRDATE VARCHAR(7) NOT NULL,CARDTYPE VARCHAR(80) NOT NULL,LOCALE VARCHAR(80) NOT NULL)
-CREATE MEMORY TABLE ORDERSTATUS(ORDERID INTEGER NOT NULL,LINENUM INTEGER NOT NULL,TIMESTAMP DATE NOT NULL,STATUS VARCHAR(2) NOT NULL,CONSTRAINT PK_ORDERSTATUS PRIMARY KEY(ORDERID,LINENUM))
-CREATE MEMORY TABLE LINEITEM(ORDERID INTEGER NOT NULL,LINENUM INTEGER NOT NULL,ITEMID VARCHAR(10) NOT NULL,QUANTITY INTEGER NOT NULL,UNITPRICE DECIMAL(10,2) NOT NULL,CONSTRAINT PK_LINEITEM PRIMARY KEY(ORDERID,LINENUM))
-CREATE MEMORY TABLE CATEGORY(CATID VARCHAR(10) NOT NULL PRIMARY KEY,NAME VARCHAR(80),DESCN VARCHAR(255))
-CREATE MEMORY TABLE PRODUCT(PRODUCTID VARCHAR(10) NOT NULL PRIMARY KEY,CATEGORY VARCHAR(10) NOT NULL,NAME VARCHAR(80),DESCN VARCHAR(255),CONSTRAINT FK_PRODUCT_1 FOREIGN KEY(CATEGORY) REFERENCES CATEGORY(CATID))
-CREATE INDEX PRODUCTCAT ON PRODUCT(CATEGORY)
-CREATE INDEX PRODUCTNAME ON PRODUCT(NAME)
-CREATE MEMORY TABLE ITEM(ITEMID VARCHAR(10) NOT NULL PRIMARY KEY,PRODUCTID VARCHAR(10) NOT NULL,LISTPRICE DECIMAL(10,2),UNITCOST DECIMAL(10,2),SUPPLIER INTEGER,STATUS VARCHAR(2),ATTR1 VARCHAR(80),ATTR2 VARCHAR(80),ATTR3 VARCHAR(80),ATTR4 VARCHAR(80),ATTR5 VARCHAR(80),CONSTRAINT FK_ITEM_1 FOREIGN KEY(PRODUCTID) REFERENCES PRODUCT(PRODUCTID),CONSTRAINT FK_ITEM_2 FOREIGN KEY(SUPPLIER) REFERENCES SUPPLIER(SUPPID))
-CREATE INDEX ITEMPROD ON ITEM(PRODUCTID)
-CREATE MEMORY TABLE INVENTORY(ITEMID VARCHAR(10) NOT NULL PRIMARY KEY,QTY INTEGER NOT NULL)
-CREATE MEMORY TABLE SEQUENCE(NAME VARCHAR(30) NOT NULL PRIMARY KEY,NEXTID INTEGER NOT NULL)
-CREATE USER SA PASSWORD ""
-GRANT DBA TO SA
-SET WRITE_DELAY 60
-SET SCHEMA PUBLIC
-INSERT INTO SUPPLIER VALUES(1,'XYZ Pets','AC','600 Avon Way','','Los Angeles','CA','94024','212-947-0797')
-INSERT INTO SUPPLIER VALUES(2,'ABC Pets','AC','700 Abalone Way','','San Francisco ','CA','94024','415-947-0797')
-INSERT INTO SIGNON VALUES('ACID','ACID')
-INSERT INTO SIGNON VALUES('j2ee','j2ee')
-INSERT INTO ACCOUNT VALUES('ACID','acid at yourdomain.com','ABC','XYX','OK','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','94303','USA','555-555-5555')
-INSERT INTO ACCOUNT VALUES('j2ee','yourname at yourdomain.com','ABC','XYX','OK','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','94303','USA','555-555-5555')
-INSERT INTO PROFILE VALUES('ACID','english','CATS',1,1)
-INSERT INTO PROFILE VALUES('j2ee','english','DOGS',1,1)
-INSERT INTO BANNERDATA VALUES('BIRDS','<image src="../images/banner_birds.gif">')
-INSERT INTO BANNERDATA VALUES('CATS','<image src="../images/banner_cats.gif">')
-INSERT INTO BANNERDATA VALUES('DOGS','<image src="../images/banner_dogs.gif">')
-INSERT INTO BANNERDATA VALUES('FISH','<image src="../images/banner_fish.gif">')
-INSERT INTO BANNERDATA VALUES('REPTILES','<image src="../images/banner_reptiles.gif">')
-INSERT INTO ORDERS VALUES(1000,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES(1001,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES(1002,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES(1003,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES(1004,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES(1005,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES(1006,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES(1007,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES(1008,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.5,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES(1009,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',32.5,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERSTATUS VALUES(1000,1000,'2007-05-25','P')
-INSERT INTO ORDERSTATUS VALUES(1001,1001,'2007-05-25','P')
-INSERT INTO ORDERSTATUS VALUES(1002,1002,'2007-05-25','P')
-INSERT INTO ORDERSTATUS VALUES(1003,1003,'2007-05-25','P')
-INSERT INTO ORDERSTATUS VALUES(1004,1004,'2007-05-25','P')
-INSERT INTO ORDERSTATUS VALUES(1005,1005,'2007-05-25','P')
-INSERT INTO ORDERSTATUS VALUES(1006,1006,'2007-05-25','P')
-INSERT INTO ORDERSTATUS VALUES(1007,1007,'2007-05-25','P')
-INSERT INTO ORDERSTATUS VALUES(1008,1008,'2007-05-25','P')
-INSERT INTO ORDERSTATUS VALUES(1009,1009,'2007-05-25','P')
-INSERT INTO CATEGORY VALUES('BIRDS','Birds','<image src="../images/birds_icon.gif"><font size="5" color="blue"> Birds</font>')
-INSERT INTO CATEGORY VALUES('CATS','Cats','<image src="../images/cats_icon.gif"><font size="5" color="blue"> Cats</font>')
-INSERT INTO CATEGORY VALUES('DOGS','Dogs','<image src="../images/dogs_icon.gif"><font size="5" color="blue"> Dogs</font>')
-INSERT INTO CATEGORY VALUES('FISH','Fish','<image src="../images/fish_icon.gif"><font size="5" color="blue"> Fish</font>')
-INSERT INTO CATEGORY VALUES('REPTILES','Reptiles','<image src="../images/reptiles_icon.gif"><font size="5" color="blue"> Reptiles</font>')
-INSERT INTO PRODUCT VALUES('AV-CB-01','BIRDS','Amazon Parrot','<image src="../images/bird4.gif">Great companion for up to 75 years')
-INSERT INTO PRODUCT VALUES('AV-SB-02','BIRDS','Finch','<image src="../images/bird1.gif">Great stress reliever')
-INSERT INTO PRODUCT VALUES('FI-FW-01','FISH','Koi','<image src="../images/fish3.gif">Fresh Water fish from Japan')
-INSERT INTO PRODUCT VALUES('FI-FW-02','FISH','Goldfish','<image src="../images/fish2.gif">Fresh Water fish from China')
-INSERT INTO PRODUCT VALUES('FI-SW-01','FISH','Angelfish','<image src="../images/fish1.jpg">Salt Water fish from Australia')
-INSERT INTO PRODUCT VALUES('FI-SW-02','FISH','Tiger Shark','<image src="../images/fish4.gif">Salt Water fish from Australia')
-INSERT INTO PRODUCT VALUES('FL-DLH-02','CATS','Persian','<image src="../images/cat1.gif">Friendly house cat, doubles as a princess')
-INSERT INTO PRODUCT VALUES('FL-DSH-01','CATS','Manx','<image src="../images/cat3.gif">Great for reducing mouse populations')
-INSERT INTO PRODUCT VALUES('K9-BD-01','DOGS','Bulldog','<image src="../images/dog2.gif">Friendly dog from England')
-INSERT INTO PRODUCT VALUES('K9-CW-01','DOGS','Chihuahua','<image src="../images/dog4.gif">Great companion dog')
-INSERT INTO PRODUCT VALUES('K9-DL-01','DOGS','Dalmation','<image src="../images/dog5.gif">Great dog for a Fire Station')
-INSERT INTO PRODUCT VALUES('K9-PO-02','DOGS','Poodle','<image src="../images/dog6.gif">Cute dog from France')
-INSERT INTO PRODUCT VALUES('K9-RT-01','DOGS','Golden Retriever','<image src="../images/dog1.gif">Great family dog')
-INSERT INTO PRODUCT VALUES('K9-RT-02','DOGS','Labrador Retriever','<image src="../images/dog5.gif">Great hunting dog')
-INSERT INTO PRODUCT VALUES('RP-LI-02','REPTILES','Iguana','<image src="../images/lizard2.gif">Friendly green friend')
-INSERT INTO PRODUCT VALUES('RP-SN-01','REPTILES','Rattlesnake','<image src="../images/lizard3.gif">Doubles as a watch dog')
-INSERT INTO ITEM VALUES('EST-1','FI-SW-01',16.50,10.00,1,'P','Large',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-10','K9-DL-01',18.50,12.00,1,'P','Spotted Adult Female',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-11','RP-SN-01',18.50,12.00,1,'P','Venomless',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-12','RP-SN-01',18.50,12.00,1,'P','Rattleless',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-13','RP-LI-02',18.50,12.00,1,'P','Green Adult',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-14','FL-DSH-01',58.50,12.00,1,'P','Tailless',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-15','FL-DSH-01',23.50,12.00,1,'P','With tail',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-16','FL-DLH-02',93.50,12.00,1,'P','Adult Female',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-17','FL-DLH-02',93.50,12.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-18','AV-CB-01',193.50,92.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-19','AV-SB-02',15.50,2.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-2','FI-SW-01',16.50,10.00,1,'P','Small',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-20','FI-FW-02',5.50,2.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-21','FI-FW-02',5.29,1.00,1,'P','Adult Female',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-22','K9-RT-02',135.50,100.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-23','K9-RT-02',145.49,100.00,1,'P','Adult Female',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-24','K9-RT-02',255.50,92.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-25','K9-RT-02',325.29,90.00,1,'P','Adult Female',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-26','K9-CW-01',125.50,92.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-27','K9-CW-01',155.29,90.00,1,'P','Adult Female',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-28','K9-RT-01',155.29,90.00,1,'P','Adult Female',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-3','FI-SW-02',18.50,12.00,1,'P','Toothless',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-4','FI-FW-01',18.50,12.00,1,'P','Spotted',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-5','FI-FW-01',18.50,12.00,1,'P','Spotless',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-6','K9-BD-01',18.50,12.00,1,'P','Male Adult',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-7','K9-BD-01',18.50,12.00,1,'P','Female Puppy',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-8','K9-PO-02',18.50,12.00,1,'P','Male Puppy',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-9','K9-DL-01',18.50,12.00,1,'P','Spotless Male Puppy',NULL,NULL,NULL,NULL)
-INSERT INTO INVENTORY VALUES('EST-1',10000)
-INSERT INTO INVENTORY VALUES('EST-10',10000)
-INSERT INTO INVENTORY VALUES('EST-11',10000)
-INSERT INTO INVENTORY VALUES('EST-12',10000)
-INSERT INTO INVENTORY VALUES('EST-13',10000)
-INSERT INTO INVENTORY VALUES('EST-14',10000)
-INSERT INTO INVENTORY VALUES('EST-15',10000)
-INSERT INTO INVENTORY VALUES('EST-16',10000)
-INSERT INTO INVENTORY VALUES('EST-17',10000)
-INSERT INTO INVENTORY VALUES('EST-18',10000)
-INSERT INTO INVENTORY VALUES('EST-19',10000)
-INSERT INTO INVENTORY VALUES('EST-2',10000)
-INSERT INTO INVENTORY VALUES('EST-20',10000)
-INSERT INTO INVENTORY VALUES('EST-21',10000)
-INSERT INTO INVENTORY VALUES('EST-22',10000)
-INSERT INTO INVENTORY VALUES('EST-23',10000)
-INSERT INTO INVENTORY VALUES('EST-24',10000)
-INSERT INTO INVENTORY VALUES('EST-25',10000)
-INSERT INTO INVENTORY VALUES('EST-26',10000)
-INSERT INTO INVENTORY VALUES('EST-27',10000)
-INSERT INTO INVENTORY VALUES('EST-28',10000)
-INSERT INTO INVENTORY VALUES('EST-3',10000)
-INSERT INTO INVENTORY VALUES('EST-4',10000)
-INSERT INTO INVENTORY VALUES('EST-5',10000)
-INSERT INTO INVENTORY VALUES('EST-6',10000)
-INSERT INTO INVENTORY VALUES('EST-7',10000)
-INSERT INTO INVENTORY VALUES('EST-8',10000)
-INSERT INTO INVENTORY VALUES('EST-9',10000)
-INSERT INTO SEQUENCE VALUES('linenum',1000)
-INSERT INTO SEQUENCE VALUES('ordernum',1010)
+CREATE SCHEMA PUBLIC AUTHORIZATION DBA
+CREATE MEMORY TABLE SUPPLIER(SUPPID INTEGER NOT NULL PRIMARY KEY,NAME VARCHAR(80),STATUS VARCHAR(2) NOT NULL,ADDR1 VARCHAR(80),ADDR2 VARCHAR(80),CITY VARCHAR(80),STATE VARCHAR(80),ZIP VARCHAR(5),PHONE VARCHAR(80))
+CREATE MEMORY TABLE SIGNON(USERNAME VARCHAR(25) NOT NULL PRIMARY KEY,PASSWORD VARCHAR(25) NOT NULL)
+CREATE MEMORY TABLE ACCOUNT(USERID VARCHAR(80) NOT NULL PRIMARY KEY,EMAIL VARCHAR(80) NOT NULL,FIRSTNAME VARCHAR(80) NOT NULL,LASTNAME VARCHAR(80) NOT NULL,STATUS VARCHAR(2),ADDR1 VARCHAR(80) NOT NULL,ADDR2 VARCHAR(40),CITY VARCHAR(80) NOT NULL,STATE VARCHAR(80) NOT NULL,ZIP VARCHAR(20) NOT NULL,COUNTRY VARCHAR(20) NOT NULL,PHONE VARCHAR(80) NOT NULL)
+CREATE MEMORY TABLE PROFILE(USERID VARCHAR(80) NOT NULL PRIMARY KEY,LANGPREF VARCHAR(80) NOT NULL,FAVCATEGORY VARCHAR(30),MYLISTOPT INTEGER,BANNEROPT INTEGER)
+CREATE MEMORY TABLE BANNERDATA(FAVCATEGORY VARCHAR(80) NOT NULL PRIMARY KEY,BANNERNAME VARCHAR(255))
+CREATE MEMORY TABLE ORDERS(ORDERID INTEGER NOT NULL PRIMARY KEY,USERID VARCHAR(80) NOT NULL,ORDERDATE DATE NOT NULL,SHIPADDR1 VARCHAR(80) NOT NULL,SHIPADDR2 VARCHAR(80),SHIPCITY VARCHAR(80) NOT NULL,SHIPSTATE VARCHAR(80) NOT NULL,SHIPZIP VARCHAR(20) NOT NULL,SHIPCOUNTRY VARCHAR(20) NOT NULL,BILLADDR1 VARCHAR(80) NOT NULL,BILLADDR2 VARCHAR(80),BILLCITY VARCHAR(80) NOT NULL,BILLSTATE VARCHAR(80) NOT NULL,BILLZIP VARCHAR(20) NOT NULL,BILLCOUNTRY VARCHAR(20) NOT NULL,COURIER VARCHAR(80) NOT NULL,TOTALPRICE DECIMAL(10,2) NOT NULL,BILLTOFIRSTNAME VARCHAR(80) NOT NULL,BILLTOLASTNAME VARCHAR(80) NOT NULL,SHIPTOFIRSTNAME VARCHAR(80) NOT NULL,SHIPTOLASTNAME VARCHAR(80) NOT NULL,CREDITCARD VARCHAR(80) NOT NULL,EXPRDATE VARCHAR(7) NOT NULL,CARDTYPE VARCHAR(80) NOT NULL,LOCALE VARCHAR(80) NOT NULL)
+CREATE MEMORY TABLE ORDERSTATUS(ORDERID INTEGER NOT NULL,LINENUM INTEGER NOT NULL,TIMESTAMP DATE NOT NULL,STATUS VARCHAR(2) NOT NULL,CONSTRAINT PK_ORDERSTATUS PRIMARY KEY(ORDERID,LINENUM))
+CREATE MEMORY TABLE LINEITEM(ORDERID INTEGER NOT NULL,LINENUM INTEGER NOT NULL,ITEMID VARCHAR(10) NOT NULL,QUANTITY INTEGER NOT NULL,UNITPRICE DECIMAL(10,2) NOT NULL,CONSTRAINT PK_LINEITEM PRIMARY KEY(ORDERID,LINENUM))
+CREATE MEMORY TABLE CATEGORY(CATID VARCHAR(10) NOT NULL PRIMARY KEY,NAME VARCHAR(80),DESCN VARCHAR(255))
+CREATE MEMORY TABLE PRODUCT(PRODUCTID VARCHAR(10) NOT NULL PRIMARY KEY,CATEGORY VARCHAR(10) NOT NULL,NAME VARCHAR(80),DESCN VARCHAR(255),CONSTRAINT FK_PRODUCT_1 FOREIGN KEY(CATEGORY) REFERENCES CATEGORY(CATID))
+CREATE INDEX PRODUCTCAT ON PRODUCT(CATEGORY)
+CREATE INDEX PRODUCTNAME ON PRODUCT(NAME)
+CREATE MEMORY TABLE ITEM(ITEMID VARCHAR(10) NOT NULL PRIMARY KEY,PRODUCTID VARCHAR(10) NOT NULL,LISTPRICE DECIMAL(10,2),UNITCOST DECIMAL(10,2),SUPPLIER INTEGER,STATUS VARCHAR(2),ATTR1 VARCHAR(80),ATTR2 VARCHAR(80),ATTR3 VARCHAR(80),ATTR4 VARCHAR(80),ATTR5 VARCHAR(80),CONSTRAINT FK_ITEM_1 FOREIGN KEY(PRODUCTID) REFERENCES PRODUCT(PRODUCTID),CONSTRAINT FK_ITEM_2 FOREIGN KEY(SUPPLIER) REFERENCES SUPPLIER(SUPPID))
+CREATE INDEX ITEMPROD ON ITEM(PRODUCTID)
+CREATE MEMORY TABLE INVENTORY(ITEMID VARCHAR(10) NOT NULL PRIMARY KEY,QTY INTEGER NOT NULL)
+CREATE MEMORY TABLE SEQUENCE(NAME VARCHAR(30) NOT NULL PRIMARY KEY,NEXTID INTEGER NOT NULL)
+CREATE USER SA PASSWORD ""
+GRANT DBA TO SA
+SET WRITE_DELAY 60
+SET SCHEMA PUBLIC
+INSERT INTO SUPPLIER VALUES(1,'XYZ Pets','AC','600 Avon Way','','Los Angeles','CA','94024','212-947-0797')
+INSERT INTO SUPPLIER VALUES(2,'ABC Pets','AC','700 Abalone Way','','San Francisco ','CA','94024','415-947-0797')
+INSERT INTO SIGNON VALUES('ACID','ACID')
+INSERT INTO SIGNON VALUES('j2ee','j2ee')
+INSERT INTO ACCOUNT VALUES('ACID','acid at yourdomain.com','ABC','XYX','OK','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','94303','USA','555-555-5555')
+INSERT INTO ACCOUNT VALUES('j2ee','yourname at yourdomain.com','ABC','XYX','OK','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','94303','USA','555-555-5555')
+INSERT INTO PROFILE VALUES('ACID','english','CATS',1,1)
+INSERT INTO PROFILE VALUES('j2ee','english','DOGS',1,1)
+INSERT INTO BANNERDATA VALUES('BIRDS','<image src="../images/banner_birds.gif">')
+INSERT INTO BANNERDATA VALUES('CATS','<image src="../images/banner_cats.gif">')
+INSERT INTO BANNERDATA VALUES('DOGS','<image src="../images/banner_dogs.gif">')
+INSERT INTO BANNERDATA VALUES('FISH','<image src="../images/banner_fish.gif">')
+INSERT INTO BANNERDATA VALUES('REPTILES','<image src="../images/banner_reptiles.gif">')
+INSERT INTO ORDERS VALUES(1000,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES(1001,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES(1002,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES(1003,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES(1004,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES(1005,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES(1006,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES(1007,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES(1008,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.5,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES(1009,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',32.5,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES(1010,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',32.5,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES(1011,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',32.5,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERSTATUS VALUES(1000,1000,'2007-05-25','P')
+INSERT INTO ORDERSTATUS VALUES(1001,1001,'2007-05-25','P')
+INSERT INTO ORDERSTATUS VALUES(1002,1002,'2007-05-25','P')
+INSERT INTO ORDERSTATUS VALUES(1003,1003,'2007-05-25','P')
+INSERT INTO ORDERSTATUS VALUES(1004,1004,'2007-05-25','P')
+INSERT INTO ORDERSTATUS VALUES(1005,1005,'2007-05-25','P')
+INSERT INTO ORDERSTATUS VALUES(1006,1006,'2007-05-25','P')
+INSERT INTO ORDERSTATUS VALUES(1007,1007,'2007-05-25','P')
+INSERT INTO ORDERSTATUS VALUES(1008,1008,'2007-05-25','P')
+INSERT INTO ORDERSTATUS VALUES(1009,1009,'2007-05-25','P')
+INSERT INTO ORDERSTATUS VALUES(1010,1010,'2007-05-25','P')
+INSERT INTO ORDERSTATUS VALUES(1011,1011,'2007-05-25','P')
+INSERT INTO CATEGORY VALUES('BIRDS','Birds','<image src="../images/birds_icon.gif"><font size="5" color="blue"> Birds</font>')
+INSERT INTO CATEGORY VALUES('CATS','Cats','<image src="../images/cats_icon.gif"><font size="5" color="blue"> Cats</font>')
+INSERT INTO CATEGORY VALUES('DOGS','Dogs','<image src="../images/dogs_icon.gif"><font size="5" color="blue"> Dogs</font>')
+INSERT INTO CATEGORY VALUES('FISH','Fish','<image src="../images/fish_icon.gif"><font size="5" color="blue"> Fish</font>')
+INSERT INTO CATEGORY VALUES('REPTILES','Reptiles','<image src="../images/reptiles_icon.gif"><font size="5" color="blue"> Reptiles</font>')
+INSERT INTO PRODUCT VALUES('AV-CB-01','BIRDS','Amazon Parrot','<image src="../images/bird4.gif">Great companion for up to 75 years')
+INSERT INTO PRODUCT VALUES('AV-SB-02','BIRDS','Finch','<image src="../images/bird1.gif">Great stress reliever')
+INSERT INTO PRODUCT VALUES('FI-FW-01','FISH','Koi','<image src="../images/fish3.gif">Fresh Water fish from Japan')
+INSERT INTO PRODUCT VALUES('FI-FW-02','FISH','Goldfish','<image src="../images/fish2.gif">Fresh Water fish from China')
+INSERT INTO PRODUCT VALUES('FI-SW-01','FISH','Angelfish','<image src="../images/fish1.jpg">Salt Water fish from Australia')
+INSERT INTO PRODUCT VALUES('FI-SW-02','FISH','Tiger Shark','<image src="../images/fish4.gif">Salt Water fish from Australia')
+INSERT INTO PRODUCT VALUES('FL-DLH-02','CATS','Persian','<image src="../images/cat1.gif">Friendly house cat, doubles as a princess')
+INSERT INTO PRODUCT VALUES('FL-DSH-01','CATS','Manx','<image src="../images/cat3.gif">Great for reducing mouse populations')
+INSERT INTO PRODUCT VALUES('K9-BD-01','DOGS','Bulldog','<image src="../images/dog2.gif">Friendly dog from England')
+INSERT INTO PRODUCT VALUES('K9-CW-01','DOGS','Chihuahua','<image src="../images/dog4.gif">Great companion dog')
+INSERT INTO PRODUCT VALUES('K9-DL-01','DOGS','Dalmation','<image src="../images/dog5.gif">Great dog for a Fire Station')
+INSERT INTO PRODUCT VALUES('K9-PO-02','DOGS','Poodle','<image src="../images/dog6.gif">Cute dog from France')
+INSERT INTO PRODUCT VALUES('K9-RT-01','DOGS','Golden Retriever','<image src="../images/dog1.gif">Great family dog')
+INSERT INTO PRODUCT VALUES('K9-RT-02','DOGS','Labrador Retriever','<image src="../images/dog5.gif">Great hunting dog')
+INSERT INTO PRODUCT VALUES('RP-LI-02','REPTILES','Iguana','<image src="../images/lizard2.gif">Friendly green friend')
+INSERT INTO PRODUCT VALUES('RP-SN-01','REPTILES','Rattlesnake','<image src="../images/lizard3.gif">Doubles as a watch dog')
+INSERT INTO ITEM VALUES('EST-1','FI-SW-01',16.50,10.00,1,'P','Large',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-10','K9-DL-01',18.50,12.00,1,'P','Spotted Adult Female',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-11','RP-SN-01',18.50,12.00,1,'P','Venomless',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-12','RP-SN-01',18.50,12.00,1,'P','Rattleless',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-13','RP-LI-02',18.50,12.00,1,'P','Green Adult',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-14','FL-DSH-01',58.50,12.00,1,'P','Tailless',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-15','FL-DSH-01',23.50,12.00,1,'P','With tail',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-16','FL-DLH-02',93.50,12.00,1,'P','Adult Female',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-17','FL-DLH-02',93.50,12.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-18','AV-CB-01',193.50,92.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-19','AV-SB-02',15.50,2.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-2','FI-SW-01',16.50,10.00,1,'P','Small',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-20','FI-FW-02',5.50,2.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-21','FI-FW-02',5.29,1.00,1,'P','Adult Female',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-22','K9-RT-02',135.50,100.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-23','K9-RT-02',145.49,100.00,1,'P','Adult Female',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-24','K9-RT-02',255.50,92.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-25','K9-RT-02',325.29,90.00,1,'P','Adult Female',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-26','K9-CW-01',125.50,92.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-27','K9-CW-01',155.29,90.00,1,'P','Adult Female',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-28','K9-RT-01',155.29,90.00,1,'P','Adult Female',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-3','FI-SW-02',18.50,12.00,1,'P','Toothless',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-4','FI-FW-01',18.50,12.00,1,'P','Spotted',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-5','FI-FW-01',18.50,12.00,1,'P','Spotless',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-6','K9-BD-01',18.50,12.00,1,'P','Male Adult',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-7','K9-BD-01',18.50,12.00,1,'P','Female Puppy',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-8','K9-PO-02',18.50,12.00,1,'P','Male Puppy',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-9','K9-DL-01',18.50,12.00,1,'P','Spotless Male Puppy',NULL,NULL,NULL,NULL)
+INSERT INTO INVENTORY VALUES('EST-1',10000)
+INSERT INTO INVENTORY VALUES('EST-10',10000)
+INSERT INTO INVENTORY VALUES('EST-11',10000)
+INSERT INTO INVENTORY VALUES('EST-12',10000)
+INSERT INTO INVENTORY VALUES('EST-13',10000)
+INSERT INTO INVENTORY VALUES('EST-14',10000)
+INSERT INTO INVENTORY VALUES('EST-15',10000)
+INSERT INTO INVENTORY VALUES('EST-16',10000)
+INSERT INTO INVENTORY VALUES('EST-17',10000)
+INSERT INTO INVENTORY VALUES('EST-18',10000)
+INSERT INTO INVENTORY VALUES('EST-19',10000)
+INSERT INTO INVENTORY VALUES('EST-2',10000)
+INSERT INTO INVENTORY VALUES('EST-20',10000)
+INSERT INTO INVENTORY VALUES('EST-21',10000)
+INSERT INTO INVENTORY VALUES('EST-22',10000)
+INSERT INTO INVENTORY VALUES('EST-23',10000)
+INSERT INTO INVENTORY VALUES('EST-24',10000)
+INSERT INTO INVENTORY VALUES('EST-25',10000)
+INSERT INTO INVENTORY VALUES('EST-26',10000)
+INSERT INTO INVENTORY VALUES('EST-27',10000)
+INSERT INTO INVENTORY VALUES('EST-28',10000)
+INSERT INTO INVENTORY VALUES('EST-3',10000)
+INSERT INTO INVENTORY VALUES('EST-4',10000)
+INSERT INTO INVENTORY VALUES('EST-5',10000)
+INSERT INTO INVENTORY VALUES('EST-6',10000)
+INSERT INTO INVENTORY VALUES('EST-7',10000)
+INSERT INTO INVENTORY VALUES('EST-8',10000)
+INSERT INTO INVENTORY VALUES('EST-9',10000)
+INSERT INTO SEQUENCE VALUES('linenum',1000)
+INSERT INTO SEQUENCE VALUES('ordernum',1012)
Modified: labs/jbossesb/trunk/product/services/spring/build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/spring/build.xml 2010-07-06 12:31:56 UTC (rev 33746)
+++ labs/jbossesb/trunk/product/services/spring/build.xml 2010-07-06 13:19:53 UTC (rev 33747)
@@ -5,5 +5,18 @@
<import file="${services.base.build}"/>
<target name="test" depends="base.test"/>
+
+ <!--
+ Redifining the base compile so as to add in the snowdrop jars. Not adding these in the build-time
+ jars because the built-time jars are added to the test classpath, which we don't want.
+ -->
+ <target name="base-compile" depends="prepare">
+ <javac srcdir="src/main/java" destdir="build/classes" debug="on" >
+ <classpath>
+ <path refid="classpath" />
+ <fileset dir="lib/ext/snowdrop" includes="*.jar" />
+ </classpath>
+ </javac>
+ </target>
</project>
\ No newline at end of file
Added: labs/jbossesb/trunk/product/services/spring/lib/ext/aopalliance-1.0.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/spring/lib/ext/aopalliance-1.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: labs/jbossesb/trunk/product/services/spring/lib/ext/aspectjrt-1.6.1.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/services/spring/lib/ext/aspectjweaver-1.6.1.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/services/spring/lib/ext/cglib-nodep-2.1_3.jar
===================================================================
(Binary files differ)
Added: labs/jbossesb/trunk/product/services/spring/lib/ext/com.springsource.net.sf.cglib-2.2.0.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/spring/lib/ext/com.springsource.net.sf.cglib-2.2.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/services/spring/lib/ext/com.springsource.org.aspectj.tools-1.6.6.RELEASE.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/spring/lib/ext/com.springsource.org.aspectj.tools-1.6.6.RELEASE.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/services/spring/lib/ext/com.springsource.org.aspectj.weaver-1.6.8.RELEASE.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/spring/lib/ext/com.springsource.org.aspectj.weaver-1.6.8.RELEASE.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.aop-3.0.2.RELEASE.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.aop-3.0.2.RELEASE.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.asm-3.0.2.RELEASE.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.asm-3.0.2.RELEASE.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.aspects-3.0.2.RELEASE.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.aspects-3.0.2.RELEASE.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.beans-3.0.2.RELEASE.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.beans-3.0.2.RELEASE.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.context-3.0.2.RELEASE.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.context-3.0.2.RELEASE.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.context.support-3.0.2.RELEASE.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.context.support-3.0.2.RELEASE.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.core-3.0.2.RELEASE.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.core-3.0.2.RELEASE.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.expression-3.0.2.RELEASE.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.expression-3.0.2.RELEASE.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.jdbc-3.0.2.RELEASE.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.jdbc-3.0.2.RELEASE.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.jms-3.0.2.RELEASE.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.jms-3.0.2.RELEASE.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.orm-3.0.2.RELEASE.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.orm-3.0.2.RELEASE.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.oxm-3.0.2.RELEASE.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.oxm-3.0.2.RELEASE.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.test-3.0.2.RELEASE.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.test-3.0.2.RELEASE.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.transaction-3.0.2.RELEASE.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/spring/lib/ext/org.springframework.transaction-3.0.2.RELEASE.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/services/spring/lib/ext/snowdrop/snowdrop-deployers-1.1.0.GA.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/spring/lib/ext/snowdrop/snowdrop-deployers-1.1.0.GA.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/services/spring/lib/ext/snowdrop/snowdrop-vfs-1.1.0.GA.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/spring/lib/ext/snowdrop/snowdrop-vfs-1.1.0.GA.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/services/spring/lib/ext/snowdrop/snowdrop-weaving-1.1.0.GA.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/spring/lib/ext/snowdrop/snowdrop-weaving-1.1.0.GA.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: labs/jbossesb/trunk/product/services/spring/lib/ext/spring-2.5.6.SEC01.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/services/spring/lib/ext/spring-aspects-2.5.6.SEC01.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/services/spring/lib/ext/spring-mock-2.0.8.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/trunk/product/services/spring/src/main/java/org/jboss/soa/esb/actions/AbstractSpringAction.java
===================================================================
--- labs/jbossesb/trunk/product/services/spring/src/main/java/org/jboss/soa/esb/actions/AbstractSpringAction.java 2010-07-06 12:31:56 UTC (rev 33746)
+++ labs/jbossesb/trunk/product/services/spring/src/main/java/org/jboss/soa/esb/actions/AbstractSpringAction.java 2010-07-06 13:19:53 UTC (rev 33747)
@@ -24,6 +24,8 @@
import org.apache.log4j.Logger;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.util.ClassUtil;
+
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.context.support.AbstractApplicationContext;
@@ -55,6 +57,8 @@
/** property name used in config file */
private static final String SPRING_CONTEXT_XML_ATTR = "springContextXml";
+
+ private static final String SNOWDROP_VFS_APP_CONTEXT_IMPL = "org.jboss.spring.vfs.context.VFSClassPathXmlApplicationContext";
/** Spring bean definition xml fil */
private String springContextXml;
@@ -205,12 +209,25 @@
{
try
{
- appContext = new ClassPathXmlApplicationContext(springContextXml.split(","));
+ String[] contextXmlTokens = springContextXml.split(",");
+
+ try {
+ Class<?> snowdropVfsAppContextClass = ClassUtil.forName(SNOWDROP_VFS_APP_CONTEXT_IMPL, AbstractSpringAction.class);
+ appContext = new VFSClassPathXmlApplicationContextFactory().getInstance(contextXmlTokens);
+ } catch(ClassNotFoundException e) {
+ // OK... not running on an AS5 variant... just use the core app context impl...
+ appContext = new ClassPathXmlApplicationContext(contextXmlTokens);
+ }
}
catch (final BeansException e)
{
throw new ActionLifecycleException( "BeansException caught in loadSpringToc : " , e );
}
}
-
+
+ private static class VFSClassPathXmlApplicationContextFactory {
+ private AbstractApplicationContext getInstance(String[] contextXmlTokens) {
+ return new org.jboss.spring.vfs.context.VFSClassPathXmlApplicationContext(contextXmlTokens);
+ }
+ }
}
More information about the jboss-svn-commits
mailing list