svn commit: r289300 - in /beehive/trunk/netui/src/util: ./ org/apache/beehive/netui/util/config/internal/ org/apache/beehive/netui/util/config/parser/

[ek...@apache.org]

Author: ekoneil
Date: Thu Sep 15 12:46:57 2005
New Revision: 289300

URL: http://svn.apache.org/viewcvs?rev=289300&view=rev
Log:
Move the beehive-netui-config-default.xml file down from netui/src/util into its correct resting place.  This makes it *much* easier to get JUnit integration working with IDEA.

BB: self
Test: NetUI DRT pass


Added:
    beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/
    beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/beehive-netui-config-default.xml
      - copied unchanged from r289153, beehive/trunk/netui/src/util/beehive-netui-config-default.xml
Removed:
    beehive/trunk/netui/src/util/beehive-netui-config-default.xml
Modified:
    beehive/trunk/netui/src/util/build.xml
    beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/parser/NetUIConfigParser.java

Modified: beehive/trunk/netui/src/util/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/util/build.xml?rev=289300&r1=289299&r2=289300&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/build.xml (original)
+++ beehive/trunk/netui/src/util/build.xml Thu Sep 15 12:46:57 2005
@@ -6,11 +6,9 @@
 
     <property name="module.name" value="util"/>
     <property name="module.dir" location="${src.dir}/${module.name}"/>
-    <property name="defaultnetuiconfig.xml" location="${module.dir}/beehive-netui-config-default.xml"/>
 
     <path id="module.classpath">
         <path refid="servlet.dependency.path"/>
-        <path refid="xbean.dependency.path"/>
         <path refid="log4j.dependency.path"/>
         <path refid="commons-codec.dependency.path"/>
         <path refid="commons-logging.dependency.path"/>
@@ -36,11 +34,9 @@
 
         <copy todir="${classes.dir}/${module.name}">
             <fileset dir="${module.dir}" includes="**/*.properties"/>
-            <fileset dir="${module.dir}" includes="**/*.xsd"/>
+            <fileset dir="${module.dir}" includes="**/config/schema/*.xsd"/>
+            <fileset dir="${module.dir}" includes="**/config/internal/*.xml"/>
         </copy>
-
-        <!-- copy the default config file used when one isn't found in /WEB-INF/beehive-netui-config.xml -->
-        <copy todir="${classes.dir}/${module.name}/org/apache/beehive/netui/util/config" file="${defaultnetuiconfig.xml}"/>
     </target>
 
     <target name="clean">

Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/parser/NetUIConfigParser.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/parser/NetUIConfigParser.java?rev=289300&r1=289299&r2=289300&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/parser/NetUIConfigParser.java (original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/parser/NetUIConfigParser.java Thu Sep 15 12:46:57 2005
@@ -69,7 +69,7 @@
 
     private static final Logger LOGGER = Logger.getInstance(NetUIConfigParser.class);
 
-    private static final String DEFAULT_CONFIG = "org/apache/beehive/netui/util/config/beehive-netui-config-default.xml";
+    private static final String DEFAULT_CONFIG = "org/apache/beehive/netui/util/config/internal/beehive-netui-config-default.xml";
     private static final String CONFIG_SCHEMA = "org/apache/beehive/netui/util/config/schema/beehive-netui-config.xsd";
 
     private static final XmlInputStreamResolver SCHEMA_RESOLVER = new XmlInputStreamResolver() {