You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gd...@apache.org on 2005/07/26 08:29:44 UTC
svn commit: r225241 - in /geronimo/trunk/sandbox/petstore: ./ src/etc/
src/plan/ src/sql/
Author: gdamour
Date: Mon Jul 25 23:29:24 2005
New Revision: 225241
URL: http://svn.apache.org/viewcvs?rev=225241&view=rev
Log:
Some progress: the Java Pet Store Application works; the Java Pet Store
Supplier Application is configured yet some security work is needed; and OPC
needs to be configured.
Note that the Java Pet Store needs to be patched and built in order to:
o add a new database type for Derby; and
o fix a bug in a standard DD (ejb-relation-name is empty more than once,
which causes a unique constraint violation).
Added:
geronimo/trunk/sandbox/petstore/src/etc/
geronimo/trunk/sandbox/petstore/src/etc/petstore1.3.2.diff
geronimo/trunk/sandbox/petstore/src/plan/petstore1.3.2-db-ra-plan.xml
geronimo/trunk/sandbox/petstore/src/plan/petstore1.3.2-jms-ra-plan.xml
geronimo/trunk/sandbox/petstore/src/plan/petstore1.3.2.ear-plan.xml
geronimo/trunk/sandbox/petstore/src/plan/supplier1.3.2.ear-plan.xml
geronimo/trunk/sandbox/petstore/src/sql/petstore1.3.2.sql
Removed:
geronimo/trunk/sandbox/petstore/src/plan/asyncsender-ejb-plan.xml
geronimo/trunk/sandbox/petstore/src/plan/customer-ejb-plan.xml
geronimo/trunk/sandbox/petstore/src/plan/geronimo-derby-connector-plan.xml
geronimo/trunk/sandbox/petstore/src/plan/petstore-plan.xml
geronimo/trunk/sandbox/petstore/src/sql/petstore.sql
Modified:
geronimo/trunk/sandbox/petstore/maven.xml
geronimo/trunk/sandbox/petstore/project.properties
Modified: geronimo/trunk/sandbox/petstore/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/petstore/maven.xml?rev=225241&r1=225240&r2=225241&view=diff
==============================================================================
--- geronimo/trunk/sandbox/petstore/maven.xml (original)
+++ geronimo/trunk/sandbox/petstore/maven.xml Mon Jul 25 23:29:24 2005
@@ -16,64 +16,128 @@
limitations under the License.
-->
<!-- $Rev: 54661 $ $Date$ -->
-<project default="default" xmlns:i="jelly:interaction" xmlns:j="jelly:core" xmlns:u="jelly:util" xmlns:ant="jelly:ant" xmlns:deploy="geronimo:deploy">
- <goal name="default">
- <attainGoal name="petstore:deploy"/>
- </goal>
- <goal name="petstore:deploy" description="Deploys PetStore">
- <ant:echo>Building PetStore configuration</ant:echo>
- <echo/>
- <echo>Using petstore.ear at ${petstore.ear.path} (petstore.ear.path variable)</echo>
- <echo/>
- <unjar src="${petstore.ear.path}" dest="target/petstore-ear"/>
- <copy file="src/plan/petstore-plan.xml" tofile="target/petstore-ear/META-INF/geronimo-application.xml"/>
- <unjar src="target/petstore-ear/customer-ejb.jar" dest="target/petstore-ear/customer-ejb"/>
- <unjar src="target/petstore-ear/petstore.war" dest="target/petstore-ear/petstore-war"/>
- <ant/>
- <jar destfile="target/petstore-ear/petstore.war" basedir="target/petstore-ear/petstore-war"/>
- <delete dir="target/petstore-ear/petstore-war"/>
- <jar destfile="target/petstore-ear/customer-ejb.jar" basedir="target/petstore-ear/customer-ejb"/>
- <delete dir="target/petstore-ear/customer-ejb"/>
- <copy todir="target/petstore-ear">
- <fileset dir="src/plan">
- <exclude name="petstore-plan.xml"/>
- </fileset>
- </copy>
- <!-- find a better way, e.g. Maven dependencies or GBean dependencies -->
- <copy file="../../modules/assembly/target/geronimo-1.0-SNAPSHOT/repository/geronimo/rars/geronimo-derby-connector-1.0-SNAPSHOT.rar" todir="target/petstore-ear"/>
- <copy file="../../modules/assembly/target/geronimo-1.0-SNAPSHOT/repository/activemq/rars/activemq-ra-3.1-SNAPSHOT.rar" todir="target/petstore-ear"/>
- <!-- end of find a better way -->
- <ant:echo>Deploying PetStore</ant:echo>
- <ant:java fork="true" jar="../../modules/assembly/target/geronimo-1.0-SNAPSHOT/bin/deployer.jar" failonerror="true">
- <ant:jvmarg value="-ea"/>
- <ant:arg value="--user"/>
- <ant:arg value="system"/>
- <ant:arg value="--password"/>
- <ant:arg value="manager"/>
- <ant:arg value="distribute"/>
- <ant:arg value="target/petstore-ear"/>
- </ant:java>
- </goal>
- <goal name="petstore:start" description="Starts PetStore">
- <deploy:startRemoteServer geronimoTarget="../../modules/assembly/target/geronimo-1.0-SNAPSHOT" vmArgs="" configs="petstore"/>
- <ant:echo message="Waiting for server at: ../../modules/assembly/target/geronimo-1.0-SNAPSHOT"/>
- <deploy:waitForStarted uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector" maxtries="125" username="system" password="manager" id="petstore"/>
- <echo message="server has started"/>
- </goal>
- <goal name="petstore:stop" description="Stops PetStore">
- <deploy:stopRemoteServer uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector" username="system" password="manager"/>
- <echo message="server has stopped"/>
- </goal>
- <goal name="petstore:initdb" description="Initializes database">
- <j:invokeStatic className="java.lang.System" method="setProperty">
- <j:arg type="java.lang.String" value="derby.system.home"/>
- <j:arg type="java.lang.String" value="../../modules/assembly/target/geronimo-1.0-SNAPSHOT/var/derby"/>
- </j:invokeStatic>
- <ant:sql driver="org.apache.derby.jdbc.EmbeddedDriver" url="jdbc:derby:PetStoreDB;create=true" userid="" password="">
- <ant:fileset dir="src/sql"/>
- <ant:classpath>
- <ant:pathelement location="${maven.repo.local}/incubator-derby/jars/derby-10.0.2.1.jar"/>
- </ant:classpath>
- </ant:sql>
- </goal>
+<project default="default"
+ xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant"
+ xmlns:deploy="geronimo:deploy"
+ >
+
+ <j:set var="instDir" value="${maven.build.dir}/geronimo_${geronimo_version}"/>
+
+ <goal name="default">
+ <attainGoal name="petstore:deploy"/>
+ </goal>
+
+ <goal name="petstore:deploy" description="Deploys PetStore">
+ <ant:delete dir="${instDir}"/>
+
+ <ant:echo>Unpacking Geronimo Server at: ${instDir}</ant:echo>
+ <deploy:unpackServer
+ geronimoVersion="${geronimo_version}"
+ geronimoName="geronimo"
+ targetDir="${instDir}"/>
+
+ <ant:echo>Building JMS Configuration</ant:echo>
+ <ant:java fork="true" jar="${instDir}/bin/deployer.jar" failonerror="true">
+ <ant:jvmarg value="-ea"/>
+ <ant:arg value="--user"/>
+ <ant:arg value="system"/>
+ <ant:arg value="--password"/>
+ <ant:arg value="manager"/>
+ <ant:arg value="distribute"/>
+ <ant:arg value="src/plan/petstore1.3.2-jms-ra-plan.xml"/>
+ <ant:arg value="${maven.repo.local}/activemq/rars/activemq-ra-${activemq_version}.rar"/>
+ </ant:java>
+
+ <ant:echo>Building Database Configuration</ant:echo>
+ <ant:java fork="true" jar="${instDir}/bin/deployer.jar" failonerror="true">
+ <ant:jvmarg value="-ea"/>
+ <ant:arg value="--user"/>
+ <ant:arg value="system"/>
+ <ant:arg value="--password"/>
+ <ant:arg value="manager"/>
+ <ant:arg value="distribute"/>
+ <ant:arg value="src/plan/petstore1.3.2-db-ra-plan.xml"/>
+ <ant:arg value="${maven.repo.local}/geronimo/rars/geronimo-derby-connector-${pom.currentVersion}.rar"/>
+ </ant:java>
+
+ <ant:echo>Distributing Java Pet Store Application</ant:echo>
+ <ant:java fork="true" jar="${instDir}/bin/deployer.jar" failonerror="true">
+ <ant:jvmarg value="-ea"/>
+ <ant:arg value="--user"/>
+ <ant:arg value="system"/>
+ <ant:arg value="--password"/>
+ <ant:arg value="manager"/>
+ <ant:arg value="distribute"/>
+ <ant:arg value="src/plan/petstore1.3.2.ear-plan.xml"/>
+ <ant:arg value="${petstore.home}/src/apps/petstore/build/petstore.ear"/>
+ </ant:java>
+
+ <ant:echo>Distributing Java Pet Store Supplier Application</ant:echo>
+ <ant:java fork="true" jar="${instDir}/bin/deployer.jar" failonerror="true">
+ <ant:jvmarg value="-ea"/>
+ <ant:arg value="--user"/>
+ <ant:arg value="system"/>
+ <ant:arg value="--password"/>
+ <ant:arg value="manager"/>
+ <ant:arg value="distribute"/>
+ <ant:arg value="src/plan/supplier1.3.2.ear-plan.xml"/>
+ <ant:arg value="${petstore.home}/src/apps/supplier/build/supplier.ear"/>
+ </ant:java>
+
+ <ant:echo>Creating Java Pet Store Database Schema</ant:echo>
+ <j:invokeStatic className="java.lang.System" method="setProperty">
+ <j:arg type="java.lang.String" value="derby.system.home"/>
+ <j:arg type="java.lang.String" value="${instDir}/var/derby"/>
+ </j:invokeStatic>
+ <ant:sql driver="org.apache.derby.jdbc.EmbeddedDriver"
+ url="jdbc:derby:PetStoreDB;create=true" userid="" password="">
+ <ant:fileset dir="src/sql"/>
+ <ant:classpath>
+ <ant:pathelement location="${maven.repo.local}/incubator-derby/jars/derby-10.0.2.1.jar"/>
+ </ant:classpath>
+ </ant:sql>
+ </goal>
+
+ <goal name="db">
+ <ant:echo>Creating PetStore Database Schema</ant:echo>
+ <j:invokeStatic className="java.lang.System" method="setProperty">
+ <j:arg type="java.lang.String" value="derby.system.home"/>
+ <j:arg type="java.lang.String" value="{instDir}/var/derby"/>
+ </j:invokeStatic>
+ <ant:sql driver="org.apache.derby.jdbc.EmbeddedDriver"
+ url="jdbc:derby:PetStoreDB;create=true" userid="" password="">
+ <ant:fileset dir="src/sql"/>
+ <ant:classpath>
+ <ant:pathelement location="${maven.repo.local}/incubator-derby/jars/derby-10.0.2.1.jar"/>
+ </ant:classpath>
+ </ant:sql>
+ </goal>
+
+ <goal name="petstore:start" description="Start PetStore">
+ <deploy:startRemoteServer
+ geronimoTarget="${instDir}"
+ configs="org/apache/geronimo/PetStore1.3.2 org/apache/geronimo/Supplier1.3.2 org/apache/geronimo/RuntimeDeployer"/>
+ <ant:echo message="Waiting for server at: ${instDir}"/>
+ <deploy:waitForStarted
+ uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
+ id="org/apache/geronimo/PetStore1.3.2"/>
+ <deploy:waitForStarted
+ uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
+ id="org/apache/geronimo/Supplier1.3.2"/>
+ <echo message="PetStore has started"/>
+ </goal>
+
+ <goal name="petstore:stop" description="Stop PetStore">
+ <deploy:stopRemoteServer
+ uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"/>
+ <echo message="server has stopped"/>
+ </goal>
+
</project>
Modified: geronimo/trunk/sandbox/petstore/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/petstore/project.properties?rev=225241&r1=225240&r2=225241&view=diff
==============================================================================
--- geronimo/trunk/sandbox/petstore/project.properties (original)
+++ geronimo/trunk/sandbox/petstore/project.properties Mon Jul 25 23:29:24 2005
@@ -17,5 +17,4 @@
##
## $Rev: 151530 $ $Date$
-##
-petstore.ear.path=c:/projs/petstore/petstore.ear
+petstore.home=TO_BE_CONFIGURED
Added: geronimo/trunk/sandbox/petstore/src/etc/petstore1.3.2.diff
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/petstore/src/etc/petstore1.3.2.diff?rev=225241&view=auto
==============================================================================
--- geronimo/trunk/sandbox/petstore/src/etc/petstore1.3.2.diff (added)
+++ geronimo/trunk/sandbox/petstore/src/etc/petstore1.3.2.diff Mon Jul 25 23:29:24 2005
@@ -0,0 +1,328 @@
+diff -cr petstore1.3.2/src/apps/petstore/src/docroot/CatalogDAOSQL.xml petstore1.3.2_PATCHED/src/apps/petstore/src/docroot/CatalogDAOSQL.xml
+*** petstore1.3.2/src/apps/petstore/src/docroot/CatalogDAOSQL.xml Wed Jul 30 00:26:44 2003
+--- petstore1.3.2_PATCHED/src/apps/petstore/src/docroot/CatalogDAOSQL.xml Tue Jul 26 14:53:40 2005
+***************
+*** 60,65 ****
+--- 60,131 ----
+ ]>
+
+ <DAOConfiguration>
++ <DAOStatements database="derby">
++ <SQLStatement method="GET_CATEGORY">
++ <SQLFragment parameterNb="2">
++ select name, descn
++ from (category a join category_details b on a.catid=b.catid)
++ where locale = ? and a.catid = ?
++ </SQLFragment>
++ </SQLStatement>
++ <SQLStatement method="GET_CATEGORIES">
++ <SQLFragment parameterNb="1">
++ select a.catid, name, descn
++ from (category a join category_details b on a.catid=b.catid)
++ where locale = ? order by name
++ </SQLFragment>
++ </SQLStatement>
++ <SQLStatement method="GET_PRODUCT">
++ <SQLFragment parameterNb="2">
++ select name, descn
++ from (product a join product_details b on a.productid=b.productid)
++ where locale = ? and a.productid = ?
++ </SQLFragment>
++ </SQLStatement>
++ <SQLStatement method="GET_PRODUCTS">
++ <SQLFragment parameterNb="2">
++ select a.productid, name, descn
++ from (product a join product_details b on a.productid=b.productid)
++ where locale = ? and a.catid = ? order by name
++ </SQLFragment>
++ </SQLStatement>
++ <SQLStatement method="GET_ITEM">
++ <SQLFragment parameterNb="2">
++ select catid, a.productid, name, b.image, b.descn, attr1, attr2, attr3,
++ attr4, attr5, listprice, unitcost
++ from (((item a join item_details b on a.itemid=b.itemid)
++ join product_details c on a.productid=c.productid)
++ join product d on d.productid=c.productid and b.locale = c.locale)
++ where b.locale = ? and a.itemid = ?
++ </SQLFragment>
++ </SQLStatement>
++ <SQLStatement method="GET_ITEMS">
++ <SQLFragment parameterNb="2">
++ select catid, name, a.itemid, b.image, b.descn, attr1, attr2, attr3,
++ attr4, attr5, listprice, unitcost
++ from (((item a join item_details b on a.itemid=b.itemid)
++ join product_details c on a.productid=c.productid)
++ join product d on d.productid=c.productid and b.locale = c.locale)
++ where b.locale = ? and a.productid = ?
++ </SQLFragment>
++ </SQLStatement>
++ <SQLStatement method="SEARCH_ITEMS">
++ <SQLFragment parameterNb="4">
++ select catid, a.productid, name, a.itemid, b.image, b.descn, attr1,
++ attr2, attr3, attr4, attr5, listprice, unitcost
++ from (((item a join item_details b on a.itemid=b.itemid)
++ join product_details c on a.productid=c.productid)
++ join product d on d.productid=c.productid and b.locale = c.locale)
++ where b.locale = ? and ((lower(name) like ? or lower(catid) like ? or lower(b.descn) like ?)
++ </SQLFragment>
++ <SQLFragment parameterNb="3" occurrence="VARIABLE">
++ or (lower(name) like ? or lower(catid) like ? or lower(b.descn) like ?)
++ </SQLFragment>
++ <SQLFragment parameterNb="0">
++ )
++ </SQLFragment>
++ </SQLStatement>
++ </DAOStatements>
+ <DAOStatements database="cloudscape">
+ <SQLStatement method="GET_CATEGORY">
+ <SQLFragment parameterNb="2">
+diff -cr petstore1.3.2/src/apps/petstore/src/docroot/WEB-INF/web.xml petstore1.3.2_PATCHED/src/apps/petstore/src/docroot/WEB-INF/web.xml
+*** petstore1.3.2/src/apps/petstore/src/docroot/WEB-INF/web.xml Wed Jul 30 00:26:40 2003
+--- petstore1.3.2_PATCHED/src/apps/petstore/src/docroot/WEB-INF/web.xml Tue Jul 26 14:54:38 2005
+***************
+*** 132,138 ****
+ </init-param>
+ <init-param>
+ <param-name>Database</param-name>
+! <param-value>cloudscape</param-value>
+ <!--param-value>oracle</param-value-->
+ </init-param>
+ </servlet>
+--- 132,138 ----
+ </init-param>
+ <init-param>
+ <param-name>Database</param-name>
+! <param-value>derby</param-value>
+ <!--param-value>oracle</param-value-->
+ </init-param>
+ </servlet>
+***************
+*** 183,189 ****
+
+ <env-entry>
+ <env-entry-name>param/CatalogDAODatabase</env-entry-name>
+! <env-entry-value>cloudscape</env-entry-value>
+ <!--env-entry-value>oracle</env-entry-value-->
+ <env-entry-type>java.lang.String</env-entry-type>
+ </env-entry>
+--- 183,189 ----
+
+ <env-entry>
+ <env-entry-name>param/CatalogDAODatabase</env-entry-name>
+! <env-entry-value>derby</env-entry-value>
+ <!--env-entry-value>oracle</env-entry-value-->
+ <env-entry-type>java.lang.String</env-entry-type>
+ </env-entry>
+diff -cr petstore1.3.2/src/apps/petstore/src/docroot/populate/PopulateSQL.xml petstore1.3.2_PATCHED/src/apps/petstore/src/docroot/populate/PopulateSQL.xml
+*** petstore1.3.2/src/apps/petstore/src/docroot/populate/PopulateSQL.xml Wed Jul 30 00:26:22 2003
+--- petstore1.3.2_PATCHED/src/apps/petstore/src/docroot/populate/PopulateSQL.xml Tue Jul 26 15:38:44 2005
+***************
+*** 42,47 ****
+--- 42,175 ----
+
+
+ <PopulateSQL>
++ <DatabaseStatements database="derby">
++ <TableStatements table="category">
++ <CheckStatement>
++ select * from category
++ </CheckStatement>
++ <CreateStatement>
++ create table category (catid char(10) not null,
++ constraint pk_category primary key (catid))
++ </CreateStatement>
++ <InsertStatement>
++ insert into category values (?)
++ </InsertStatement>
++ <DropStatement>
++ drop table category
++ </DropStatement>
++ </TableStatements>
++ <TableStatements table="category_details">
++ <CheckStatement>
++ select * from category_details
++ </CheckStatement>
++ <CreateStatement>
++ create table category_details (catid char(10) not null,
++ name varchar(80) not null, image varchar(255),
++ descn varchar(255), locale char(10) not null,
++ constraint pk_cat_det primary key (catid, locale),
++ constraint fk_cat_det_1 foreign key (catid)
++ references category (catid))
++ </CreateStatement>
++ <InsertStatement>
++ insert into category_details values (?, ?, ?, ?, ?)
++ </InsertStatement>
++ <DropStatement>
++ drop table category_details
++ </DropStatement>
++ </TableStatements>
++ <TableStatements table="product">
++ <CheckStatement>
++ select * from product
++ </CheckStatement>
++ <CreateStatement>
++ create table product (
++ productid char(10) not null,
++ catid char(10) not null,
++ constraint pk_product primary key (productid),
++ constraint fk_product_1 foreign key (catid)
++ references category (catid))
++ </CreateStatement>
++ <InsertStatement>
++ insert into product values (?, ?)
++ </InsertStatement>
++ <DropStatement>
++ drop table product
++ </DropStatement>
++ </TableStatements>
++ <TableStatements table="product_details">
++ <CheckStatement>
++ select * from product_details
++ </CheckStatement>
++ <CreateStatement>
++ create table product_details (
++ productid char(10) not null,
++ locale char(10) not null,
++ name varchar(80) not null,
++ image varchar(255),
++ descn varchar(255),
++ constraint pk_prod_det primary key (productid, locale),
++ constraint fk_prod_det_1 foreign key (productid)
++ references product (productid))
++ </CreateStatement>
++ <InsertStatement>
++ insert into product_details values (?, ?, ?, ?, ?)
++ </InsertStatement>
++ <DropStatement>
++ drop table product_details
++ </DropStatement>
++ </TableStatements>
++ <TableStatements table="item">
++ <CheckStatement>
++ select * from item
++ </CheckStatement>
++ <CreateStatement>
++ create table item (
++ itemid char(10) not null,
++ productid char(10) not null,
++ constraint pk_item primary key (itemid),
++ constraint fk_item_1 foreign key (productid)
++ references product (productid)
++ )
++ </CreateStatement>
++ <InsertStatement>
++ insert into item (itemid, productid) values (? , ?)
++ </InsertStatement>
++ <DropStatement>
++ drop table item
++ </DropStatement>
++ </TableStatements>
++ <TableStatements table="item_details">
++ <CheckStatement>
++ select * from item_details
++ </CheckStatement>
++ <CreateStatement>
++ create table item_details (
++ itemid char(10) not null,
++ listprice decimal(10,2) not null,
++ unitcost decimal(10,2) not null,
++ locale char(10) not null,
++ image char(100) not null,
++ descn varchar(255) not null,
++ attr1 varchar(80),
++ attr2 varchar(80),
++ attr3 varchar(80),
++ attr4 varchar(80),
++ attr5 varchar(80),
++ constraint pk_item_details primary key (itemid, locale),
++ constraint fk_item_details_1 foreign key (itemid)
++ references item (itemid)
++ )
++ </CreateStatement>
++ <InsertStatement>
++ insert into item_details
++ (itemid, listprice, unitcost, locale, attr1, attr2, attr3, attr4, attr5, image, descn)
++ values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
++ </InsertStatement>
++ <DropStatement>
++ drop table item_details
++ </DropStatement>
++ </TableStatements>
++ </DatabaseStatements>
+ <DatabaseStatements database="cloudscape">
+ <TableStatements table="category">
+ <CheckStatement>
+diff -cr petstore1.3.2/src/components/catalog/src/ejb-jar.xml petstore1.3.2_PATCHED/src/components/catalog/src/ejb-jar.xml
+*** petstore1.3.2/src/components/catalog/src/ejb-jar.xml Wed Jul 30 00:26:04 2003
+--- petstore1.3.2_PATCHED/src/components/catalog/src/ejb-jar.xml Tue Jul 26 14:55:05 2005
+***************
+*** 64,70 ****
+ <env-entry-name>param/CatalogDAODatabase</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <!--env-entry-value>oracle</env-entry-value-->
+! <env-entry-value>cloudscape</env-entry-value>
+ </env-entry>
+ <resource-ref>
+ <res-ref-name>jdbc/CatalogDB</res-ref-name>
+--- 64,70 ----
+ <env-entry-name>param/CatalogDAODatabase</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <!--env-entry-value>oracle</env-entry-value-->
+! <env-entry-value>derby</env-entry-value>
+ </env-entry>
+ <resource-ref>
+ <res-ref-name>jdbc/CatalogDB</res-ref-name>
+diff -cr petstore1.3.2/src/components/customer/src/ejb-jar.xml petstore1.3.2_PATCHED/src/components/customer/src/ejb-jar.xml
+*** petstore1.3.2/src/components/customer/src/ejb-jar.xml Wed Jul 30 00:26:30 2003
+--- petstore1.3.2_PATCHED/src/components/customer/src/ejb-jar.xml Tue Jul 26 14:51:49 2005
+***************
+*** 263,269 ****
+ </enterprise-beans>
+ <relationships>
+ <ejb-relation>
+- <ejb-relation-name></ejb-relation-name>
+ <ejb-relationship-role>
+ <ejb-relationship-role-name>CustomerEJB</ejb-relationship-role-name>
+ <multiplicity>One</multiplicity>
+--- 263,268 ----
+***************
+*** 284,290 ****
+ </ejb-relationship-role>
+ </ejb-relation>
+ <ejb-relation>
+- <ejb-relation-name></ejb-relation-name>
+ <ejb-relationship-role>
+ <ejb-relationship-role-name>ContactInfoEJB</ejb-relationship-role-name>
+ <multiplicity>One</multiplicity>
+--- 283,288 ----
+***************
+*** 305,311 ****
+ </ejb-relationship-role>
+ </ejb-relation>
+ <ejb-relation>
+- <ejb-relation-name></ejb-relation-name>
+ <ejb-relationship-role>
+ <ejb-relationship-role-name>CustomerEJB</ejb-relationship-role-name>
+ <multiplicity>One</multiplicity>
+--- 303,308 ----
+***************
+*** 326,332 ****
+ </ejb-relationship-role>
+ </ejb-relation>
+ <ejb-relation>
+- <ejb-relation-name></ejb-relation-name>
+ <ejb-relationship-role>
+ <ejb-relationship-role-name>AccountEJB</ejb-relationship-role-name>
+ <multiplicity>One</multiplicity>
+--- 323,328 ----
+***************
+*** 347,353 ****
+ </ejb-relationship-role>
+ </ejb-relation>
+ <ejb-relation>
+- <ejb-relation-name></ejb-relation-name>
+ <ejb-relationship-role>
+ <ejb-relationship-role-name>AccountEJB</ejb-relationship-role-name>
+ <multiplicity>One</multiplicity>
+--- 343,348 ----
Added: geronimo/trunk/sandbox/petstore/src/plan/petstore1.3.2-db-ra-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/petstore/src/plan/petstore1.3.2-db-ra-plan.xml?rev=225241&view=auto
==============================================================================
--- geronimo/trunk/sandbox/petstore/src/plan/petstore1.3.2-db-ra-plan.xml (added)
+++ geronimo/trunk/sandbox/petstore/src/plan/petstore1.3.2-db-ra-plan.xml Mon Jul 25 23:29:24 2005
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Rev: 54661 $ $Date: 2005-07-10 01:59:24 +1000 (Sun, 10 Jul 2005) $ -->
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
+ version="1.5"
+ parentId="org/apache/geronimo/PetStoreJMS1.3.2"
+ configId="org/apache/geronimo/PetStoreDataSource1.3.2">
+
+ <resourceadapter>
+ <outbound-resourceadapter>
+ <connection-definition>
+ <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+ <connectiondefinition-instance>
+ <name>PetStoreDataSource</name>
+ <config-property-setting name="UserName"></config-property-setting>
+ <config-property-setting name="Password"></config-property-setting>
+ <config-property-setting name="DatabaseName">PetStoreDB</config-property-setting>
+ <config-property-setting name="CreateDatabase">create</config-property-setting>
+ <connectionmanager>
+ <xa-transaction>
+ <transaction-caching/>
+ </xa-transaction>
+ <single-pool>
+ <max-size>10</max-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <match-one/>
+ </single-pool>
+ </connectionmanager>
+ </connectiondefinition-instance>
+ </connection-definition>
+ </outbound-resourceadapter>
+ </resourceadapter>
+</connector>
Added: geronimo/trunk/sandbox/petstore/src/plan/petstore1.3.2-jms-ra-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/petstore/src/plan/petstore1.3.2-jms-ra-plan.xml?rev=225241&view=auto
==============================================================================
--- geronimo/trunk/sandbox/petstore/src/plan/petstore1.3.2-jms-ra-plan.xml (added)
+++ geronimo/trunk/sandbox/petstore/src/plan/petstore1.3.2-jms-ra-plan.xml Mon Jul 25 23:29:24 2005
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Rev: 54661 $ $Date: 2005-07-10 01:59:24 +1000 (Sun, 10 Jul 2005) $ -->
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
+ version="1.5"
+ parentId="org/apache/geronimo/SystemJMS"
+ configId="org/apache/geronimo/PetStoreJMS1.3.2">
+
+ <dependency>
+ <uri>activemq/jars/activemq-core-3.1-M5.jar</uri>
+ </dependency>
+
+ <resourceadapter>
+ <resourceadapter-instance>
+ <resourceadapter-name>PetStore JMS Resources</resourceadapter-name>
+ <config-property-setting name="ServerUrl">tcp://localhost:61616</config-property-setting>
+ <config-property-setting name="UserName">geronimo</config-property-setting>
+ <config-property-setting name="Password">geronimo</config-property-setting>
+ <workmanager>
+ <gbean-link>DefaultWorkManager</gbean-link>
+ </workmanager>
+ </resourceadapter-instance>
+ <outbound-resourceadapter>
+ <connection-definition>
+ <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
+ <connectiondefinition-instance>
+ <name>PetstoreConnectionFactory</name>
+ <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
+ <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
+ <connectionmanager>
+ <xa-transaction>
+ <transaction-caching/>
+ </xa-transaction>
+ <single-pool>
+ <max-size>10</max-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <match-one/>
+ </single-pool>
+ </connectionmanager>
+ <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
+ </connectiondefinition-instance>
+ </connection-definition>
+ </outbound-resourceadapter>
+ </resourceadapter>
+ <adminobject>
+ <adminobject-interface>javax.jms.Queue</adminobject-interface>
+ <adminobject-class>org.codehaus.activemq.message.ActiveMQQueue</adminobject-class>
+ <adminobject-instance>
+ <message-destination-name>AsyncSenderQueue</message-destination-name>
+ <config-property-setting name="PhysicalName">AsyncSenderQueue</config-property-setting>
+ </adminobject-instance>
+ </adminobject>
+ <adminobject>
+ <adminobject-interface>javax.jms.Topic</adminobject-interface>
+ <adminobject-class>org.codehaus.activemq.message.ActiveMQTopic</adminobject-class>
+ <adminobject-instance>
+ <message-destination-name>InvoiceTopic</message-destination-name>
+ <config-property-setting name="PhysicalName">InvoiceTopic</config-property-setting>
+ </adminobject-instance>
+ </adminobject>
+</connector>
Added: geronimo/trunk/sandbox/petstore/src/plan/petstore1.3.2.ear-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/petstore/src/plan/petstore1.3.2.ear-plan.xml?rev=225241&view=auto
==============================================================================
--- geronimo/trunk/sandbox/petstore/src/plan/petstore1.3.2.ear-plan.xml (added)
+++ geronimo/trunk/sandbox/petstore/src/plan/petstore1.3.2.ear-plan.xml Mon Jul 25 23:29:24 2005
@@ -0,0 +1,396 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Rev: 54661 $ $Date: 2005-07-10 01:59:24 +1000 (Sun, 10 Jul 2005) $ -->
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
+ parentId="org/apache/geronimo/PetStoreDataSource1.3.2"
+ configId="org/apache/geronimo/PetStore1.3.2">
+
+ <module>
+ <ejb>customer-ejb.jar</ejb>
+ <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming"
+ configId="NOT_USED">
+ <naming:cmp-connection-factory>
+ <naming:resource-link>PetStoreDataSource</naming:resource-link>
+ </naming:cmp-connection-factory>
+ <enterprise-beans>
+ <entity>
+ <ejb-name>CustomerEJB</ejb-name>
+ <table-name>CUSTOMERS</table-name>
+ <cmp-field-mapping>
+ <cmp-field-name>userId</cmp-field-name>
+ <table-column>USERID</table-column>
+ </cmp-field-mapping>
+ </entity>
+ <entity>
+ <ejb-name>ProfileEJB</ejb-name>
+ <table-name>PROFILES</table-name>
+ <cmp-field-mapping>
+ <cmp-field-name>id</cmp-field-name>
+ <cmp-field-class>java.lang.Integer</cmp-field-class>
+ <table-column>ID</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>preferredLanguage</cmp-field-name>
+ <table-column>PREFERREDLANGUAGE</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>myListPreference</cmp-field-name>
+ <table-column>MYLISTPREFERENCE</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>favoriteCategory</cmp-field-name>
+ <table-column>FAVORITECATEGORY</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>bannerPreference</cmp-field-name>
+ <table-column>BANNERPREFERENCE</table-column>
+ </cmp-field-mapping>
+ <primkey-field>id</primkey-field>
+ <key-generator xmlns="http://www.openejb.org/xml/ns/pkgen">
+ <auto-increment-table>
+ <sql>INSERT INTO PROFILES (PREFERREDLANGUAGE) VALUES (NULL)</sql>
+ <return-type>java.lang.Integer</return-type>
+ </auto-increment-table>
+ </key-generator>
+ </entity>
+ <entity>
+ <ejb-name>CreditCardEJB</ejb-name>
+ <table-name>CREDITCARDS</table-name>
+ <cmp-field-mapping>
+ <cmp-field-name>id</cmp-field-name>
+ <cmp-field-class>java.lang.Integer</cmp-field-class>
+ <table-column>ID</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>cardType</cmp-field-name>
+ <table-column>CARDTYPE</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>expiryDate</cmp-field-name>
+ <table-column>EXPIRYDATE</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>cardNumber</cmp-field-name>
+ <table-column>CARDNUMBER</table-column>
+ </cmp-field-mapping>
+ <primkey-field>id</primkey-field>
+ <key-generator xmlns="http://www.openejb.org/xml/ns/pkgen">
+ <auto-increment-table>
+ <sql>INSERT INTO CREDITCARDS (CARDTYPE) VALUES (NULL)</sql>
+ <return-type>java.lang.Integer</return-type>
+ </auto-increment-table>
+ </key-generator>
+ </entity>
+ <entity>
+ <ejb-name>ContactInfoEJB</ejb-name>
+ <table-name>CONTACTINFOS</table-name>
+ <cmp-field-mapping>
+ <cmp-field-name>id</cmp-field-name>
+ <cmp-field-class>java.lang.Integer</cmp-field-class>
+ <table-column>ID</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>familyName</cmp-field-name>
+ <table-column>FAMILYNAME</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>telephone</cmp-field-name>
+ <table-column>TELEPHONE</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>givenName</cmp-field-name>
+ <table-column>GIVENNAME</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>email</cmp-field-name>
+ <table-column>EMAIL</table-column>
+ </cmp-field-mapping>
+ <primkey-field>id</primkey-field>
+ <key-generator xmlns="http://www.openejb.org/xml/ns/pkgen">
+ <auto-increment-table>
+ <sql>INSERT INTO CONTACTINFOS (FAMILYNAME) VALUES (NULL)</sql>
+ <return-type>java.lang.Integer</return-type>
+ </auto-increment-table>
+ </key-generator>
+ </entity>
+ <entity>
+ <ejb-name>AddressEJB</ejb-name>
+ <table-name>ADDRESSES</table-name>
+ <cmp-field-mapping>
+ <cmp-field-name>id</cmp-field-name>
+ <cmp-field-class>java.lang.Integer</cmp-field-class>
+ <table-column>ID</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>zipCode</cmp-field-name>
+ <table-column>ZIPCODE</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>state</cmp-field-name>
+ <table-column>STATE</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>streetName2</cmp-field-name>
+ <table-column>STREETNAME2</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>streetName1</cmp-field-name>
+ <table-column>STREETNAME1</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>country</cmp-field-name>
+ <table-column>COUNTRY</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>city</cmp-field-name>
+ <table-column>CITY</table-column>
+ </cmp-field-mapping>
+ <primkey-field>id</primkey-field>
+ <key-generator xmlns="http://www.openejb.org/xml/ns/pkgen">
+ <auto-increment-table>
+ <sql>INSERT INTO ADDRESSES (ZIPCODE) VALUES (NULL)</sql>
+ <return-type>java.lang.Integer</return-type>
+ </auto-increment-table>
+ </key-generator>
+ </entity>
+ <entity>
+ <ejb-name>AccountEJB</ejb-name>
+ <table-name>ACCOUNTS</table-name>
+ <cmp-field-mapping>
+ <cmp-field-name>id</cmp-field-name>
+ <cmp-field-class>java.lang.Integer</cmp-field-class>
+ <table-column>ID</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>status</cmp-field-name>
+ <table-column>STATUS</table-column>
+ </cmp-field-mapping>
+ <primkey-field>id</primkey-field>
+ <key-generator xmlns="http://www.openejb.org/xml/ns/pkgen">
+ <auto-increment-table>
+ <sql>INSERT INTO ACCOUNTS (STATUS) VALUES (NULL)</sql>
+ <return-type>java.lang.Integer</return-type>
+ </auto-increment-table>
+ </key-generator>
+ </entity>
+ </enterprise-beans>
+ <relationships>
+ <ejb-relation>
+ <ejb-relationship-role>
+ <relationship-role-source>
+ <ejb-name>CustomerEJB</ejb-name>
+ </relationship-role-source>
+ <cmr-field>
+ <cmr-field-name>account</cmr-field-name>
+ </cmr-field>
+ <role-mapping>
+ <cmr-field-mapping>
+ <key-column>USERID</key-column>
+ <foreign-key-column>FK_USERID</foreign-key-column>
+ </cmr-field-mapping>
+ </role-mapping>
+ </ejb-relationship-role>
+ </ejb-relation>
+ <ejb-relation>
+ <ejb-relationship-role>
+ <relationship-role-source>
+ <ejb-name>ContactInfoEJB</ejb-name>
+ </relationship-role-source>
+ <cmr-field>
+ <cmr-field-name>address</cmr-field-name>
+ </cmr-field>
+ <role-mapping>
+ <cmr-field-mapping>
+ <key-column>ID</key-column>
+ <foreign-key-column>FK_CONTACTINFOID</foreign-key-column>
+ </cmr-field-mapping>
+ </role-mapping>
+ </ejb-relationship-role>
+ </ejb-relation>
+ <ejb-relation>
+ <ejb-relationship-role>
+ <relationship-role-source>
+ <ejb-name>CustomerEJB</ejb-name>
+ </relationship-role-source>
+ <cmr-field>
+ <cmr-field-name>profile</cmr-field-name>
+ </cmr-field>
+ <role-mapping>
+ <cmr-field-mapping>
+ <key-column>USERID</key-column>
+ <foreign-key-column>FK_USERID</foreign-key-column>
+ </cmr-field-mapping>
+ </role-mapping>
+ </ejb-relationship-role>
+ </ejb-relation>
+ <ejb-relation>
+ <ejb-relationship-role>
+ <relationship-role-source>
+ <ejb-name>AccountEJB</ejb-name>
+ </relationship-role-source>
+ <cmr-field>
+ <cmr-field-name>contactInfo</cmr-field-name>
+ </cmr-field>
+ <role-mapping>
+ <cmr-field-mapping>
+ <key-column>ID</key-column>
+ <foreign-key-column>FK_ACCOUNTID</foreign-key-column>
+ </cmr-field-mapping>
+ </role-mapping>
+ </ejb-relationship-role>
+ </ejb-relation>
+ <ejb-relation>
+ <ejb-relationship-role>
+ <relationship-role-source>
+ <ejb-name>AccountEJB</ejb-name>
+ </relationship-role-source>
+ <cmr-field>
+ <cmr-field-name>creditCard</cmr-field-name>
+ </cmr-field>
+ <role-mapping>
+ <cmr-field-mapping>
+ <key-column>ID</key-column>
+ <foreign-key-column>FK_ACCOUNTID</foreign-key-column>
+ </cmr-field-mapping>
+ </role-mapping>
+ </ejb-relationship-role>
+ </ejb-relation>
+ </relationships>
+ </openejb-jar>
+ </module>
+
+ <module>
+ <ejb>asyncsender-ejb.jar</ejb>
+ <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming"
+ configId="NOT_USED">
+ <enterprise-beans>
+ <session>
+ <ejb-name>AsyncSenderEJB</ejb-name>
+ <naming:resource-ref>
+ <naming:ref-name>jms/QueueConnectionFactory</naming:ref-name>
+ <naming:resource-link>PetstoreConnectionFactory</naming:resource-link>
+ </naming:resource-ref>
+ <naming:resource-env-ref>
+ <naming:ref-name>jms/AsyncSenderQueue</naming:ref-name>
+ <naming:message-destination-link>AsyncSenderQueue</naming:message-destination-link>
+ </naming:resource-env-ref>
+ </session>
+ </enterprise-beans>
+ </openejb-jar>
+ </module>
+
+ <module>
+ <ejb>signon-ejb.jar</ejb>
+ <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming"
+ configId="NOT_USED">
+
+ <naming:cmp-connection-factory>
+ <naming:resource-link>PetStoreDataSource</naming:resource-link>
+ </naming:cmp-connection-factory>
+ <enterprise-beans>
+ <entity>
+ <ejb-name>UserEJB</ejb-name>
+ <table-name>USERS</table-name>
+ <cmp-field-mapping>
+ <cmp-field-name>password</cmp-field-name>
+ <table-column>PASSWORD</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>userName</cmp-field-name>
+ <table-column>USERNAME</table-column>
+ </cmp-field-mapping>
+ </entity>
+ </enterprise-beans>
+ </openejb-jar>
+ </module>
+
+ <module>
+ <ejb>uidgen-ejb.jar</ejb>
+ <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming"
+ configId="NOT_USED">
+
+ <naming:cmp-connection-factory>
+ <naming:resource-link>PetStoreDataSource</naming:resource-link>
+ </naming:cmp-connection-factory>
+ <enterprise-beans>
+ <entity>
+ <ejb-name>CounterEJB</ejb-name>
+ <table-name>COUNTERS</table-name>
+ <cmp-field-mapping>
+ <cmp-field-name>counter</cmp-field-name>
+ <table-column>COUNTER</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>name</cmp-field-name>
+ <table-column>NAME</table-column>
+ </cmp-field-mapping>
+ </entity>
+ </enterprise-beans>
+ </openejb-jar>
+ </module>
+
+ <module>
+ <ejb>catalog-ejb.jar</ejb>
+ <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming"
+ configId="NOT_USED">
+
+ <enterprise-beans>
+ <session>
+ <ejb-name>CatalogEJB</ejb-name>
+ <naming:resource-ref>
+ <naming:ref-name>jdbc/CatalogDB</naming:ref-name>
+ <naming:resource-link>PetStoreDataSource</naming:resource-link>
+ </naming:resource-ref>
+ <naming:resource-ref>
+ <naming:ref-name>url/CatalogDAOSQLURL</naming:ref-name>
+ <naming:url>http://localhost:8080/petstore/CatalogDAOSQL.xml</naming:url>
+ </naming:resource-ref>
+ </session>
+ </enterprise-beans>
+ </openejb-jar>
+ </module>
+
+ <module>
+ <web>petstore.war</web>
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/web"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming"
+ configId="NOT_USED">
+
+ <context-priority-classloader>false</context-priority-classloader>
+
+ <naming:ejb-local-ref>
+ <naming:ref-name>ShoppingControllerEJB</naming:ref-name>
+ <naming:ejb-link>#ShoppingControllerEJB</naming:ejb-link>
+ </naming:ejb-local-ref>
+ <naming:resource-ref>
+ <naming:ref-name>jdbc/CatalogDB</naming:ref-name>
+ <naming:resource-link>PetStoreDataSource</naming:resource-link>
+ </naming:resource-ref>
+ <naming:resource-ref>
+ <naming:ref-name>url/CatalogDAOSQLURL</naming:ref-name>
+ <naming:url>http://localhost:8080/petstore/CatalogDAOSQL.xml</naming:url>
+ </naming:resource-ref>
+ </web-app>
+ </module>
+
+</application>
Added: geronimo/trunk/sandbox/petstore/src/plan/supplier1.3.2.ear-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/petstore/src/plan/supplier1.3.2.ear-plan.xml?rev=225241&view=auto
==============================================================================
--- geronimo/trunk/sandbox/petstore/src/plan/supplier1.3.2.ear-plan.xml (added)
+++ geronimo/trunk/sandbox/petstore/src/plan/supplier1.3.2.ear-plan.xml Mon Jul 25 23:29:24 2005
@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Rev: 54661 $ $Date: 2005-07-10 01:59:24 +1000 (Sun, 10 Jul 2005) $ -->
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
+ parentId="org/apache/geronimo/PetStoreDataSource1.3.2"
+ configId="org/apache/geronimo/Supplier1.3.2">
+
+ <module>
+ <ejb>supplierpo-ejb.jar</ejb>
+ <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming"
+ configId="NOT_USED">
+ <naming:cmp-connection-factory>
+ <naming:resource-link>PetStoreDataSource</naming:resource-link>
+ </naming:cmp-connection-factory>
+ <enterprise-beans>
+ <entity>
+ <ejb-name>SupplierOrderEJB</ejb-name>
+ <table-name>SUPPLIERORDERS</table-name>
+ <cmp-field-mapping>
+ <cmp-field-name>poId</cmp-field-name>
+ <table-column>POID</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>poDate</cmp-field-name>
+ <table-column>PODATE</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>poStatus</cmp-field-name>
+ <table-column>POSTATUS</table-column>
+ </cmp-field-mapping>
+ </entity>
+ <entity>
+ <ejb-name>ContactInfoEJB</ejb-name>
+ <table-name>CONTACTINFOS</table-name>
+ <cmp-field-mapping>
+ <cmp-field-name>id</cmp-field-name>
+ <cmp-field-class>java.lang.Integer</cmp-field-class>
+ <table-column>ID</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>telephone</cmp-field-name>
+ <table-column>TELEPHONE</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>familyName</cmp-field-name>
+ <table-column>FAMILYNAME</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>email</cmp-field-name>
+ <table-column>EMAIL</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>givenName</cmp-field-name>
+ <table-column>GIVENNAME</table-column>
+ </cmp-field-mapping>
+ <primkey-field>id</primkey-field>
+ <key-generator xmlns="http://www.openejb.org/xml/ns/pkgen">
+ <auto-increment-table>
+ <sql>INSERT INTO CONTACTINFOS (FAMILYNAME) VALUES (NULL)</sql>
+ <return-type>java.lang.Integer</return-type>
+ </auto-increment-table>
+ </key-generator>
+ </entity>
+ <entity>
+ <ejb-name>AddressEJB</ejb-name>
+ <table-name>ADDRESSES</table-name>
+ <cmp-field-mapping>
+ <cmp-field-name>id</cmp-field-name>
+ <cmp-field-class>java.lang.Integer</cmp-field-class>
+ <table-column>ID</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>zipCode</cmp-field-name>
+ <table-column>ZIPCODE</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>streetName2</cmp-field-name>
+ <table-column>STREETNAME2</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>state</cmp-field-name>
+ <table-column>STATE</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>streetName1</cmp-field-name>
+ <table-column>STREETNAME1</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>city</cmp-field-name>
+ <table-column>CITY</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>country</cmp-field-name>
+ <table-column>COUNTRY</table-column>
+ </cmp-field-mapping>
+ <primkey-field>id</primkey-field>
+ <key-generator xmlns="http://www.openejb.org/xml/ns/pkgen">
+ <auto-increment-table>
+ <sql>INSERT INTO ADDRESSES (ZIPCODE) VALUES (NULL)</sql>
+ <return-type>java.lang.Integer</return-type>
+ </auto-increment-table>
+ </key-generator>
+ </entity>
+ <entity>
+ <ejb-name>LineItemEJB</ejb-name>
+ <table-name>LINEITEMS</table-name>
+ <cmp-field-mapping>
+ <cmp-field-name>id</cmp-field-name>
+ <cmp-field-class>java.lang.Integer</cmp-field-class>
+ <table-column>ID</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>categoryId</cmp-field-name>
+ <table-column>CATEGORYID</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>productId</cmp-field-name>
+ <table-column>PRODUCTID</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>itemId</cmp-field-name>
+ <table-column>ITEMID</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>lineNumber</cmp-field-name>
+ <table-column>LINENUMBER</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>quantity</cmp-field-name>
+ <table-column>QUANTITY</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>unitPrice</cmp-field-name>
+ <table-column>UNITPRICE</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>quantityShipped</cmp-field-name>
+ <table-column>QUANTITYSHIPPED</table-column>
+ </cmp-field-mapping>
+ <primkey-field>id</primkey-field>
+ <key-generator xmlns="http://www.openejb.org/xml/ns/pkgen">
+ <auto-increment-table>
+ <sql>INSERT INTO LINEITEMS (CATEGORYID) VALUES (NULL)</sql>
+ <return-type>java.lang.Integer</return-type>
+ </auto-increment-table>
+ </key-generator>
+ </entity>
+ </enterprise-beans>
+ <relationships>
+ <ejb-relation>
+ <ejb-relationship-role>
+ <relationship-role-source>
+ <ejb-name>SupplierOrderEJB</ejb-name>
+ </relationship-role-source>
+ <cmr-field>
+ <cmr-field-name>contactInfo</cmr-field-name>
+ </cmr-field>
+ <role-mapping>
+ <cmr-field-mapping>
+ <key-column>POID</key-column>
+ <foreign-key-column>FK_POID</foreign-key-column>
+ </cmr-field-mapping>
+ </role-mapping>
+ </ejb-relationship-role>
+ </ejb-relation>
+ <ejb-relation>
+ <ejb-relationship-role>
+ <relationship-role-source>
+ <ejb-name>ContactInfoEJB</ejb-name>
+ </relationship-role-source>
+ <cmr-field>
+ <cmr-field-name>address</cmr-field-name>
+ </cmr-field>
+ <role-mapping>
+ <cmr-field-mapping>
+ <key-column>ID</key-column>
+ <foreign-key-column>FK_CONTACTINFOID</foreign-key-column>
+ </cmr-field-mapping>
+ </role-mapping>
+ </ejb-relationship-role>
+ </ejb-relation>
+ <ejb-relation>
+ <ejb-relationship-role>
+ <relationship-role-source>
+ <ejb-name>SupplierOrderEJB</ejb-name>
+ </relationship-role-source>
+ <cmr-field>
+ <cmr-field-name>lineItems</cmr-field-name>
+ </cmr-field>
+ <role-mapping>
+ <cmr-field-mapping>
+ <key-column>POID</key-column>
+ <foreign-key-column>FK_POID</foreign-key-column>
+ </cmr-field-mapping>
+ </role-mapping>
+ </ejb-relationship-role>
+ </ejb-relation>
+ </relationships>
+ </openejb-jar>
+ </module>
+
+ <module>
+ <web>supplier.war</web>
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/web"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming"
+ configId="NOT_USED">
+
+ <context-priority-classloader>false</context-priority-classloader>
+
+ <naming:resource-ref>
+ <naming:ref-name>jms/TopicConnectionFactory</naming:ref-name>
+ <naming:resource-link>PetstoreConnectionFactory</naming:resource-link>
+ </naming:resource-ref>
+ <naming:resource-env-ref>
+ <naming:ref-name>jms/opc/InvoiceTopic</naming:ref-name>
+ <naming:message-destination-link>InvoiceTopic</naming:message-destination-link>
+ </naming:resource-env-ref>
+
+ </web-app>
+ </module>
+
+ <module>
+ <ejb>supplier-ejb.jar</ejb>
+ <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming"
+ configId="NOT_USED">
+ <naming:cmp-connection-factory>
+ <naming:resource-link>PetStoreDataSource</naming:resource-link>
+ </naming:cmp-connection-factory>
+ <enterprise-beans>
+ <entity>
+ <ejb-name>InventoryEJB</ejb-name>
+ <table-name>INVENTORY</table-name>
+ <cmp-field-mapping>
+ <cmp-field-name>itemId</cmp-field-name>
+ <table-column>ITEMID</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>quantity</cmp-field-name>
+ <table-column>QUANTITY</table-column>
+ </cmp-field-mapping>
+ </entity>
+ <message-driven>
+ <ejb-name>SupplierOrderMDB</ejb-name>
+ <resource-adapter>
+ <resource-link>PetStore JMS Resources</resource-link>
+ </resource-adapter>
+ <naming:resource-ref>
+ <naming:ref-name>jms/QueueConnectionFactory</naming:ref-name>
+ <naming:resource-link>PetstoreConnectionFactory</naming:resource-link>
+ </naming:resource-ref>
+ <naming:resource-ref>
+ <naming:ref-name>jms/TopicConnectionFactory</naming:ref-name>
+ <naming:resource-link>PetstoreConnectionFactory</naming:resource-link>
+ </naming:resource-ref>
+ <naming:resource-env-ref>
+ <naming:ref-name>jms/opc/InvoiceTopic</naming:ref-name>
+ <naming:message-destination-link>InvoiceTopic</naming:message-destination-link>
+ </naming:resource-env-ref>
+ </message-driven>
+ <session>
+ <ejb-name>OrderFulfillmentFacadeEJB</ejb-name>
+ <naming:resource-ref>
+ <naming:ref-name>url/EntityCatalogURL</naming:ref-name>
+ <naming:url>http://localhost:8080/opc/EntityCatalog.jsp</naming:url>
+ </naming:resource-ref>
+ </session>
+ </enterprise-beans>
+ </openejb-jar>
+ </module>
+
+</application>
Added: geronimo/trunk/sandbox/petstore/src/sql/petstore1.3.2.sql
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/petstore/src/sql/petstore1.3.2.sql?rev=225241&view=auto
==============================================================================
--- geronimo/trunk/sandbox/petstore/src/sql/petstore1.3.2.sql (added)
+++ geronimo/trunk/sandbox/petstore/src/sql/petstore1.3.2.sql Mon Jul 25 23:29:24 2005
@@ -0,0 +1,102 @@
+CREATE TABLE CUSTOMERS
+(
+ USERID VARCHAR(50) NOT NULL,
+ PRIMARY KEY (USERID)
+);
+
+CREATE TABLE PROFILES
+(
+ ID INTEGER GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1),
+ PREFERREDLANGUAGE VARCHAR(50),
+ MYLISTPREFERENCE CHAR(10),
+ FAVORITECATEGORY VARCHAR(50),
+ BANNERPREFERENCE CHAR(10),
+ FK_USERID VARCHAR(50),
+ PRIMARY KEY (ID)
+);
+
+CREATE TABLE CREDITCARDS
+(
+ ID INTEGER GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1),
+ CARDTYPE VARCHAR(50),
+ EXPIRYDATE VARCHAR(50),
+ CARDNUMBER VARCHAR(50),
+ FK_ACCOUNTID INTEGER,
+ PRIMARY KEY (ID)
+);
+
+CREATE TABLE CONTACTINFOS
+(
+ ID INTEGER GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1),
+ FAMILYNAME VARCHAR(50),
+ TELEPHONE VARCHAR(50),
+ GIVENNAME VARCHAR(50),
+ EMAIL VARCHAR(50),
+ FK_ACCOUNTID INTEGER,
+ FK_POID VARCHAR(50),
+ PRIMARY KEY (ID)
+);
+
+CREATE TABLE ADDRESSES
+(
+ ID INTEGER GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1),
+ ZIPCODE VARCHAR(50),
+ STATE VARCHAR(50),
+ STREETNAME2 VARCHAR(50),
+ STREETNAME1 VARCHAR(50),
+ COUNTRY VARCHAR(50),
+ CITY VARCHAR(50),
+ FK_CONTACTINFOID INTEGER,
+ PRIMARY KEY (ID)
+);
+
+CREATE TABLE ACCOUNTS
+(
+ ID INTEGER GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1),
+ STATUS VARCHAR(50),
+ FK_USERID VARCHAR(50),
+ PRIMARY KEY (ID)
+);
+
+CREATE TABLE USERS
+(
+ PASSWORD VARCHAR(50) NOT NULL,
+ USERNAME VARCHAR(50) NOT NULL,
+ PRIMARY KEY (PASSWORD, USERNAME)
+);
+
+CREATE TABLE COUNTERS
+(
+ COUNTER INTEGER,
+ NAME VARCHAR(50) NOT NULL,
+ PRIMARY KEY (NAME)
+);
+
+CREATE TABLE INVENTORY
+(
+ ITEMID VARCHAR(50) NOT NULL,
+ QUANTITY INTEGER NOT NULL,
+ PRIMARY KEY (ITEMID)
+);
+
+CREATE TABLE SUPPLIERORDERS
+(
+ POID VARCHAR(50) NOT NULL,
+ PODATE BIGINT,
+ POSTATUS VARCHAR(50),
+ PRIMARY KEY (POID)
+);
+
+CREATE TABLE LINEITEMS
+(
+ ID INTEGER GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1),
+ CATEGORYID VARCHAR(50),
+ PRODUCTID VARCHAR(50),
+ ITEMID VARCHAR(50),
+ LINENUMBER VARCHAR(50),
+ QUANTITY INTEGER,
+ UNITPRICE DECIMAL(10,2),
+ QUANTITYSHIPPED INTEGER,
+ FK_POID VARCHAR(50),
+ PRIMARY KEY (ID)
+);