[jboss-cvs] JBoss Messaging SVN: r4212 - in trunk: examples and 6 other directories.

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

Author: ataylor
Date: 2008-05-16 05:47:57 -0400 (Fri, 16 May 2008)
New Revision: 4212

Added:
   trunk/examples/jms/config/
   trunk/src/config/
   trunk/tests/config/
   trunk/tests/jms-tests/config/
Removed:
   trunk/examples/jms/etc/
   trunk/src/etc/
   trunk/tests/etc/
   trunk/tests/jms-tests/etc/
Modified:
   trunk/build-messaging.xml
   trunk/examples/build.properties
   trunk/examples/jms/build.xml
   trunk/tests/bin/runjmstest
   trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
Log:
moved all etc dirs to config dirs

Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml	2008-05-16 08:37:02 UTC (rev 4211)
+++ trunk/build-messaging.xml	2008-05-16 09:47:57 UTC (rev 4212)
@@ -65,7 +65,7 @@
    <property name="build.src.dir" value="${build.dir}/src"/>
    <property name="src.dir" value="src"/>
    <property name="src.main.dir" value="${src.dir}/main"/>
-   <property name="src.etc.dir" value="${src.dir}/etc"/>
+   <property name="src.config.dir" value="${src.dir}/config"/>
    <property name="src.bin.dir" value="${src.dir}/bin"/>
    <property name="doc.dir" value="docs"/>
    <property name="licenses.dir" value="licenses"/>
@@ -231,15 +231,15 @@
    </path>
 
    <path id="unit.test.execution.classpath">
-      <pathelement location="${test.dir}/etc"/>
+      <pathelement location="${test.dir}/config"/>
       <pathelement location="${test.classes.dir}"/>
-      <pathelement location="${src.etc.dir}"/>
+      <pathelement location="config"/>
       <path refid="test.compilation.classpath"/>
    </path>
 
    <path id="jms.test.execution.classpath">
-      <pathelement location="${src.etc.dir}"/>
-      <pathelement location="${test.jms.dir}/etc"/>
+      <pathelement location="${src.config.dir}"/>
+      <pathelement location="${test.jms.dir}/config"/>
       <pathelement location="${test.jms.classes.dir}"/>
       <path refid="jms.test.compilation.classpath"/>
       <path refid="trove.trove.classpath"/>
@@ -479,11 +479,11 @@
       </copy>
 
       <copy todir="${build.distro.config.dir}">
-         <fileset dir="${src.etc.dir}">
+         <fileset dir="${src.config.dir}">
             <include name="*.xml"/>
             <include name="jndi.properties"/>
          </fileset>
-         <fileset dir="${test.dir}/etc">
+         <fileset dir="${test.dir}/config">
             <include name="messaging.keystore"/>
             <include name="messaging.truststore"/>
          </fileset>

Modified: trunk/examples/build.properties
===================================================================
--- trunk/examples/build.properties	2008-05-16 08:37:02 UTC (rev 4211)
+++ trunk/examples/build.properties	2008-05-16 09:47:57 UTC (rev 4212)
@@ -1,4 +1,4 @@
 lib.dir=../../thirdparty
 client.jar=../../build/jars/jboss-messaging-client.jar
 server.jar=../../build/jars/jboss-messaging.jar
-config.dir=../../tests/etc/
+config.dir=../../tests/config/

Modified: trunk/examples/jms/build.xml
===================================================================
--- trunk/examples/jms/build.xml	2008-05-16 08:37:02 UTC (rev 4211)
+++ trunk/examples/jms/build.xml	2008-05-16 09:47:57 UTC (rev 4212)
@@ -37,7 +37,7 @@
    <property file="../build.properties"/>
 
    <property name="src.dir" value="src"/>
-   <property name="etc.dir" value="etc"/>
+   <property name="config.dir" value="config"/>
    <property name="build.dir" value="build"/>
 
    <!--perf props-->
@@ -57,7 +57,7 @@
    <path id="runtime.classpath">
       <path refid="compile.classpath"/>
       <pathelement location="${build.dir}"/>
-      <pathelement location="${etc.dir}"/>
+      <pathelement location="config"/>
    </path>
 
    <target name="help">

Copied: trunk/examples/jms/config (from rev 4210, trunk/examples/jms/etc)

Copied: trunk/src/config (from rev 4210, trunk/src/etc)

Modified: trunk/tests/bin/runjmstest
===================================================================
--- trunk/tests/bin/runjmstest	2008-05-16 08:37:02 UTC (rev 4211)
+++ trunk/tests/bin/runjmstest	2008-05-16 09:47:57 UTC (rev 4212)
@@ -174,8 +174,8 @@
    fi
 fi
 
-mkdir $reldir/../jms-tests/build/etc
-cp $reldir/../../src/etc/*.xml $reldir/../jms-tests/build/etc 
+mkdir $reldir/../jms-tests/build/config
+cp $reldir/../../src/config/*.xml $reldir/../jms-tests/build/config 
 
 "$JAVA_HOME/bin/java" -Xmx1024M $JAVA_OPTS -Djava.library.path=$reldir/../../native/bin -Djgroups.bind_addr=localhost -cp "$CLASSPATH" \
 org.jboss.test.messaging.tools.junit.SelectiveTestRunner $TARGET_CLASS $TARGET_TEST

Copied: trunk/tests/config (from rev 4210, trunk/tests/etc)

Copied: trunk/tests/jms-tests/config (from rev 4210, trunk/tests/jms-tests/etc)

Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java	2008-05-16 08:37:02 UTC (rev 4211)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java	2008-05-16 09:47:57 UTC (rev 4212)
@@ -72,7 +72,7 @@
          return;
       }
       
-      SSLSupport.createServerContext("etc/messaging.keystore",
+      SSLSupport.createServerContext("config/messaging.keystore",
             keyStorePassword, trustStorePath, trustStorePassword);
    }