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 2006/01/02 16:46:20 UTC
svn commit: r365364 - in /geronimo/trunk/sandbox/adventurebuilder: ./
src/plan/
Author: jlaskowski
Date: Mon Jan 2 07:46:13 2006
New Revision: 365364
URL: http://svn.apache.org/viewcvs?rev=365364&view=rev
Log:
Jakob's patch applied. @see http://issues.apache.org/jira/browse/GERONIMO-1164#action_12361517
The changes (copied from Jakob's comment):
+ Moved the deployer-configurable properties from maven.xml to project.properties
+ Changed the geronimo artifact id used in unpackServer from the tomcat distribution to the jetty distribution, as I experienced some problems with the Tomcat distro.
+ Added dependencies for geronimo-javamail-transport-1.0.jar, and added them to the list of jars being copied manually in the unpackServer goal
+ Moved around some of the properties in the configuration of the MailGBean and SMTPTransportGBean. It seems that the SMTPTransportGBean isn't necessary, so I have removed it.
Great job! Thanks Jakob!
Modified:
geronimo/trunk/sandbox/adventurebuilder/maven.xml
geronimo/trunk/sandbox/adventurebuilder/project.properties
geronimo/trunk/sandbox/adventurebuilder/project.xml
geronimo/trunk/sandbox/adventurebuilder/src/plan/activitysupplier1.0.3.ear-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/lodgingsupplier1.0.3.ear-plan.xml
geronimo/trunk/sandbox/adventurebuilder/src/plan/opc1.0.3.ear-plan.xml
Modified: geronimo/trunk/sandbox/adventurebuilder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/adventurebuilder/maven.xml?rev=365364&r1=365363&r2=365364&view=diff
==============================================================================
--- geronimo/trunk/sandbox/adventurebuilder/maven.xml (original)
+++ geronimo/trunk/sandbox/adventurebuilder/maven.xml Mon Jan 2 07:46:13 2006
@@ -23,14 +23,9 @@
xmlns:ant="jelly:ant"
xmlns:deploy="geronimo:deploy"
xmlns:velocity="jelly:velocity"
- xmlns:u="jelly:util"
- >
+ xmlns:u="jelly:util">
<j:set var="instDir" value="${maven.build.dir}/geronimo-${geronimo_version}"/>
- <!-- 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" />
@@ -46,7 +41,8 @@
<!-- TODO: Make geronimoArtifactId configurable -->
<deploy:unpackServer
geronimoVersion="${geronimo_version}"
- geronimoArtifactId="geronimo-tomcat-j2ee"/>
+ geronimoArtifactId="geronimo-jetty-j2ee"/>
+
<!-- Copy necessary javamail jars -->
<ant:copy todir="${instDir}/repository/org.apache.geronimo.specs/jars">
<ant:fileset dir="${maven.repo.local}/org.apache.geronimo.specs/jars">
@@ -54,8 +50,12 @@
<ant:include name="geronimo-javamail_1.3.1_spec-${geronimo_spec_javamail_version}.jar"/>
</ant:fileset>
</ant:copy>
- <ant:copy file="${maven.repo.local}/geronimo/jars/geronimo-mail-${geronimo_version}.jar"
- todir="${instDir}/repository/geronimo/jars"/>
+ <ant:copy todir="${instDir}/repository/geronimo/jars">
+ <ant:fileset dir="${maven.repo.local}/geronimo/jars">
+ <ant:include name="geronimo-javamail-transport-${geronimo_version}.jar" />
+ <ant:include name="geronimo-mail-${geronimo_version}.jar" />
+ </ant:fileset>
+ </ant:copy>
</goal>
<goal name="ab:startForDeployment">
@@ -212,5 +212,4 @@
password="manager"/>
<echo message="Adventure Builder has stopped"/>
</goal>
-
</project>
Modified: geronimo/trunk/sandbox/adventurebuilder/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/adventurebuilder/project.properties?rev=365364&r1=365363&r2=365364&view=diff
==============================================================================
--- geronimo/trunk/sandbox/adventurebuilder/project.properties (original)
+++ geronimo/trunk/sandbox/adventurebuilder/project.properties Mon Jan 2 07:46:13 2006
@@ -17,4 +17,14 @@
##
## $Rev$ $Date$
+
ab.home=adventure1.0.3
+
+## If you want the application to send mail:
+## - Set smtpHost to a valid smtp host
+## - Set the env entry param/SendMail to true for the bean WorkFlowManagerBean
+## in the opc-ejb.jar of opc.ear in the adventure builder application
+smtpHost=mail.eos.dk
+smtpPort=25
+smtpFrom=Adventure Builder <opc@ab.blueprints.sun.com>
+
Modified: geronimo/trunk/sandbox/adventurebuilder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/adventurebuilder/project.xml?rev=365364&r1=365363&r2=365364&view=diff
==============================================================================
--- geronimo/trunk/sandbox/adventurebuilder/project.xml (original)
+++ geronimo/trunk/sandbox/adventurebuilder/project.xml Mon Jan 2 07:46:13 2006
@@ -53,6 +53,11 @@
<version>${geronimo_version}</version>
</dependency>
<dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-javamail-transport</artifactId>
+ <version>${geronimo_version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.3.1_spec</artifactId>
<version>${geronimo_spec_javamail_version}</version>
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=365364&r1=365363&r2=365364&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 Mon Jan 2 07:46:13 2006
@@ -43,7 +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>
+ <web-service-address>http://localhost:8080/webservice/ActivityPOService</web-service-address>
</session>
<entity>
<ejb-name>ActivityPurchaseOrderBean</ejb-name>
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=365364&r1=365363&r2=365364&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 Mon Jan 2 07:46:13 2006
@@ -77,7 +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>
+ <web-service-address>http://localhost:8080/webservice/AirlinePOService</web-service-address>
</session>
<message-driven>
<ejb-name>AirlineMessageEJB</ejb-name>
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=365364&r1=365363&r2=365364&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 Mon Jan 2 07:46:13 2006
@@ -35,7 +35,7 @@
<session>
<ejb-name>CreditCardEndpointBean</ejb-name>
<jndi-name>CreditCardEndpointBean</jndi-name>
- <web-service-address>http://localhost:${webServicePort}/webservice/CreditCardService</web-service-address>
+ <web-service-address>http://localhost:8080/webservice/CreditCardService</web-service-address>
</session>
</enterprise-beans>
</openejb-jar>
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=365364&r1=365363&r2=365364&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 Mon Jan 2 07:46:13 2006
@@ -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:${webServicePort}/webservice/LodgingPOService</web-service-address>
+ <web-service-address>http://localhost:8080/webservice/LodgingPOService</web-service-address>
</session>
<message-driven>
<ejb-name>LodgingMessageEJB</ejb-name>
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=365364&r1=365363&r2=365364&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 Mon Jan 2 07:46:13 2006
@@ -22,12 +22,12 @@
<import>
<uri>org/apache/geronimo/AdventureBuilderJMS</uri>
</import>
- <dependency>
+ <dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-common</artifactId>
<version>${geronimo_version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-mail</artifactId>
<version>${geronimo_version}</version>
@@ -42,6 +42,11 @@
<artifactId>geronimo-javamail_1.3.1_spec</artifactId>
<version>${geronimo_spec_javamail_version}</version>
</dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-javamail-transport</artifactId>
+ <version>${geronimo_version}</version>
+ </dependency>
<module>
<ejb>opc-ejb.jar</ejb>
<openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar"
@@ -63,7 +68,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:${webServicePort}/webservice/PoEndpointBean</web-service-address>
+ <web-service-address>http://localhost:8080/webservice/PoEndpointBean</web-service-address>
</session>
<session>
<ejb-name>BrokerServiceBean</ejb-name>
@@ -76,7 +81,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:${webServicePort}/webservice/WebServiceBroker</web-service-address>
+ <web-service-address>http://localhost:8080/webservice/WebServiceBroker</web-service-address>
</session>
<session>
<ejb-name>OtEndpointBean</ejb-name>
@@ -89,7 +94,7 @@
<ref-name>ejb/local/purchaseorder/PurchaseOrder</ref-name>
<name>PurchaseOrderBean</name>
</ejb-local-ref>
- <web-service-address>http://localhost:${webServicePort}/webservice/OtEndpointBean</web-service-address>
+ <web-service-address>http://localhost:8080/webservice/OtEndpointBean</web-service-address>
</session>
<message-driven>
<ejb-name>WorkFlowManagerBean</ejb-name>
@@ -805,10 +810,18 @@
</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">
+ <attribute name="host">${smtpHost}</attribute>
+ <attribute name="properties">
+ mail.from=${smtpFrom}
+ mail.smtp.port=${smtpPort}</attribute>
+ </gbean>
+
+
+
<gbean name="mail/MailSession" class="org.apache.geronimo.mail.SMTPTransportGBean">
<attribute name="host">${smtpHost}</attribute>
<attribute name="port">${smtpPort}</attribute>
- <attribute name="properties">mail.host=${smtpHost}</attribute>
+ <attribute name="from">${smtpFrom}</attribute>
</gbean>
</application>