Author: hlship
Date: Tue Sep 27 14:02:09 2005
New Revision: 292043
URL: http://svn.apache.org/viewcvs?rev=292043&view=rev
Log:
Load the Virtual Library data into JBoss's defaultDB HSQL database
Begin making corrections to the code as part of the upgrade
Added:
jakarta/tapestry/trunk/config/jboss/data/hypersonic/localDB.properties
jakarta/tapestry/trunk/config/jboss/data/hypersonic/localDB.script
Removed:
jakarta/tapestry/trunk/config/jboss/data/hypersonic/vlib.properties
jakarta/tapestry/trunk/config/jboss/data/hypersonic/vlib.script
jakarta/tapestry/trunk/examples/VlibBeans/createDb.sql
Modified:
jakarta/tapestry/trunk/build.xml
jakarta/tapestry/trunk/examples/Vlib/src/context/EditBook.html
jakarta/tapestry/trunk/examples/Vlib/src/context/WEB-INF/Publisher.script
jakarta/tapestry/trunk/examples/Vlib/src/context/css/vlib.css
jakarta/tapestry/trunk/examples/Vlib/upgrade-notes.txt
jakarta/tapestry/trunk/examples/VlibBeans/src/descriptor/META-INF/jboss.xml
jakarta/tapestry/trunk/examples/VlibBeans/src/descriptor/META-INF/jbosscmp-jdbc.xml
Modified: jakarta/tapestry/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/build.xml?rev=292043&r1=292042&r2=292043&view=diff
==============================================================================
--- jakarta/tapestry/trunk/build.xml (original)
+++ jakarta/tapestry/trunk/build.xml Tue Sep 27 14:02:09 2005
@@ -89,7 +89,8 @@
<fail unless="available.vlib.ear" message="You must run the
'install' target to build the vlib.ear first."/>
<property name="jboss.default.dir"
value="${jboss.dir}/server/default"/>
- <copy todir="${jboss.default.dir}">
+ <!-- Overwrite the defaultDB data -->
+ <copy todir="${jboss.default.dir}" overwrite="true">
<fileset dir="config/jboss"/>
</copy>
@@ -106,7 +107,7 @@
<fileset dir="target" includes="*.ear"/>
</copy>
- <announce message="JBoss 4 has been set up to execute the
Virtual Library application."/>
+ <announce message="JBoss 4.0.2 has been set up to execute the
Virtual Library application."/>
<announce message="You may need to restart JBoss before the
application will run."/>
</target>
Added: jakarta/tapestry/trunk/config/jboss/data/hypersonic/localDB.properties
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/config/jboss/data/hypersonic/localDB.properties?rev=292043&view=auto
==============================================================================
--- jakarta/tapestry/trunk/config/jboss/data/hypersonic/localDB.properties
(added)
+++ jakarta/tapestry/trunk/config/jboss/data/hypersonic/localDB.properties Tue
Sep 27 14:02:09 2005
@@ -0,0 +1,20 @@
+#HSQL Database Engine
+#Tue Sep 27 16:57:35 EDT 2005
+hsqldb.cache_file_scale=1
+runtime.gc_interval=0
+hsqldb.first_identity=0
+version=1.8.0
+modified=no
+hsqldb.script_format=0
+sql.enforce_size=false
+hsqldb.cache_size_scale=8
+hsqldb.cache_scale=14
+hsqldb.log_size=200
+sql.enforce_strict_size=false
+readonly=false
+hsqldb.compatible_version=1.7.2
+hsqldb.original_version=1.8.0
+sql.compare_in_locale=false
+hsqldb.nio_data_file=true
+hsqldb.cache_version=1.7.0
+hsqldb.default_table_type=memory
Added: jakarta/tapestry/trunk/config/jboss/data/hypersonic/localDB.script
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/config/jboss/data/hypersonic/localDB.script?rev=292043&view=auto
==============================================================================
--- jakarta/tapestry/trunk/config/jboss/data/hypersonic/localDB.script (added)
+++ jakarta/tapestry/trunk/config/jboss/data/hypersonic/localDB.script Tue Sep
27 14:02:09 2005
@@ -0,0 +1,36 @@
+CREATE MEMORY TABLE TIMERS(TIMERID VARCHAR(80) NOT NULL,TARGETID VARCHAR(80)
NOT NULL,INITIALDATE TIMESTAMP NOT NULL,TIMERINTERVAL BIGINT,INSTANCEPK
VARBINARY,INFO VARBINARY,CONSTRAINT TIMERS_PK PRIMARY KEY(TIMERID,TARGETID))
+CREATE MEMORY TABLE JMS_USERS(USERID VARCHAR(32) NOT NULL PRIMARY KEY,PASSWD
VARCHAR(32) NOT NULL,CLIENTID VARCHAR(128))
+CREATE MEMORY TABLE JMS_ROLES(ROLEID VARCHAR(32) NOT NULL,USERID VARCHAR(32)
NOT NULL,CONSTRAINT SYS_PK_JMS_ROLES PRIMARY KEY(USERID,ROLEID))
+CREATE MEMORY TABLE JMS_SUBSCRIPTIONS(CLIENTID VARCHAR(128) NOT NULL,SUBNAME
VARCHAR(128) NOT NULL,TOPIC VARCHAR(255) NOT NULL,SELECTOR
VARCHAR(255),CONSTRAINT SYS_PK_JMS_SUBSCRIPTIONS PRIMARY KEY(CLIENTID,SUBNAME))
+CREATE CACHED TABLE JMS_MESSAGES(MESSAGEID INTEGER NOT NULL,DESTINATION
VARCHAR(255) NOT NULL,TXID INTEGER,TXOP CHAR(1),MESSAGEBLOB OBJECT,CONSTRAINT
SYS_PK_JMS_MESSAGES PRIMARY KEY(MESSAGEID,DESTINATION))
+CREATE INDEX JMS_MESSAGES_TXOP_TXID ON JMS_MESSAGES(TXOP,TXID)
+CREATE INDEX JMS_MESSAGES_DESTINATION ON JMS_MESSAGES(DESTINATION)
+CREATE CACHED TABLE JMS_TRANSACTIONS(TXID INTEGER NOT NULL PRIMARY KEY)
+CREATE MEMORY TABLE PUBLISHER(PUBLISHER_ID INTEGER NOT NULL,NAME
VARCHAR(40),CONSTRAINT PK_PUBLISHER PRIMARY KEY(PUBLISHER_ID),CONSTRAINT
UNQ_NAME UNIQUE(NAME))
+CREATE MEMORY TABLE PERSON(PERSON_ID INTEGER NOT NULL,EMAIL VARCHAR(60),PASSWD
VARCHAR(20),FIRST_NAME VARCHAR(30),LAST_NAME VARCHAR(30),LOCKED_OUT BOOLEAN NOT
NULL,ADMIN BOOLEAN NOT NULL,LAST_ACCESS TIMESTAMP,CONSTRAINT PK_PERSON PRIMARY
KEY(PERSON_ID),CONSTRAINT UNQ_EMAIL UNIQUE(EMAIL))
+CREATE MEMORY TABLE BOOK(BOOK_ID INTEGER NOT NULL,DESCRIPTION
VARCHAR(2000),PUBLISHER_ID INTEGER,HOLDER_ID INTEGER,ISBN VARCHAR(20),OWNER_ID
INTEGER,TITLE VARCHAR(100),AUTHOR VARCHAR(100),HIDDEN BOOLEAN NOT NULL,LENDABLE
BOOLEAN NOT NULL,DATE_ADDED TIMESTAMP,CONSTRAINT PK_BOOK PRIMARY
KEY(BOOK_ID),CONSTRAINT HOLDER_FK FOREIGN KEY(HOLDER_ID) REFERENCES
PERSON(PERSON_ID),CONSTRAINT OWNER_FK FOREIGN KEY(OWNER_ID) REFERENCES
PERSON(PERSON_ID),CONSTRAINT PUBLISHER_FK FOREIGN KEY(PUBLISHER_ID) REFERENCES
PUBLISHER(PUBLISHER_ID))
+CREATE MEMORY TABLE PROP(NAME VARCHAR(32) NOT NULL,PROP_VALUE INTEGER NOT
NULL,CONSTRAINT PROP_PK PRIMARY KEY(NAME))
+CREATE MEMORY TABLE HILOSEQUENCES(SEQUENCENAME VARCHAR(50) NOT NULL,HIGHVALUES
INTEGER NOT NULL,CONSTRAINT HILO_PK PRIMARY KEY(SEQUENCENAME))
+CREATE USER SA PASSWORD "" ADMIN
+SET WRITE_DELAY 20
+INSERT INTO JMS_USERS VALUES('dynsub','dynsub',NULL)
+INSERT INTO JMS_USERS VALUES('guest','guest',NULL)
+INSERT INTO JMS_USERS VALUES('j2ee','j2ee',NULL)
+INSERT INTO JMS_USERS VALUES('john','needle','DurableSubscriberExample')
+INSERT INTO JMS_USERS VALUES('nobody','nobody',NULL)
+INSERT INTO JMS_ROLES VALUES('durpublisher','dynsub')
+INSERT INTO JMS_ROLES VALUES('publisher','dynsub')
+INSERT INTO JMS_ROLES VALUES('guest','guest')
+INSERT INTO JMS_ROLES VALUES('j2ee','guest')
+INSERT INTO JMS_ROLES VALUES('john','guest')
+INSERT INTO JMS_ROLES VALUES('durpublisher','john')
+INSERT INTO JMS_ROLES VALUES('publisher','john')
+INSERT INTO JMS_ROLES VALUES('subscriber','john')
+INSERT INTO JMS_ROLES VALUES('noacc','nobody')
+INSERT INTO PUBLISHER VALUES(5000,'O''Reilly')
+INSERT INTO PERSON VALUES(1000,'[EMAIL
PROTECTED]','secret','Frodo','Baggins',FALSE,TRUE,'2005-09-27 17:21:25.0')
+INSERT INTO PERSON VALUES(1001,'[EMAIL
PROTECTED]','secret','Suzy','Queue',FALSE,FALSE,'2005-09-27 17:22:12.0')
+INSERT INTO PERSON VALUES(1002,'[EMAIL
PROTECTED]','secret','Dilbert','CubeDweller',FALSE,TRUE,'2005-09-27
16:56:01.761')
+INSERT INTO BOOK VALUES(5001,'Very quick and light introduction to installing
and deploying into JBoss.',5000,1002,'0-596-10007-8',1002,'JBoss A Developer''s
Notebook','Norman Richards, Sam Griffith, Jr.',FALSE,TRUE,'2005-09-27
16:53:00.44')
+INSERT INTO PROP VALUES('next-key',5050)
+INSERT INTO HILOSEQUENCES VALUES('general',0)
Modified: jakarta/tapestry/trunk/examples/Vlib/src/context/EditBook.html
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Vlib/src/context/EditBook.html?rev=292043&r1=292042&r2=292043&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/Vlib/src/context/EditBook.html (original)
+++ jakarta/tapestry/trunk/examples/Vlib/src/context/EditBook.html Tue Sep 27
14:02:09 2005
@@ -34,7 +34,7 @@
<tr>
<th><span jwcid="@FieldLabel"
field="ognl:components.inputPublisherName">Publisher</span></th>
<td><span class="required-field">*</span></td>
- <td><select jwcid="[EMAIL PROTECTED]"
value="ognl:attributes.publisherId" model="ognl:engine.publisherModel"/>
+ <td><select jwcid="inputPublisher"/>
<input jwcid="inputPublisherName" type="text" size="20" maxlength="40"/>
</td>
</tr>
Modified:
jakarta/tapestry/trunk/examples/Vlib/src/context/WEB-INF/Publisher.script
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Vlib/src/context/WEB-INF/Publisher.script?rev=292043&r1=292042&r2=292043&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/Vlib/src/context/WEB-INF/Publisher.script
(original)
+++ jakarta/tapestry/trunk/examples/Vlib/src/context/WEB-INF/Publisher.script
Tue Sep 27 14:02:09 2005
@@ -32,7 +32,7 @@
-->
<input-symbol key="select" class="org.apache.tapestry.form.PropertySelection"
required="yes"/>
-<input-symbol key="field" class="org.apache.tapestry.form.AbstractTextField"
required="yes"/>
+<input-symbol key="field" class="org.apache.tapestry.form.IFormComponent"
required="yes"/>
<let key="formObject">
document.${select.form.name}
Modified: jakarta/tapestry/trunk/examples/Vlib/src/context/css/vlib.css
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Vlib/src/context/css/vlib.css?rev=292043&r1=292042&r2=292043&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/Vlib/src/context/css/vlib.css (original)
+++ jakarta/tapestry/trunk/examples/Vlib/src/context/css/vlib.css Tue Sep 27
14:02:09 2005
@@ -2,6 +2,11 @@
font-family : Trebuchet MS, verdana, arial, helvetica, sans-serif;
}
+IMG
+{
+ border: none;
+}
+
DIV.error {
font-weight : bold;
color : Red;
Modified: jakarta/tapestry/trunk/examples/Vlib/upgrade-notes.txt
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Vlib/upgrade-notes.txt?rev=292043&r1=292042&r2=292043&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/Vlib/upgrade-notes.txt (original)
+++ jakarta/tapestry/trunk/examples/Vlib/upgrade-notes.txt Tue Sep 27 14:02:09
2005
@@ -28,4 +28,11 @@
application.xml
Can't deploy vlib.war as "/" due to conflict, deployed as "/vlib"
+
+Publisher.script
+ org.apache.tapestry.form.AbstractTextField no longer exists, replaced
with
+ org.apache.tapestry.form.IFormComponent
+
+EditBook.html
+ Inline inputPublisher conflicted with <component> in EditBook.page and
was removed
Modified:
jakarta/tapestry/trunk/examples/VlibBeans/src/descriptor/META-INF/jboss.xml
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/VlibBeans/src/descriptor/META-INF/jboss.xml?rev=292043&r1=292042&r2=292043&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/VlibBeans/src/descriptor/META-INF/jboss.xml
(original)
+++ jakarta/tapestry/trunk/examples/VlibBeans/src/descriptor/META-INF/jboss.xml
Tue Sep 27 14:02:09 2005
@@ -4,7 +4,7 @@
<resource-managers>
<resource-manager res-class="org.jboss.ejb.deployment.JDBCResource">
<res-name>jdbc/dataSource</res-name>
- <res-jndi-name>java:/VlibDS</res-jndi-name>
+ <res-jndi-name>java:/DefaultDS</res-jndi-name>
</resource-manager>
</resource-managers>
Modified:
jakarta/tapestry/trunk/examples/VlibBeans/src/descriptor/META-INF/jbosscmp-jdbc.xml
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/VlibBeans/src/descriptor/META-INF/jbosscmp-jdbc.xml?rev=292043&r1=292042&r2=292043&view=diff
==============================================================================
---
jakarta/tapestry/trunk/examples/VlibBeans/src/descriptor/META-INF/jbosscmp-jdbc.xml
(original)
+++
jakarta/tapestry/trunk/examples/VlibBeans/src/descriptor/META-INF/jbosscmp-jdbc.xml
Tue Sep 27 14:02:09 2005
@@ -5,7 +5,7 @@
"http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_3_0.dtd";>
<jbosscmp-jdbc>
<defaults>
- <datasource>java:/VlibDS</datasource>
+ <datasource>java:/DefaultDS</datasource>
<datasource-mapping>Hypersonic SQL</datasource-mapping>
</defaults>
<enterprise-beans>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
