[jboss-svn-commits] JBL Code SVN: r5259 - in labs/jbossesb/trunk/product: core core/common/src/org/jboss/soa/esb/common core/listeners/tests core/processors/tests core/services/tests docs/Install/conf

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Jul 24 06:50:14 EDT 2006


Author: mark.little at jboss.com
Date: 2006-07-24 06:50:02 -0400 (Mon, 24 Jul 2006)
New Revision: 5259

Added:
   labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/EsbSysProps.java
Removed:
   labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/EsbSysProps.java
Modified:
   labs/jbossesb/trunk/product/core/build.xml
   labs/jbossesb/trunk/product/core/listeners/tests/build.xml
   labs/jbossesb/trunk/product/core/processors/tests/build.xml
   labs/jbossesb/trunk/product/core/services/tests/build.xml
   labs/jbossesb/trunk/product/docs/Install/conf/jbossEsb.properties
Log:
http://jira.jboss.com/jira/browse/JBESB-50

Modified: labs/jbossesb/trunk/product/core/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/build.xml	2006-07-23 12:55:37 UTC (rev 5258)
+++ labs/jbossesb/trunk/product/core/build.xml	2006-07-24 10:50:02 UTC (rev 5259)
@@ -79,38 +79,24 @@
     <!-- Clean  all                                                          -->
     <!-- =================================================================== -->
     <target name="clean" description="Clean dist directory and cleans subprojects">
-        <delete dir="${org.jboss.esb.internal.dest}"/>
-        <!--
-        for now I am going to delete the build directory as each module builds
-        to a common place, so calling clean on each module does not make sense,
-        that is unless we later configure the clean task to delete <module>
-        specific classes
-        -->
-            <!--
+        <delete dir="${org.jboss.esb.internal.dest}/classes"/>
+ 
             <ant dir="common" target="clean"/>
     	    <ant dir="listeners" target="clean"/>
     	    <ant dir="processors" target="clean"/>
     	    <ant dir="services" target="clean"/>
-    	    -->
-            <!-- tests are now per module, this will be cleaned up later
-            <ant dir="tests" target="clean"/>
-            -->
+
     </target>
 	
 	<target name="purge" depends="clean">
-        <!--
+
         <delete dir="${org.jboss.esb.internal.dest}/dist"/>
-        -->
-		<!-- see comment above w.r.t clean and where module are build to -->
-        <!--
+ 
         <ant dir="common" target="purge"/>
 		<ant dir="listeners" target="purge"/>
 		<ant dir="processors" target="purge"/>
 		<ant dir="services" target="purge"/>
-		-->
-        <!-- tests are now per module, this will be cleaned up later
-        <ant dir="tests" target="purge"/>
-        -->
+
 	</target>
 
     <!-- =================================================================== -->

Deleted: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/EsbSysProps.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/EsbSysProps.java	2006-07-23 12:55:37 UTC (rev 5258)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/EsbSysProps.java	2006-07-24 10:50:02 UTC (rev 5259)
@@ -1,103 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-
-package org.jboss.soa.esb.common;
-
-import org.jboss.soa.esb.helpers.KeyValuePair;
-
-public class EsbSysProps
-{
-	public static final String SMTP_HOST		= "jbossEsb.mail.smtp.host";
-	public static final String SMTP_USERNAME  	= "jbossEsb.mail.smtp.user";
-	public static final String SMTP_PASSWORD	= "jbossEsb.mail.smtp.password";
-	public static final String SMTP_PORT		= "jbossEsb.mail.smtp.port";
-
-	public static final String JNDI_SERVER_TYPE	= "jbossEsb.jndi.server.type";
-	public static final String JNDI_SERVER_URL	= "jbossEsb.jndi.server.url";
-
-	public static final String PARAMS_REPOS_FACTORY_CLASS
-										= "jbossEsb.paramsRepository.factory.class";
-	public static final String OBJECT_STORE_CONFIG_FILE
-										= "jbossEsb.objStore.configfile";
-	public static final String ENCRYPT_FACTORY_CLASS
-										= "jbossEsb.encryption.factory.class";
-
-	private static KeyValuePair[] s_oaKV = new KeyValuePair[]
-    {new KeyValuePair(SMTP_HOST		,getSmtpHost())
-	,new KeyValuePair(SMTP_USERNAME	,getSmtpUsername())
-	,new KeyValuePair(SMTP_PASSWORD	,getSmtpPassword())
-	,new KeyValuePair(SMTP_PORT		,getSmtpPort())
-	,new KeyValuePair(JNDI_SERVER_TYPE, getJndiServerType())
-	,new KeyValuePair(JNDI_SERVER_URL,getJndiServerURL())
-	,new KeyValuePair(PARAMS_REPOS_FACTORY_CLASS, getParamsReposFactoryClass())
-	,new KeyValuePair(OBJECT_STORE_CONFIG_FILE, getObjStoreConfigFile())
-	,new KeyValuePair(ENCRYPT_FACTORY_CLASS, getEncryptionFactoryClass())
-
-	};
-
-	public static String dump()
-	{	StringBuilder sb = new StringBuilder("Dump of EsbSysProps:\n");
-		for (KeyValuePair oCurr : s_oaKV)
-			sb.append(oCurr.getKey()).append("=").append(oCurr.getValue()).append("\n")
-		;
-		return sb.append("______________________________________").toString();
-	} //________________________________
-	
-	public static String getSmtpHost()
-	{ return System.getProperty(SMTP_HOST,"localhost");
-	}
-
-	public static String getSmtpUsername()
-	{ return System.getProperty(SMTP_USERNAME,"");
-	}
-
-	public static String getSmtpPassword()
-	{ return System.getProperty(SMTP_PASSWORD,"");
-	}
-
-	public static String getSmtpPort()
-	{ return System.getProperty(SMTP_PORT,"25");
-	}
-
-	public static String getJndiServerType()
-	{ return System.getProperty(JNDI_SERVER_TYPE,"jboss"); }
-
-	public static String getJndiServerURL()
-	{ return System.getProperty(JNDI_SERVER_URL,"localhost"); }
-
-
-	public static String getParamsReposFactoryClass()
-	{ return System.getProperty(PARAMS_REPOS_FACTORY_CLASS
-							,"org.jboss.soa.esb.parameters.DefaultReposFactory");
-	}
-	
-	public static String getObjStoreConfigFile()
-	{ return System.getProperty(OBJECT_STORE_CONFIG_FILE);
-	}
-
-	public static String getEncryptionFactoryClass()
-	{ return System.getProperty(ENCRYPT_FACTORY_CLASS
-							,"org.jboss.soa.esb.services.DefaultEncryptionFactory");
-	}
-	
-
-} //_____________________________________________________________________

Added: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/EsbSysProps.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/EsbSysProps.java	2006-07-23 12:55:37 UTC (rev 5258)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/EsbSysProps.java	2006-07-24 10:50:02 UTC (rev 5259)
@@ -0,0 +1,114 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.soa.esb.common;
+
+import org.jboss.soa.esb.helpers.KeyValuePair;
+
+public class EsbSysProps
+{
+	public static final String SMTP_HOST = "org.jboss.soa.esb.mail.smtp.host";
+	public static final String SMTP_USERNAME = "org.jboss.soa.esb.mail.smtp.user";
+	public static final String SMTP_PASSWORD = "org.jboss.soa.esb.mail.smtp.password";
+	public static final String SMTP_PORT = "org.jboss.soa.esb.mail.smtp.port";
+	public static final String JNDI_SERVER_TYPE = "org.jboss.soa.esb.jndi.server.type";
+	public static final String JNDI_SERVER_URL = "org.jboss.soa.esb.jndi.server.url";
+	public static final String PARAMS_REPOS_FACTORY_CLASS = "org.jboss.soa.esb.paramsRepository.factory.class";
+	public static final String OBJECT_STORE_CONFIG_FILE = "org.jboss.soa.esb.objStore.configfile";
+	public static final String ENCRYPT_FACTORY_CLASS = "jorg.jboss.soa.esb.encryption.factory.class";
+
+	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";
+	
+	private static KeyValuePair[] s_oaKV = new KeyValuePair[]
+	{
+			new KeyValuePair(SMTP_HOST, getSmtpHost()),
+			new KeyValuePair(SMTP_USERNAME, getSmtpUsername()),
+			new KeyValuePair(SMTP_PASSWORD, getSmtpPassword()),
+			new KeyValuePair(SMTP_PORT, getSmtpPort()),
+			new KeyValuePair(JNDI_SERVER_TYPE, getJndiServerType()),
+			new KeyValuePair(JNDI_SERVER_URL, getJndiServerURL()),
+			new KeyValuePair(PARAMS_REPOS_FACTORY_CLASS,
+					getParamsReposFactoryClass()),
+			new KeyValuePair(OBJECT_STORE_CONFIG_FILE, getObjStoreConfigFile()),
+			new KeyValuePair(ENCRYPT_FACTORY_CLASS, getEncryptionFactoryClass())
+
+	};
+
+	public static String dump()
+	{
+		StringBuilder sb = new StringBuilder("Dump of EsbSysProps:\n");
+		for (KeyValuePair oCurr : s_oaKV)
+			sb.append(oCurr.getKey()).append("=").append(oCurr.getValue())
+					.append("\n");
+		return sb.append("______________________________________").toString();
+	} // ________________________________
+
+	public static String getSmtpHost()
+	{
+		return System.getProperty(SMTP_HOST, EsbSysProps.DEFAULT_HOST);
+	}
+
+	public static String getSmtpUsername()
+	{
+		return System.getProperty(SMTP_USERNAME, EsbSysProps.DEFAULT_USERNAME);
+	}
+
+	public static String getSmtpPassword()
+	{
+		return System.getProperty(SMTP_PASSWORD, EsbSysProps.DEFAULT_PASSWORD);
+	}
+
+	public static String getSmtpPort()
+	{
+		return System.getProperty(SMTP_PORT, EsbSysProps.DEFAULT_PORT);
+	}
+
+	public static String getJndiServerType()
+	{
+		return System.getProperty(JNDI_SERVER_TYPE, EsbSysProps.DEFAULT_SERVER_TYPE);
+	}
+
+	public static String getJndiServerURL()
+	{
+		return System.getProperty(JNDI_SERVER_URL, EsbSysProps.DEFAULT_HOST);
+	}
+
+	public static String getParamsReposFactoryClass()
+	{
+		return System.getProperty(PARAMS_REPOS_FACTORY_CLASS, org.jboss.soa.esb.parameters.DefaultReposFactory.class.getName());
+	}
+
+	public static String getObjStoreConfigFile()
+	{
+		return System.getProperty(OBJECT_STORE_CONFIG_FILE);
+	}
+
+	public static String getEncryptionFactoryClass()
+	{
+		return System.getProperty(ENCRYPT_FACTORY_CLASS, org.jboss.soa.esb.services.DefaultEncryptionFactory.class.getName());
+	}
+
+}
\ No newline at end of file


Property changes on: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/EsbSysProps.java
___________________________________________________________________
Name: svn:executable
   + *

Modified: labs/jbossesb/trunk/product/core/listeners/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/build.xml	2006-07-23 12:55:37 UTC (rev 5258)
+++ labs/jbossesb/trunk/product/core/listeners/tests/build.xml	2006-07-24 10:50:02 UTC (rev 5259)
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <project name="build.listeners.tests" default="org.jboss.esb.listeners.tests.compile" basedir=".">
 
-    <property name="org.jboss.esb.tests.bin.dir" value="${org.jboss.esb.internal.dest}/tests"/>
+    <property name="org.jboss.esb.tests.classes.dir" value="${org.jboss.esb.internal.dest}/tests"/>
     <property name="org.jboss.esb.tests.report.dir" value="${org.jboss.esb.internal.dest}/tests/junit"/>
-    <property name="org.jboss.esb.core.bin.dir" value="${org.jboss.esb.internal.dest}/classes"/>
+    <property name="org.jboss.esb.core.classes.dir" value="${org.jboss.esb.internal.dest}/classes"/>
     <property name="org.jboss.esb.tests.src.dir" value="${basedir}/src"/>
     <property name="org.jboss.esb.root.dir" value="../.."/>
     <property environment="env"/>
@@ -16,7 +16,7 @@
     <path id="org.jboss.esb.tests.base.classpath">
         <fileset dir="../${org.jboss.esb.ext.lib.dir}"
                  includes="activation.jar jbossall-client.jar log4j.jar mail.jar junit.jar"/>
-        <pathelement location="${org.jboss.esb.core.bin.dir}"/>
+        <pathelement location="${org.jboss.esb.core.classes.dir}"/>
     </path>
 
     <target name="org.jboss.esb.tests.init">
@@ -24,20 +24,20 @@
             <format property="TODAY" pattern="d-MM-yy"/>
         </tstamp>
 
-        <mkdir dir="${org.jboss.esb.tests.bin.dir}"/>
+        <mkdir dir="${org.jboss.esb.tests.classes.dir}"/>
         <mkdir dir="${org.jboss.esb.tests.report.dir}"/>
     </target>
 
     <target name="clean"/>
 
     <target name="purge" depends="clean">
-        <delete dir="${org.jboss.esb.tests.bin.dir}"/>
+        <delete dir="${org.jboss.esb.tests.classes.dir}"/>
     </target>
 
     <target name="org.jboss.esb.listeners.tests.compile" if="org.jboss.esb.buildtests" depends="org.jboss.esb.tests.init">
 
         <javac
-                destdir="${org.jboss.esb.tests.bin.dir}"
+                destdir="${org.jboss.esb.tests.classes.dir}"
                 classpathref="org.jboss.esb.tests.base.classpath"
                 debug="${org.jboss.esb.debug}"
                 optimize="${org.jboss.esb.optimize}"
@@ -66,14 +66,14 @@
             <formatter type="plain" usefile="false"/>
             <formatter type="xml"/>
             <batchtest todir="${org.jboss.esb.tests.report.dir}">
-                <fileset dir="${org.jboss.esb.tests.bin.dir}">
+                <fileset dir="${org.jboss.esb.tests.classes.dir}">
                     <include name="**/**/listeners/**/**UnitTest.class"/>
                 </fileset>
             </batchtest>
             <classpath>
                 <path refid="org.jboss.esb.tests.base.classpath"/>
-                <pathelement location="${org.jboss.esb.core.bin.dir}"/>
-                <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
+                <pathelement location="${org.jboss.esb.core.classes.dir}"/>
+                <pathelement location="${org.jboss.esb.tests.classes.dir}"/>
             </classpath>
         </junit>
         <junitreport>
@@ -95,14 +95,14 @@
             <formatter type="plain" usefile="false"/>
             <formatter type="xml"/>
             <batchtest todir="${org.jboss.esb.tests.report.dir}">
-                <fileset dir="${org.jboss.esb.tests.bin.dir}">
+                <fileset dir="${org.jboss.esb.tests.classes.dir}">
                     <include name="**/**/listeners/**/**FuncTest.class"/>
                 </fileset>
             </batchtest>
             <classpath>
                 <path refid="org.jboss.esb.tests.base.classpath"/>
-                <pathelement location="${org.jboss.esb.core.bin.dir}"/>
-                <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
+                <pathelement location="${org.jboss.esb.core.classes.dir}"/>
+                <pathelement location="${org.jboss.esb.tests.classes.dir}"/>
             </classpath>
         </junit>
         <junitreport>

Modified: labs/jbossesb/trunk/product/core/processors/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/processors/tests/build.xml	2006-07-23 12:55:37 UTC (rev 5258)
+++ labs/jbossesb/trunk/product/core/processors/tests/build.xml	2006-07-24 10:50:02 UTC (rev 5259)
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <project name="build.processors.tests" default="org.jboss.esb.processors.tests.compile" basedir=".">
 
-    <property name="org.jboss.esb.tests.bin.dir" value="${org.jboss.esb.internal.dest}/tests"/>
+    <property name="org.jboss.esb.tests.classes.dir" value="${org.jboss.esb.internal.dest}/tests"/>
     <property name="org.jboss.esb.tests.report.dir" value="${org.jboss.esb.internal.dest}/tests/junit"/>
-    <property name="org.jboss.esb.core.bin.dir" value="${org.jboss.esb.internal.dest}/classes"/>
+    <property name="org.jboss.esb.core.classes.dir" value="${org.jboss.esb.internal.dest}/classes"/>
     <property name="org.jboss.esb.tests.src.dir" value="${basedir}/src"/>
     <property name="org.jboss.esb.root.dir" value="../.."/>
     <property environment="env"/>
@@ -16,7 +16,7 @@
     <path id="org.jboss.esb.tests.base.classpath">
         <fileset dir="../${org.jboss.esb.ext.lib.dir}"
                  includes="activation.jar jbossall-client.jar log4j.jar mail.jar junit.jar"/>
-        <pathelement location="${org.jboss.esb.core.bin.dir}"/>
+        <pathelement location="${org.jboss.esb.core.classes.dir}"/>
     </path>
 
     <target name="org.jboss.esb.tests.init">
@@ -24,20 +24,20 @@
             <format property="TODAY" pattern="d-MM-yy"/>
         </tstamp>
 
-        <mkdir dir="${org.jboss.esb.tests.bin.dir}"/>
+        <mkdir dir="${org.jboss.esb.tests.classes.dir}"/>
         <mkdir dir="${org.jboss.esb.tests.report.dir}"/>
     </target>
 
     <target name="clean"/>
 
     <target name="purge" depends="clean">
-        <delete dir="${org.jboss.esb.tests.bin.dir}"/>
+        <delete dir="${org.jboss.esb.tests.classes.dir}"/>
     </target>
 
     <target name="org.jboss.esb.processors.tests.compile" if="org.jboss.esb.buildtests" depends="org.jboss.esb.tests.init">
 
         <javac
-                destdir="${org.jboss.esb.tests.bin.dir}"
+                destdir="${org.jboss.esb.tests.classes.dir}"
                 classpathref="org.jboss.esb.tests.base.classpath"
                 debug="${org.jboss.esb.debug}"
                 optimize="${org.jboss.esb.optimize}"
@@ -66,14 +66,14 @@
             <formatter type="plain" usefile="false"/>
             <formatter type="xml"/>
             <batchtest todir="${org.jboss.esb.tests.report.dir}">
-                <fileset dir="${org.jboss.esb.tests.bin.dir}">
+                <fileset dir="${org.jboss.esb.tests.classes.dir}">
                     <include name="**/**/processors/**/**UnitTest.class"/>
                 </fileset>
             </batchtest>
             <classpath>
                 <path refid="org.jboss.esb.tests.base.classpath"/>
-                <pathelement location="${org.jboss.esb.core.bin.dir}"/>
-                <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
+                <pathelement location="${org.jboss.esb.core.classes.dir}"/>
+                <pathelement location="${org.jboss.esb.tests.classes.dir}"/>
             </classpath>
         </junit>
         <junitreport>
@@ -95,14 +95,14 @@
             <formatter type="plain" usefile="false"/>
             <formatter type="xml"/>
             <batchtest todir="${org.jboss.esb.tests.report.dir}">
-                <fileset dir="${org.jboss.esb.tests.bin.dir}">
+                <fileset dir="${org.jboss.esb.tests.classes.dir}">
                     <include name="**/**/processors/**/**FuncTest.class"/>
                 </fileset>
             </batchtest>
             <classpath>
                 <path refid="org.jboss.esb.tests.base.classpath"/>
-                <pathelement location="${org.jboss.esb.core.bin.dir}"/>
-                <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
+                <pathelement location="${org.jboss.esb.core.classes.dir}"/>
+                <pathelement location="${org.jboss.esb.tests.classes.dir}"/>
             </classpath>
         </junit>
         <junitreport>

Modified: labs/jbossesb/trunk/product/core/services/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/build.xml	2006-07-23 12:55:37 UTC (rev 5258)
+++ labs/jbossesb/trunk/product/core/services/tests/build.xml	2006-07-24 10:50:02 UTC (rev 5259)
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <project name="build.services.tests" default="org.jboss.esb.services.tests.compile" basedir=".">
 
-    <property name="org.jboss.esb.tests.bin.dir" value="${org.jboss.esb.internal.dest}/tests"/>
+    <property name="org.jboss.esb.tests.classes.dir" value="${org.jboss.esb.internal.dest}/tests"/>
     <property name="org.jboss.esb.tests.report.dir" value="${org.jboss.esb.internal.dest}/tests/junit"/>
-    <property name="org.jboss.esb.core.bin.dir" value="${org.jboss.esb.internal.dest}/classes"/>
+    <property name="org.jboss.esb.core.classes.dir" value="${org.jboss.esb.internal.dest}/classes"/>
     <property name="org.jboss.esb.tests.src.dir" value="${basedir}/src"/>
     <property name="org.jboss.esb.root.dir" value="../.."/>
     <property environment="env"/>
@@ -20,8 +20,8 @@
         <fileset dir="../${org.jboss.esb.ext.lib.dir}"
                  includes="activation.jar jbossall-client.jar log4j.jar mail.jar junit.jar"/>
 
-        <pathelement location="${org.jboss.esb.core.bin.dir}/common"/>
-        <pathelement location="${org.jboss.esb.core.bin.dir}/services"/>
+        <pathelement location="${org.jboss.esb.core.classes.dir}/common"/>
+        <pathelement location="${org.jboss.esb.core.classes.dir}/services"/>
 
     </path>
 
@@ -30,20 +30,20 @@
             <format property="TODAY" pattern="d-MM-yy"/>
         </tstamp>
 
-        <mkdir dir="${org.jboss.esb.tests.bin.dir}"/>
+        <mkdir dir="${org.jboss.esb.tests.classes.dir}"/>
         <mkdir dir="${org.jboss.esb.tests.report.dir}"/>
     </target>
 
     <target name="clean"/>
 
     <target name="purge" depends="clean">
-        <delete dir="${org.jboss.esb.tests.bin.dir}"/>
+        <delete dir="${org.jboss.esb.tests.classes.dir}"/>
     </target>
 
     <target name="org.jboss.esb.services.tests.compile" if="org.jboss.esb.buildtests" depends="org.jboss.esb.tests.init">
 
         <javac
-                destdir="${org.jboss.esb.tests.bin.dir}"
+                destdir="${org.jboss.esb.tests.classes.dir}"
                 classpathref="org.jboss.esb.tests.base.classpath"
                 debug="${org.jboss.esb.debug}"
                 optimize="${org.jboss.esb.optimize}"
@@ -72,14 +72,14 @@
             <formatter type="plain" usefile="false"/>
             <formatter type="xml"/>
             <batchtest todir="${org.jboss.esb.tests.report.dir}">
-                <fileset dir="${org.jboss.esb.tests.bin.dir}">
+                <fileset dir="${org.jboss.esb.tests.classes.dir}">
                     <include name="**/**/services/**/**UnitTest.class"/>
                 </fileset>
             </batchtest>
             <classpath>
                 <path refid="org.jboss.esb.tests.base.classpath"/>
-                <pathelement location="${org.jboss.esb.core.bin.dir}"/>
-                <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
+                <pathelement location="${org.jboss.esb.core.classes.dir}"/>
+                <pathelement location="${org.jboss.esb.tests.classes.dir}"/>
             </classpath>
         </junit>
         <junitreport>
@@ -101,14 +101,14 @@
             <formatter type="plain" usefile="false"/>
             <formatter type="xml"/>
             <batchtest todir="${org.jboss.esb.tests.report.dir}">
-                <fileset dir="${org.jboss.esb.tests.bin.dir}">
+                <fileset dir="${org.jboss.esb.tests.classes.dir}">
                     <include name="**/**/services/**/**FuncTest.class"/>
                 </fileset>
             </batchtest>
             <classpath>
                 <path refid="org.jboss.esb.tests.base.classpath"/>
-                <pathelement location="${org.jboss.esb.core.bin.dir}"/>
-                <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
+                <pathelement location="${org.jboss.esb.core.classes.dir}"/>
+                <pathelement location="${org.jboss.esb.tests.classes.dir}"/>
             </classpath>
         </junit>
         <junitreport>

Modified: labs/jbossesb/trunk/product/docs/Install/conf/jbossEsb.properties
===================================================================
--- labs/jbossesb/trunk/product/docs/Install/conf/jbossEsb.properties	2006-07-23 12:55:37 UTC (rev 5258)
+++ labs/jbossesb/trunk/product/docs/Install/conf/jbossEsb.properties	2006-07-24 10:50:02 UTC (rev 5259)
@@ -27,13 +27,13 @@
 #
 # Mail Notification Settings
 #
-jbossEsb.mail.smtp.host=mail.mydomain.com
-jbossEsb.mail.smtp.user=user
-jbossEsb.mail.smtp.password=password
-jbossEsb.mail.smtp.port=587
+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
 
 
 #
 # Object Store Settings
 #
-jbossEsb.objStore.configfile=/mypath/.../ObjStoreExample.xml
\ No newline at end of file
+org.jboss.soa.esb.objStore.configfile=/mypath/.../ObjStoreExample.xml
\ No newline at end of file




More information about the jboss-svn-commits mailing list