[jboss-svn-commits] JBL Code SVN: r5550 - in labs/jbossesb/trunk/product/config: . conf deploy

[jboss-svn-commits at lists.jboss.org]

Author: kurt.stam at jboss.com
Date: 2006-08-07 10:57:43 -0400 (Mon, 07 Aug 2006)
New Revision: 5550

Modified:
   labs/jbossesb/trunk/product/config/build.xml
   labs/jbossesb/trunk/product/config/conf/jbossEsb.properties
   labs/jbossesb/trunk/product/config/deploy/JBossESB-ds.xml
   labs/jbossesb/trunk/product/config/deployment.properties-example
Log:
Adding deployment script

Modified: labs/jbossesb/trunk/product/config/build.xml
===================================================================
--- labs/jbossesb/trunk/product/config/build.xml	2006-08-07 14:55:04 UTC (rev 5549)
+++ labs/jbossesb/trunk/product/config/build.xml	2006-08-07 14:57:43 UTC (rev 5550)
@@ -20,11 +20,21 @@
 		<copy  file="${org.jboss.esb.deployment.conf}/jbossEsb.properties" overwrite="true"
 		       todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/conf">
 				<filterset>
+					<filter token="org.jboss.soa.esb.mail.smtp.host" value="${org.jboss.soa.esb.mail.smtp.host}" />
+					<filter token="org.jboss.soa.esb.mail.smtp.port" value="${org.jboss.soa.esb.mail.smtp.port}" />
+					<filter token="org.jboss.soa.esb.mail.smtp.user" value="${org.jboss.soa.esb.mail.smtp.user}" />
+					<filter token="org.jboss.soa.esb.mail.smtp.password" value="${org.jboss.soa.esb.mail.smtp.password}" />
 		            <filter token="esb.objstore.xml" value="${org.jboss.esb.config.objstore}" />
 		        </filterset></copy>
 		<!-- deploy -->
 		<copy file="${org.jboss.esb.deployment.deploy}/JBossESB-ds.xml"
-		        todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy"/>
+		        todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy">
+			<filterset>
+				<filter token="org.jboss.esb.db.url" value="${org.jboss.esb.db.url}" />
+				<filter token="org.jboss.esb.db.driver" value="${org.jboss.esb.db.driver}" />
+				<filter token="org.jboss.esb.db.user" value="${org.jboss.esb.db.user}" />
+				<filter token="org.jboss.esb.db.password" value="${org.jboss.esb.db.password}" />
+			</filterset></copy>
 		<copy file="${org.jboss.esb.deployment.deploy}/properties-service.xml"
 				        todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy"/>
 	</target>

Modified: labs/jbossesb/trunk/product/config/conf/jbossEsb.properties
===================================================================
--- labs/jbossesb/trunk/product/config/conf/jbossEsb.properties	2006-08-07 14:55:04 UTC (rev 5549)
+++ labs/jbossesb/trunk/product/config/conf/jbossEsb.properties	2006-08-07 14:57:43 UTC (rev 5550)
@@ -27,10 +27,10 @@
 #
 # Mail Notification Settings
 #
-org.jboss.soa.esb.mail.smtp.host=mail.mydomain.com
-org.jboss.soa.esb.mail.smtp.user=user
-org.jboss.soa.esb.mail.smtp.password=password
-org.jboss.soa.esb.mail.smtp.port=587
+org.jboss.soa.esb.mail.smtp.host=@org.jboss.soa.esb.mail.smtp.host@
+org.jboss.soa.esb.mail.smtp.user=@org.jboss.soa.esb.mail.smtp.user@
+org.jboss.soa.esb.mail.smtp.password=@org.jboss.soa.esb.mail.smtp.password@
+org.jboss.soa.esb.mail.smtp.port=@org.jboss.soa.esb.mail.smtp.port@
 
 
 #

Modified: labs/jbossesb/trunk/product/config/deploy/JBossESB-ds.xml
===================================================================
--- labs/jbossesb/trunk/product/config/deploy/JBossESB-ds.xml	2006-08-07 14:55:04 UTC (rev 5549)
+++ labs/jbossesb/trunk/product/config/deploy/JBossESB-ds.xml	2006-08-07 14:57:43 UTC (rev 5550)
@@ -2,10 +2,10 @@
   <local-tx-datasource>
     <jndi-name>JBossESBDS</jndi-name>
 
-    <connection-url>jdbc:postgresql://localhost:5432/jbossesb</connection-url>
-    <driver-class>org.postgresql.Driver</driver-class>
-    <user-name>postgres</user-name>
-    <password>postgres</password>
+    <connection-url>@org.jboss.esb.db.url@</connection-url>
+    <driver-class>@org.jboss.esb.db.driver@</driver-class>
+    <user-name>@org.jboss.esb.db.user@</user-name>
+    <password>@org.jboss.esb.db.password@</password>
 
     <min-pool-size>10</min-pool-size>
     <max-pool-size>100</max-pool-size>

Modified: labs/jbossesb/trunk/product/config/deployment.properties-example
===================================================================
--- labs/jbossesb/trunk/product/config/deployment.properties-example	2006-08-07 14:55:04 UTC (rev 5549)
+++ labs/jbossesb/trunk/product/config/deployment.properties-example	2006-08-07 14:57:43 UTC (rev 5550)
@@ -12,7 +12,17 @@
 # server configuration
 # jboss    : default or all
 org.jboss.esb.appserver.config=default
+######################################################################
 # reference to jboss esb configuration file
+# mail server host
+org.jboss.soa.esb.mail.smtp.host=mail.mydomain.com
+# smtp port of the host
+org.jboss.soa.esb.mail.smtp.port=25
+# email user account
+org.jboss.soa.esb.mail.smtp.user=user
+# email account password
+org.jboss.soa.esb.mail.smtp.password=password
+# reference to object store config
 org.jboss.esb.config.objstore=/cygwin/home/kstam/dev1.6/loanbrokerdemo/conf/ObjStore.xml
 #
 ######################################################################
@@ -26,7 +36,7 @@
 # database driver
 # postgres : org.postgresql.Driver
 # oracle   : oracle.jdbc.driver.OracleDriver
-org.jboss.esb.db.driver.class=org.postgresql.Driver 
+org.jboss.esb.db.driver=org.postgresql.Driver 
 # database url
 # postgres : jdbc:postgresql://localhost:5432/jbossesb
 # oracle   : jdbc:oracle:thin:@localhost:1523:jbossesb
@@ -47,7 +57,7 @@
 # database driver
 # postgres : org.postgresql.Driver
 # oracle   : oracle.jdbc.driver.OracleDriver
-org.jboss.esb.test.db.driver.class=org.postgresql.Driver 
+org.jboss.esb.test.db.driver=org.postgresql.Driver 
 # database url
 # postgres : jdbc:postgresql://localhost:5432/jbossesb
 # oracle   : jdbc:oracle:thin:@localhost:1523:jbossesb