[jboss-svn-commits] JBL Code SVN: r7530 - labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common

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

Author: kurt.stam at jboss.com
Date: 2006-11-09 16:24:09 -0500 (Thu, 09 Nov 2006)
New Revision: 7530

Modified:
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Configuration.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Environment.java
Log:
putting the defaults back, the unittests are using it.

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Configuration.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Configuration.java	2006-11-09 21:20:25 UTC (rev 7529)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Configuration.java	2006-11-09 21:24:09 UTC (rev 7530)
@@ -76,22 +76,24 @@
 
 	public static String getSmtpHost()
 	{
-		return ModulePropertyManager.getPropertyManager(ModulePropertyManager.TRANSPORTS_MODULE).getProperty(Environment.SMTP_HOST);
+		return ModulePropertyManager.getPropertyManager(ModulePropertyManager.TRANSPORTS_MODULE).getProperty(Environment.SMTP_HOST, Environment.DEFAULT_HOST);
 	}
 
 	public static String getSmtpUsername()
 	{
-		return ModulePropertyManager.getPropertyManager(ModulePropertyManager.TRANSPORTS_MODULE).getProperty(Environment.SMTP_USERNAME);
+		return ModulePropertyManager.getPropertyManager(ModulePropertyManager.TRANSPORTS_MODULE).getProperty(Environment.SMTP_USERNAME,
+				Environment.DEFAULT_USERNAME);
 	}
 
 	public static String getSmtpPassword()
 	{
-		return ModulePropertyManager.getPropertyManager(ModulePropertyManager.TRANSPORTS_MODULE).getProperty(Environment.SMTP_PASSWORD);
+		return ModulePropertyManager.getPropertyManager(ModulePropertyManager.TRANSPORTS_MODULE).getProperty(Environment.SMTP_PASSWORD,
+				Environment.DEFAULT_PASSWORD);
 	}
 
 	public static String getSmtpPort()
 	{
-		return ModulePropertyManager.getPropertyManager(ModulePropertyManager.TRANSPORTS_MODULE).getProperty(Environment.SMTP_PORT);
+		return ModulePropertyManager.getPropertyManager(ModulePropertyManager.TRANSPORTS_MODULE).getProperty(Environment.SMTP_PORT, Environment.DEFAULT_PORT);
 	}
 
 	public static String getSmtpFrom()
@@ -106,12 +108,14 @@
 
 	public static String getJndiServerType()
 	{
-		return ModulePropertyManager.getPropertyManager(ModulePropertyManager.CORE_MODULE).getProperty(Environment.JNDI_SERVER_TYPE);
+		return ModulePropertyManager.getPropertyManager(ModulePropertyManager.CORE_MODULE).getProperty(Environment.JNDI_SERVER_TYPE,
+				Environment.DEFAULT_SERVER_TYPE);
 	}
 
 	public static String getJndiServerURL()
 	{
-		return ModulePropertyManager.getPropertyManager(ModulePropertyManager.CORE_MODULE).getProperty(Environment.JNDI_SERVER_URL);
+		return ModulePropertyManager.getPropertyManager(ModulePropertyManager.CORE_MODULE).getProperty(Environment.JNDI_SERVER_URL,
+				Environment.DEFAULT_HOST);
 	}
 	/**
 	 * The Registry Query Manager URI can be used to obtain information about services and their endPoints.

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Environment.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Environment.java	2006-11-09 21:20:25 UTC (rev 7529)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Environment.java	2006-11-09 21:24:09 UTC (rev 7530)
@@ -94,6 +94,11 @@
 	 * Some default values.
 	 */
 	public static final String DEFAULT_PROPERTY_FILE                  = "jbossesb-properties.xml";
+	public static final String DEFAULT_HOST                           = "localhost";
+	public static final String DEFAULT_USERNAME                       = "";
+	public static final String DEFAULT_PASSWORD                       = "";
+	public static final String DEFAULT_PORT                           = "25";
+	public static final String DEFAULT_SERVER_TYPE                    = "jboss";
 	
 	/*
 	 * DatabaseMessageStore Persistence Store properties.