You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jl...@apache.org on 2005/12/22 23:39:44 UTC
svn commit: r358649 - in /geronimo/trunk/sandbox/adventurebuilder: ./
src/plan/ src/sql/
Author: jlaskowski
Date: Thu Dec 22 14:39:35 2005
New Revision: 358649
URL: http://svn.apache.org/viewcvs?rev=358649&view=rev
Log:
Applied patch by Jakob Faerch (@see jrf-patch-partially-20051222.patch at http://issues.apache.org/jira/browse/GERONIMO-1164)
Some small changes:
+ change portToConnectToWebservices to webServicePort
+ web-service-address changed its content to reference webServicePort
+ get default goal to work
WARNING: Web Services keep failing because of missing class - java.lang.ClassNotFoundException: org.apache.jasper.servlet.JspServlet
Modified:
geronimo/trunk/sandbox/adventurebuilder/maven.xml
geronimo/trunk/sandbox/adventurebuilder/src/plan/activitysupplier1.0.3.ear-plan.xml
geronimo/trunk/sandbox/adventurebuilder/src/plan/adventure1.0.1-db-ra-plan.xml
geronimo/trunk/sandbox/adventurebuilder/src/plan/adventure1.0.1-security-plan.xml
geronimo/trunk/sandbox/adventurebuilder/src/plan/adventure1.0.3-jms-ra-plan.xml
geronimo/trunk/sandbox/adventurebuilder/src/plan/airlinesupplier1.0.3.ear-plan.xml
geronimo/trunk/sandbox/adventurebuilder/src/plan/bank1.0.3.ear-plan.xml
geronimo/trunk/sandbox/adventurebuilder/src/plan/consumerwebsite1.0.1.ear-plan.xml
geronimo/trunk/sandbox/adventurebuilder/src/plan/lodgingsupplier1.0.3.ear-plan.xml
geronimo/trunk/sandbox/adventurebuilder/src/plan/opc1.0.3.ear-plan.xml
geronimo/trunk/sandbox/adventurebuilder/src/sql/ab1.0.1.sql
Modified: geronimo/trunk/sandbox/adventurebuilder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/adventurebuilder/maven.xml?rev=358649&r1=358648&r2=358649&view=diff
==============================================================================
--- geronimo/trunk/sandbox/adventurebuilder/maven.xml (original)
+++ geronimo/trunk/sandbox/adventurebuilder/maven.xml Thu Dec 22 14:39:35 2005
@@ -27,17 +27,29 @@
>
<j:set var="instDir" value="${maven.build.dir}/geronimo-${geronimo_version}"/>
-
- <goal name="default">
+ <!-- Set smtpHost to a valid smtp host (and set the correspondning entry in the env entry for the AB application if you want to send mail -->
+ <j:set var="smtpHost" value="localhost" />
+ <!-- Set smtpPort to the port of the smtpHost if you want to send mail -->
+ <j:set var="smtpPort" value="25" />
+ <j:set var="webServicePort" value="8080"/>
+ <j:set var="allABconfigurations" value="org/apache/geronimo/ActivitySupplier1.0.3 org/apache/geronimo/AirlineSupplier1.0.3 org/apache/geronimo/Adventure1.0.1 org/apache/geronimo/AdventureDataSource1.0.1 org/apache/geronimo/AdventureBuilderJMS org/apache/geronimo/Bank1.0.3 org/apache/geronimo/LodgingSupplier1.0.3 org/apache/geronimo/OPC1.0.3" />
+ <j:set var="allSystemConfigurations" value="geronimo/j2ee-deployer/${geronimo_version}/car geronimo/webconsole-jetty/${geronimo_version}/car geronimo/directory/${geronimo_version}/car geronimo/ldap-realm/${geronimo_version}/car geronimo/online-deployer/${geronimo_version}/car geronimo/j2ee-system/${geronimo_version}/car geronimo/activemq/${geronimo_version}/car geronimo/j2ee-server/${geronimo_version}/car geronimo/jetty/${geronimo_version}/car geronimo/jetty-deployer/${geronimo_version}/car geronimo/geronimo-gbean-deployer/${geronimo_version}/car geronimo/rmi-naming/${geronimo_version}/car geronimo/system-database/${geronimo_version}/car geronimo/j2ee-security/${geronimo_version}/car geronimo/activemq-broker/${geronimo_version}/car geronimo/uddi-jetty/${geronimo_version}/car geronimo/javamail/${geronimo_version}/car" />
+
+ <goal name="default" prereqs="clean">
+ <attainGoal name="ab:unpackServer"/>
+ <attainGoal name="ab:startForDeployment"/>
<attainGoal name="ab:deploy"/>
+ <attainGoal name="ab:start"/>
</goal>
- <goal name="ab:deploy" description="Deploys Adventure Builder" prereqs="clean">
+ <goal name="ab:unpackServer">
<!-- TODO: Make geronimoArtifactId configurable -->
<deploy:unpackServer
geronimoVersion="${geronimo_version}"
- geronimoArtifactId="geronimo-tomcat-j2ee"/>
+ geronimoArtifactId="geronimo-tomcat-j2ee"/>
+ </goal>
+ <goal name="ab:startForDeployment">
<deploy:startRemoteServer
geronimoTarget="${instDir}"/>
<ant:echo message="Waiting for server to start at: ${instDir}"/>
@@ -49,9 +61,13 @@
username="system"
password="manager"
maxTries="120"
- id="geronimo/j2ee-deployer/1.0-SNAPSHOT/car"/>
+ id="geronimo/j2ee-deployer/${geronimo_version}/car"/>
<echo message="Deployer has started"/>
- <u:sleep millis="60000"/>
+ <u:sleep millis="60000"/>
+ </goal>
+
+ <goal name="ab:deploy" description="Deploys Adventure Builder">
+ <ant:delete dir="${maven.build.dir}/plan" />
<fileScanner var="plans">
<fileset dir="${basedir}/src/plan">
Modified: geronimo/trunk/sandbox/adventurebuilder/src/plan/activitysupplier1.0.3.ear-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/adventurebuilder/src/plan/activitysupplier1.0.3.ear-plan.xml?rev=358649&r1=358648&r2=358649&view=diff
==============================================================================
--- geronimo/trunk/sandbox/adventurebuilder/src/plan/activitysupplier1.0.3.ear-plan.xml (original)
+++ geronimo/trunk/sandbox/adventurebuilder/src/plan/activitysupplier1.0.3.ear-plan.xml Thu Dec 22 14:39:35 2005
@@ -43,6 +43,7 @@
<ref-name>jms/activity/ActivityQueue</ref-name>
<resource-link>jms/activity/ActivityQueue</resource-link>
</resource-ref>
+ <web-service-address>http://localhost:${webServicePort}/webservice/ActivityPOService</web-service-address>
</session>
<entity>
<ejb-name>ActivityPurchaseOrderBean</ejb-name>
@@ -89,9 +90,9 @@
<type-converter>org.tranql.sql.typeconverter.SerializableConverter</type-converter>
</cmp-field-mapping>
<primkey-field>activityDetailsBean_upk</primkey-field>
- <key-generator>
+ <key-generator xmlns="http://www.openejb.org/xml/ns/pkgen">
<auto-increment-table>
- <sql>INSERT INTO ActivityDetails VALUES(null,activityId,startDate,endDate,headCount,null)</sql>
+ <sql>INSERT INTO ActivityDetails (activityId) VALUES(null)</sql>
<return-type>java.lang.Integer</return-type>
</auto-increment-table>
</key-generator>
@@ -108,11 +109,11 @@
<activation-config>
<activation-config-property>
<activation-config-property-name>destination</activation-config-property-name>
- <activation-config-property-value>jms/activity/ActivityTopic</activation-config-property-value>
+ <activation-config-property-value>jms/activity/ActivityQueue</activation-config-property-value>
</activation-config-property>
<activation-config-property>
<activation-config-property-name>destinationType</activation-config-property-name>
- <activation-config-property-value>javax.jms.Topic</activation-config-property-value>
+ <activation-config-property-value>javax.jms.Queue</activation-config-property-value>
</activation-config-property>
</activation-config>
<naming:service-ref>
@@ -121,8 +122,8 @@
<naming:port-name>BrokerServiceIntfPort</naming:port-name>
<naming:protocol>http</naming:protocol>
<naming:host>localhost</naming:host>
- <naming:port>8080</naming:port>
- <naming:uri>/activity/foo/as</naming:uri>
+ <naming:port>${webServicePort}</naming:port>
+ <naming:uri>/webservice/WebServiceBroker</naming:uri>
</naming:port>
</naming:service-ref>
</message-driven>
Modified: geronimo/trunk/sandbox/adventurebuilder/src/plan/adventure1.0.1-db-ra-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/adventurebuilder/src/plan/adventure1.0.1-db-ra-plan.xml?rev=358649&r1=358648&r2=358649&view=diff
==============================================================================
--- geronimo/trunk/sandbox/adventurebuilder/src/plan/adventure1.0.1-db-ra-plan.xml (original)
+++ geronimo/trunk/sandbox/adventurebuilder/src/plan/adventure1.0.1-db-ra-plan.xml Thu Dec 22 14:39:35 2005
@@ -17,7 +17,7 @@
-->
<!-- $Rev$ $Date$ -->
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
- parentId="geronimo/system-database/1.0-SNAPSHOT/car"
+ parentId="geronimo/system-database/${geronimo_version}/car"
configId="org/apache/geronimo/AdventureDataSource1.0.1">
<resourceadapter>
Modified: geronimo/trunk/sandbox/adventurebuilder/src/plan/adventure1.0.1-security-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/adventurebuilder/src/plan/adventure1.0.1-security-plan.xml?rev=358649&r1=358648&r2=358649&view=diff
==============================================================================
--- geronimo/trunk/sandbox/adventurebuilder/src/plan/adventure1.0.1-security-plan.xml (original)
+++ geronimo/trunk/sandbox/adventurebuilder/src/plan/adventure1.0.1-security-plan.xml Thu Dec 22 14:39:35 2005
@@ -20,7 +20,7 @@
<configuration
xmlns="http://geronimo.apache.org/xml/ns/deployment"
- parentId="geronimo/client-security/1.0-SNAPSHOT/car"
+ parentId="geronimo/client-security/${geronimo_version}/car"
configId="org/apache/geronimo/AdventureSecurity1.0.1"
>
<gbean name="adventure-realm"
Modified: geronimo/trunk/sandbox/adventurebuilder/src/plan/adventure1.0.3-jms-ra-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/adventurebuilder/src/plan/adventure1.0.3-jms-ra-plan.xml?rev=358649&r1=358648&r2=358649&view=diff
==============================================================================
--- geronimo/trunk/sandbox/adventurebuilder/src/plan/adventure1.0.3-jms-ra-plan.xml (original)
+++ geronimo/trunk/sandbox/adventurebuilder/src/plan/adventure1.0.3-jms-ra-plan.xml Thu Dec 22 14:39:35 2005
@@ -17,7 +17,7 @@
-->
<!-- $Rev$ $Date$ -->
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
- parentId="geronimo/activemq-broker/1.0-SNAPSHOT/car"
+ parentId="geronimo/activemq-broker/${geronimo_version}/car"
configId="org/apache/geronimo/AdventureBuilderJMS">
<resourceadapter>
<resourceadapter-instance>
@@ -46,7 +46,6 @@
<match-one/>
</single-pool>
</connectionmanager>
- <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
</connectiondefinition-instance>
</connection-definition>
</outbound-resourceadapter>
@@ -60,6 +59,7 @@
</adminobject-instance>
</adminobject>
<adminobject>
+ <!-- TODO jrf 20051912 I can't seem to find anyone using this Topic . Maybe it should be removed? -->
<adminobject-interface>javax.jms.Topic</adminobject-interface>
<adminobject-class>org.codehaus.activemq.message.ActiveMQTopic</adminobject-class>
<adminobject-instance>
@@ -84,6 +84,7 @@
</adminobject-instance>
</adminobject>
<adminobject>
+ <!-- TODO jrf 20051912 I can't seem to find anyone using this Topic . Maybe it should be removed? -->
<adminobject-interface>javax.jms.Topic</adminobject-interface>
<adminobject-class>org.codehaus.activemq.message.ActiveMQTopic</adminobject-class>
<adminobject-instance>
Modified: geronimo/trunk/sandbox/adventurebuilder/src/plan/airlinesupplier1.0.3.ear-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/adventurebuilder/src/plan/airlinesupplier1.0.3.ear-plan.xml?rev=358649&r1=358648&r2=358649&view=diff
==============================================================================
--- geronimo/trunk/sandbox/adventurebuilder/src/plan/airlinesupplier1.0.3.ear-plan.xml (original)
+++ geronimo/trunk/sandbox/adventurebuilder/src/plan/airlinesupplier1.0.3.ear-plan.xml Thu Dec 22 14:39:35 2005
@@ -77,6 +77,7 @@
<naming:ref-name>jms/airline/AirlineQueue</naming:ref-name>
<naming:message-destination-link>jms/airline/AirlineQueue</naming:message-destination-link>
</naming:resource-env-ref>
+ <web-service-address>http://localhost:${webServicePort}/webservice/AirlinePOService</web-service-address>
</session>
<message-driven>
<ejb-name>AirlineMessageEJB</ejb-name>
@@ -99,8 +100,8 @@
<naming:port-name>BrokerServiceIntfPort</naming:port-name>
<naming:protocol>http</naming:protocol>
<naming:host>localhost</naming:host>
- <naming:port>8080</naming:port>
- <naming:uri>/activity/foo/as</naming:uri>
+ <naming:port>${webServicePort}</naming:port>
+ <naming:uri>/webservice/WebServiceBroker</naming:uri>
</naming:port>
</naming:service-ref>
</message-driven>
Modified: geronimo/trunk/sandbox/adventurebuilder/src/plan/bank1.0.3.ear-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/adventurebuilder/src/plan/bank1.0.3.ear-plan.xml?rev=358649&r1=358648&r2=358649&view=diff
==============================================================================
--- geronimo/trunk/sandbox/adventurebuilder/src/plan/bank1.0.3.ear-plan.xml (original)
+++ geronimo/trunk/sandbox/adventurebuilder/src/plan/bank1.0.3.ear-plan.xml Thu Dec 22 14:39:35 2005
@@ -35,7 +35,7 @@
<session>
<ejb-name>CreditCardEndpointBean</ejb-name>
<jndi-name>CreditCardEndpointBean</jndi-name>
- <web-service-address>http://localhost:8080/webservice/CreditCardService</web-service-address>
+ <web-service-address>http://localhost:${webServicePort}/webservice/CreditCardService</web-service-address>
</session>
</enterprise-beans>
</openejb-jar>
Modified: geronimo/trunk/sandbox/adventurebuilder/src/plan/consumerwebsite1.0.1.ear-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/adventurebuilder/src/plan/consumerwebsite1.0.1.ear-plan.xml?rev=358649&r1=358648&r2=358649&view=diff
==============================================================================
--- geronimo/trunk/sandbox/adventurebuilder/src/plan/consumerwebsite1.0.1.ear-plan.xml (original)
+++ geronimo/trunk/sandbox/adventurebuilder/src/plan/consumerwebsite1.0.1.ear-plan.xml Thu Dec 22 14:39:35 2005
@@ -16,14 +16,14 @@
limitations under the License.
-->
<!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
parentId="org/apache/geronimo/AdventureDataSource1.0.1"
configId="org/apache/geronimo/Adventure1.0.1">
<module>
<web>adventure.war</web>
- <web-app xmlns="http://geronimo.apache.org/xml/ns/web"
- xmlns:naming="http://geronimo.apache.org/xml/ns/naming"
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.0"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.0"
configId="NOT_USED">
<context-priority-classloader>false</context-priority-classloader>
@@ -34,8 +34,8 @@
<naming:port-name>PurchaseOrderIntfPort</naming:port-name>
<naming:protocol>http</naming:protocol>
<naming:host>localhost</naming:host>
- <naming:port>8080</naming:port>
- <naming:uri>/consumer/foo/po</naming:uri>
+ <naming:port>${webServicePort}</naming:port>
+ <naming:uri>/webservice/PoEndpointBean</naming:uri>
</naming:port>
</naming:service-ref>
<naming:service-ref>
@@ -44,8 +44,8 @@
<naming:port-name>OrderTrackingIntfPort</naming:port-name>
<naming:protocol>http</naming:protocol>
<naming:host>localhost</naming:host>
- <naming:port>8080</naming:port>
- <naming:uri>/consumer/foo/order</naming:uri>
+ <naming:port>${webServicePort}</naming:port>
+ <naming:uri>/webservice/OtEndpointBean</naming:uri>
</naming:port>
</naming:service-ref>
<naming:resource-ref>
Modified: geronimo/trunk/sandbox/adventurebuilder/src/plan/lodgingsupplier1.0.3.ear-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/adventurebuilder/src/plan/lodgingsupplier1.0.3.ear-plan.xml?rev=358649&r1=358648&r2=358649&view=diff
==============================================================================
--- geronimo/trunk/sandbox/adventurebuilder/src/plan/lodgingsupplier1.0.3.ear-plan.xml (original)
+++ geronimo/trunk/sandbox/adventurebuilder/src/plan/lodgingsupplier1.0.3.ear-plan.xml Thu Dec 22 14:39:35 2005
@@ -68,7 +68,7 @@
<naming:ref-name>jms/lodging/LodgingQueue</naming:ref-name>
<naming:message-destination-link>jms/lodging/LodgingQueue</naming:message-destination-link>
</naming:resource-env-ref>
- <web-service-address>http://localhost:8080/webservice/LodgingPOService</web-service-address>
+ <web-service-address>http://localhost:${webServicePort}/webservice/LodgingPOService</web-service-address>
</session>
<message-driven>
<ejb-name>LodgingMessageEJB</ejb-name>
@@ -91,8 +91,8 @@
<naming:port-name>BrokerServiceIntfPort</naming:port-name>
<naming:protocol>http</naming:protocol>
<naming:host>localhost</naming:host>
- <naming:port>8080</naming:port>
- <naming:uri>/activity/foo/as</naming:uri>
+ <naming:port>${webServicePort}</naming:port>
+ <naming:uri>/webservice/WebServiceBroker</naming:uri>
</naming:port>
</naming:service-ref>
</message-driven>
Modified: geronimo/trunk/sandbox/adventurebuilder/src/plan/opc1.0.3.ear-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/adventurebuilder/src/plan/opc1.0.3.ear-plan.xml?rev=358649&r1=358648&r2=358649&view=diff
==============================================================================
--- geronimo/trunk/sandbox/adventurebuilder/src/plan/opc1.0.3.ear-plan.xml (original)
+++ geronimo/trunk/sandbox/adventurebuilder/src/plan/opc1.0.3.ear-plan.xml Thu Dec 22 14:39:35 2005
@@ -22,27 +22,27 @@
<import>
<uri>org/apache/geronimo/AdventureBuilderJMS</uri>
</import>
- <dependency>
+ <dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-common</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${geronimo_version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-mail</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${geronimo_version}</version>
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-activation</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.0.2_spec</artifactId>
+ <version>${geronimo_spec_activation_version}</version>
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-javamail</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
+ <version>${geronimo_spec_javamail_version}</version>
</dependency>
- <module>
+ <module>
<ejb>opc-ejb.jar</ejb>
<openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar"
xmlns:naming="http://geronimo.apache.org/xml/ns/naming"
@@ -63,7 +63,7 @@
<naming:ref-name>jms/opc/WorkFlowMgrQueue</naming:ref-name>
<naming:message-destination-link>jms/opc/WorkFlowMgrQueue</naming:message-destination-link>
</naming:resource-env-ref>
- <web-service-address>http://localhost:8080/webservice/PoEndpointBean</web-service-address>
+ <web-service-address>http://localhost:${webServicePort}/webservice/PoEndpointBean</web-service-address>
</session>
<session>
<ejb-name>BrokerServiceBean</ejb-name>
@@ -76,7 +76,7 @@
<naming:ref-name>jms/opc/WorkFlowMgrQueue</naming:ref-name>
<naming:message-destination-link>jms/opc/WorkFlowMgrQueue</naming:message-destination-link>
</naming:resource-env-ref>
- <web-service-address>http://localhost:8080/webservice/WebServiceBroker</web-service-address>
+ <web-service-address>http://localhost:${webServicePort}/webservice/WebServiceBroker</web-service-address>
</session>
<session>
<ejb-name>OtEndpointBean</ejb-name>
@@ -89,7 +89,7 @@
<ref-name>ejb/local/purchaseorder/PurchaseOrder</ref-name>
<name>PurchaseOrderBean</name>
</ejb-local-ref>
- <web-service-address>http://localhost:8080/webservice/OtEndpointBean</web-service-address>
+ <web-service-address>http://localhost:${webServicePort}/webservice/OtEndpointBean</web-service-address>
</session>
<message-driven>
<ejb-name>WorkFlowManagerBean</ejb-name>
@@ -112,8 +112,8 @@
<naming:port-name>CreditCardIntfPort</naming:port-name>
<naming:protocol>http</naming:protocol>
<naming:host>localhost</naming:host>
- <naming:port>8080</naming:port>
- <naming:uri>/activity/foo/as</naming:uri>
+ <naming:port>${webServicePort}</naming:port>
+ <naming:uri>/webservice/CreditCardService</naming:uri>
</naming:port>
</naming:service-ref>
<resource-ref>
@@ -161,11 +161,11 @@
<activation-config>
<activation-config-property>
<activation-config-property-name>destination</activation-config-property-name>
- <activation-config-property-value>jms/opc/BrokerRequestorTopic</activation-config-property-value>
+ <activation-config-property-value>jms/opc/WebServiceBrokerQueue</activation-config-property-value>
</activation-config-property>
<activation-config-property>
<activation-config-property-name>destinationType</activation-config-property-name>
- <activation-config-property-value>javax.jms.Topic</activation-config-property-value>
+ <activation-config-property-value>javax.jms.Queue</activation-config-property-value>
</activation-config-property>
</activation-config>
<naming:service-ref>
@@ -174,8 +174,8 @@
<naming:port-name>ActivityPOIntfPort</naming:port-name>
<naming:protocol>http</naming:protocol>
<naming:host>localhost</naming:host>
- <naming:port>8080</naming:port>
- <naming:uri>/activity/foo/as</naming:uri>
+ <naming:port>${webServicePort}</naming:port>
+ <naming:uri>/webservice/ActivityPOService</naming:uri>
</naming:port>
</naming:service-ref>
<naming:service-ref>
@@ -184,8 +184,8 @@
<naming:port-name>LodgingPOIntfPort</naming:port-name>
<naming:protocol>http</naming:protocol>
<naming:host>localhost</naming:host>
- <naming:port>8080</naming:port>
- <naming:uri>/activity/foo/as</naming:uri>
+ <naming:port>${webServicePort}</naming:port>
+ <naming:uri>/webservice/LodgingPOService</naming:uri>
</naming:port>
</naming:service-ref>
<naming:service-ref>
@@ -194,8 +194,8 @@
<naming:port-name>AirlinePOIntfPort</naming:port-name>
<naming:protocol>http</naming:protocol>
<naming:host>localhost</naming:host>
- <naming:port>8080</naming:port>
- <naming:uri>/activity/foo/as</naming:uri>
+ <naming:port>${webServicePort}</naming:port>
+ <naming:uri>/webservice/AirlinePOService</naming:uri>
</naming:port>
</naming:service-ref>
<resource-ref>
@@ -239,12 +239,12 @@
<type-converter>org.tranql.sql.typeconverter.SerializableConverter</type-converter>
</cmp-field-mapping>
<primkey-field>addressBean_upk</primkey-field>
- <key-generator>
- <auto-increment-table>
- <sql>INSERT INTO Address VALUES(null,streetName1,streetName2,city,state,postalCode,country)</sql>
- <return-type>java.lang.Integer</return-type>
- </auto-increment-table>
- </key-generator>
+ <key-generator xmlns="http://www.openejb.org/xml/ns/pkgen">
+ <auto-increment-table>
+ <sql>INSERT INTO ADDRESS (streetName1) VALUES (NULL)</sql>
+ <return-type>java.lang.Integer</return-type>
+ </auto-increment-table>
+ </key-generator>
<resource-ref>
<ref-name>jdbc/adventure/AdventureDB</ref-name>
<resource-link>AdventureDataSource</resource-link>
@@ -278,9 +278,9 @@
<type-converter>org.tranql.sql.typeconverter.SerializableConverter</type-converter>
</cmp-field-mapping>
<primkey-field>contactInfoBean_upk</primkey-field>
- <key-generator>
+ <key-generator xmlns="http://www.openejb.org/xml/ns/pkgen">
<auto-increment-table>
- <sql>INSERT INTO ContactInfo VALUES(null,phone,email,givenName,familyName,null)</sql>
+ <sql>INSERT INTO ContactInfo (phone) VALUES(null)</sql>
<return-type>java.lang.Integer</return-type>
</auto-increment-table>
</key-generator>
@@ -337,9 +337,9 @@
<type-converter>org.tranql.sql.typeconverter.SerializableConverter</type-converter>
</cmp-field-mapping>
<primkey-field>lodgingBean_upk</primkey-field>
- <key-generator>
+ <key-generator xmlns="http://www.openejb.org/xml/ns/pkgen">
<auto-increment-table>
- <sql>INSERT INTO Lodging_Bean VALUES(null,startDate,lodgingId,noNights,endDate,location,noRooms,name,pricePerNight)</sql>
+ <sql>INSERT INTO Lodging_Bean (startDate) VALUES (null)</sql>
<return-type>java.lang.Integer</return-type>
</auto-increment-table>
</key-generator>
@@ -372,9 +372,9 @@
<type-converter>org.tranql.sql.typeconverter.SerializableConverter</type-converter>
</cmp-field-mapping>
<primkey-field>creditCardBean_upk</primkey-field>
- <key-generator>
+ <key-generator xmlns="http://www.openejb.org/xml/ns/pkgen">
<auto-increment-table>
- <sql>INSERT INTO CreditCard VALUES(null,cardNumber,cardType,cardExpiryDate)</sql>
+ <sql>INSERT INTO CreditCard (cardNumber) VALUES (null)</sql>
<return-type>java.lang.Integer</return-type>
</auto-increment-table>
</key-generator>
@@ -500,9 +500,9 @@
<type-converter>org.tranql.sql.typeconverter.SerializableConverter</type-converter>
</cmp-field-mapping>
<primkey-field>transportationBean_upk</primkey-field>
- <key-generator>
+ <key-generator xmlns="http://www.openejb.org/xml/ns/pkgen">
<auto-increment-table>
- <sql>INSERT INTO Transportation_Bean VALUES(null,transportationId,departureDate,destination,travelClass,price,carrier,origin,departureTime,headCount)</sql>
+ <sql>INSERT INTO Transportation_Bean (transportationId) VALUES (null)</sql>
<return-type>java.lang.Integer</return-type>
</auto-increment-table>
</key-generator>
@@ -551,9 +551,9 @@
<type-converter>org.tranql.sql.typeconverter.SerializableConverter</type-converter>
</cmp-field-mapping>
<primkey-field>activityBean_upk</primkey-field>
- <key-generator>
+ <key-generator xmlns="http://www.openejb.org/xml/ns/pkgen">
<auto-increment-table>
- <sql>INSERT INTO Activity_Bean VALUES(null,activityId,startDate,price,endDate,headCount,location,name,null)</sql>
+ <sql>INSERT INTO Activity_Bean (activityId) VALUES (null)</sql>
<return-type>java.lang.Integer</return-type>
</auto-increment-table>
</key-generator>
@@ -581,6 +581,10 @@
<ref-name>jms/opc/QueueConnectionFactory</ref-name>
<resource-link>AdventureBuilderConnectionFactory</resource-link>
</resource-ref>
+ <resource-ref>
+ <ref-name>mail/MailSession</ref-name>
+ <resource-link>mail/MailSession</resource-link>
+ </resource-ref>
</message-driven>
</enterprise-beans>
<relationships>
@@ -801,9 +805,10 @@
</enterprise-beans>
</openejb-jar>
</module>
- <gbean name="mail/MailSession" class="org.apache.geronimo.mail.MailGBean"/>
+ <gbean name="mail/MailSession" class="org.apache.geronimo.mail.MailGBean" />
<gbean name="mail/MailSession" class="org.apache.geronimo.mail.SMTPTransportGBean">
- <attribute name="host">10.0.0.1</attribute>
- <attribute name="port">25</attribute>
+ <attribute name="host">${smtpHost}</attribute>
+ <attribute name="port">${smtpPort}</attribute>
+ <attribute name="properties">mail.host=${smtpHost}</attribute>
</gbean>
</application>
Modified: geronimo/trunk/sandbox/adventurebuilder/src/sql/ab1.0.1.sql
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/adventurebuilder/src/sql/ab1.0.1.sql?rev=358649&r1=358648&r2=358649&view=diff
==============================================================================
--- geronimo/trunk/sandbox/adventurebuilder/src/sql/ab1.0.1.sql (original)
+++ geronimo/trunk/sandbox/adventurebuilder/src/sql/ab1.0.1.sql Thu Dec 22 14:39:35 2005
@@ -31,8 +31,7 @@
primary key (packageid, locale) ,
foreign key (catid, locale) references category (catid, locale),
foreign key (lodgingid, locale) references lodging (lodgingid, locale)
-)
-;
+);
create table activity (
activityid VARCHAR(20) not null,
@@ -95,6 +94,136 @@
primary key (userid)
)
;
+
+create table manager (
+ lodgingOrderStatus varchar(40),
+ orderError char,
+ orderId varchar(80),
+ status varchar(40),
+ activityOrderStatus varchar(40),
+ airlineOrderStatus varchar(40)
+);
+
+create table AirlineOrder (
+ orderId varchar(80),
+ depFlightId varchar(80),
+ depFlightDate bigint,
+ retFlightId varchar (80),
+ retFlightDate bigint,
+ headCount integer
+);
+
+create table LodgingOrder ( -- lodgingsupplier.ear -> LodgingOrderBean
+ orderId varchar (80),
+ lodgingId varchar(80),
+ startDate bigint,
+ endDate bigint,
+ headCount integer
+);
+
+create table Address (
+ streetName1 varchar(80),
+ streetName2 varChar(80),
+ city varchar(80),
+ state varchar(80),
+ postalCode varchar(30),
+ country varchar(80),
+ AddressBean_upk INTEGER GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1),
+ primary key (AddressBean_upk)
+);
+
+create table ContactInfo (
+ phone varchar(80),
+ email varchar(80),
+ givenName varchar(80),
+ familyName varchar(80),
+ address integer,
+ ContactInfoBean_upk INTEGER GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1),
+ primary key (ContactInfoBean_upk)
+);
+
+create table Lodging_Bean ( -- opc.ear -> LodgingBean
+ startDate bigint,
+ lodgingId varchar(80),
+ noNights integer,
+ endDate bigint,
+ location varchar(80),
+ noRooms integer,
+ name varchar(80),
+ pricePerNight real,
+ LodgingBean_upk INTEGER GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1),
+ primary key (LodgingBean_upk)
+);
+
+create table CreditCard (
+ cardNumber varchar(80),
+ cardType varchar(80),
+ cardExpiryDate varchar(80),
+ CreditCardBean_upk INTEGER GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1),
+ primary key (CreditCardBean_upk)
+);
+
+create table PurchaseOrder (
+ locale varchar(80),
+ totalPrice real,
+ startDate bigint,
+ userId varchar(80),
+ departureCity varchar(80),
+ endDate bigint,
+ orderDate bigint,
+ headCount integer,
+ poId varchar(80),
+ emailId varchar(80),
+ returnFlightInfo integer,
+ lodging integer,
+ departureFlightInfo integer,
+ billingInfo integer,
+ shippingInfo integer,
+ creditCard integer
+);
+
+create table Transportation_Bean (
+ transportationId varchar(80),
+ departureDate bigint,
+ destination varchar(80),
+ travelClass varchar(80),
+ price real,
+ carrier varchar(80),
+ origin varchar(80),
+ departureTime varchar(80),
+ headCount integer,
+ TransportationBean_upk INTEGER GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1),
+ primary key (TransportationBean_upk)
+);
+
+create table Activity_Bean ( -- opc.ear -> ActivityBean
+ activityId varchar(80),
+ startDate bigint,
+ price real,
+ endDate bigint,
+ headCount integer,
+ location varchar(80),
+ name varchar(80),
+ ActivityBean_upk INTEGER GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1),
+ PurchaseOrderBean_activities varchar(80),
+ primary key (ActivityBean_upk)
+);
+
+create table ActivityPurchaseOrder ( -- activitysupplier.ear -> ActivityPurchaseOrderBean
+ poId varchar(80),
+ primary key (poId)
+);
+
+create table ActivityDetails ( -- activitysupplier.ear -> ActivityDetailsBean
+ activityId varchar(80),
+ startDate bigint,
+ endDate bigint,
+ headCount integer,
+ ActivityPurchaseOrderBean_activities varchar(80),
+ activityDetailsBean_upk integer GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1),
+ primary key (ActivityDetailsBean_upk)
+);
+
INSERT INTO category VALUES ('ISLAND', 'en_US', 'Island Adventures', 'Experience an island paradise in a way fit for your needs.','Island_Adventures.gif')
;