Author: ekoneil
Date: Thu Mar  3 07:23:30 2005
New Revision: 156051

URL: http://svn.apache.org/viewcvs?view=rev&rev=156051
Log:
Fix for J353.

Rename the "netui-config.xml" file to "beehive-netui-config.xml".  This just 
helps to namespace Beehive related things into a consistent namespace.

BB: self
DRT: Beehive pass
BVT: NetUI pass


Added:
    incubator/beehive/trunk/netui/src/jar-assembly/
    incubator/beehive/trunk/netui/src/jar-assembly/build.xml   (with props)
    incubator/beehive/trunk/netui/src/util/beehive-netui-config-default.xml
      - copied unchanged from r155976, 
incubator/beehive/trunk/netui/src/util/netui-config-default.xml
    
incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/beehive-netui-config.xml
      - copied unchanged from r155976, 
incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/netui-config.xml
    
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/beehive-netui-config.xml
      - copied unchanged from r155976, 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/local-netui-config.xml
Removed:
    incubator/beehive/trunk/netui/src/util/netui-config-default.xml
    incubator/beehive/trunk/netui/src/webapp-template/config/
    
incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/netui-config.xml
    
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/local-netui-config.xml
Modified:
    incubator/beehive/trunk/netui/ant/netui.properties
    incubator/beehive/trunk/netui/ant/webappTemplate.xml
    incubator/beehive/trunk/netui/src/pageflow/build.xml
    
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalConstants.java
    incubator/beehive/trunk/netui/src/tags-databinding/build.xml
    incubator/beehive/trunk/netui/src/tags-html/build.xml
    incubator/beehive/trunk/netui/src/tags-template/build.xml
    incubator/beehive/trunk/netui/src/tomcat-webapp/5x/build.xml
    incubator/beehive/trunk/netui/src/util/build.xml
    
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigUtil.java
    
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigTest.java
    
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/TestConfigUtil.java
    incubator/beehive/trunk/netui/test/webapps/drt/build.xml
    incubator/beehive/trunk/netui/test/webapps/jsf/build.xml
    incubator/beehive/trunk/netui/test/webapps/jsf/jsf-myfaces.xml
    incubator/beehive/trunk/netui/test/webapps/tomcat/build.xml
    incubator/beehive/trunk/netui/test/webapps/urlTemplates/build.xml

Modified: incubator/beehive/trunk/netui/ant/netui.properties
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/netui.properties?view=diff&r1=156050&r2=156051
==============================================================================
--- incubator/beehive/trunk/netui/ant/netui.properties (original)
+++ incubator/beehive/trunk/netui/ant/netui.properties Thu Mar  3 07:23:30 2005
@@ -67,10 +67,10 @@
 netui-tags-databinding.tldx.name=beehive-netui-tags-databinding.tldx
 
 # NetUI config file name
-netuiconfig.xml.name=netui-config.xml
+netuiconfig.xml.name=beehive-netui-config.xml
 
 # NetUI config file references
-netuiconfig.xml=${src.dir}/webapp-template/default/WEB-INF/netui-config.xml
+netuiconfig.xml=${src.dir}/webapp-template/default/WEB-INF/beehive-netui-config.xml
 
 #compile options
 compile.debug=true

Modified: incubator/beehive/trunk/netui/ant/webappTemplate.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/webappTemplate.xml?view=diff&r1=156050&r2=156051
==============================================================================
--- incubator/beehive/trunk/netui/ant/webappTemplate.xml (original)
+++ incubator/beehive/trunk/netui/ant/webappTemplate.xml Thu Mar  3 07:23:30 
2005
@@ -76,7 +76,7 @@
             <fileset dir="${template.root.dir}/default">
                 <include name="**/*"/>
                 <exclude name="WEB-INF/src/global/Global.app"/>
-                <exclude name="WEB-INF/netui-config.xml"/>
+                <exclude name="WEB-INF/beehive-netui-config.xml"/>
             </fileset>
         </copy>
     </target>
@@ -117,18 +117,6 @@
 
         <delete dir="${resource.dir.name}" quiet="true"/>
 
-        <!--
-            Whack the netui-config.xml file.  If the deploy/undeploy runtime 
targets
-            are being called to get a copy of the NetUI runtime, the 
netui-config.xml file
-            is a part of that.  Until we've actually had a release where we've 
committed
-            NetUI to a specific XSD for the config file, this ensures that 
what's in the 
-            webapp is always current with the runtime rather than being out of 
sync.
-
-            If you have a local NetUI config file to use, just copy it over 
top of this
-            one after deploying / undeploying.
-          -->
-        <delete file="${webinf.dir}/netui-config.xml" quiet="true"/>
-
         <echo>struts version: ${struts.version}</echo>
         <condition property="struts.fileset" value="struts11">
             <equals arg1="${struts.version}" arg2="1.1"/>
@@ -254,7 +242,6 @@
     </patternset>
 
     <patternset id="netui.webinf">
-<!--        <include name="beehive-netui-*.tld"/> -->
         <include name="netui-validator-rules.xml"/>
     </patternset>
 

Added: incubator/beehive/trunk/netui/src/jar-assembly/build.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/jar-assembly/build.xml?view=auto&rev=156051
==============================================================================
--- incubator/beehive/trunk/netui/src/jar-assembly/build.xml (added)
+++ incubator/beehive/trunk/netui/src/jar-assembly/build.xml Thu Mar  3 
07:23:30 2005
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+
+<project name="Beehive/NetUI/JARAssembly" default="build" basedir=".">
+
+    <import file="../../netui-imports.xml"/>
+
+    <property name="module.name" value="jar-assembly"/>
+    <property name="module.dir" location="${src.dir}/${module.name}"/>
+
+    <target name="build">
+        <jar jarfile="${build.lib.dir}/beehive-netui-tags.jar">
+            <fileset dir="${classes.dir}/tags-html"/>
+            <fileset dir="${classes.dir}/tags-databinding"/>
+            <fileset dir="${classes.dir}/tags-template"/>
+            <zipfileset file="${build.lib.dir}/${netui-tags-html.tld.name}" 
prefix="META-INF"/>
+            <zipfileset 
file="${build.lib.dir}/${netui-tags-databinding.tld.name}" prefix="META-INF"/>
+            <zipfileset 
file="${build.lib.dir}/${netui-tags-template.tld.name}" prefix="META-INF"/>
+            <manifest>
+                <attribute name="Extension-Name" value="Beehive NetUI HTML Tag 
Library"/>
+                <attribute name="Specification-Title" value="Beehive NetUI 
HTML Tag Library"/>
+                <attribute name="Specification-Vendor" value="Apache Software 
Foundation"/>
+                <attribute name="Specification-Version" 
value="${beehive.version}"/>
+                <attribute name="Implementation-Title" value="Beehive NetUI 
HTML Tag Library"/>
+                <attribute name="Implementation-Vendor" value="Apache Software 
Foundation"/>
+                <attribute name="Implementation-Version" 
value="${beehive.version}"/>
+                <attribute name="Beehive-Version" value="${beehive.version}"/>
+            </manifest>
+        </jar>
+        <jar jarfile="${build.lib.dir}/beehive-netui-core.jar">
+            <fileset dir="${classes.dir}/pageflow"/>
+            <fileset dir="${classes.dir}/scoping"/>
+            <fileset dir="${classes.dir}/util"/>
+            <manifest>
+                <attribute name="Extension-Name" value="Beehive NetUI HTML Tag 
Library"/>
+                <attribute name="Specification-Title" value="Beehive NetUI 
HTML Tag Library"/>
+                <attribute name="Specification-Vendor" value="Apache Software 
Foundation"/>
+                <attribute name="Specification-Version" 
value="${beehive.version}"/>
+                <attribute name="Implementation-Title" value="Beehive NetUI 
HTML Tag Library"/>
+                <attribute name="Implementation-Vendor" value="Apache Software 
Foundation"/>
+                <attribute name="Implementation-Version" 
value="${beehive.version}"/>
+                <attribute name="Beehive-Version" value="${beehive.version}"/>
+                <attribute name="PageFlow-Runtime-Version" 
value="${pageflow.version.runtime}"/>
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="clean">
+        <delete dir="${build.lib.dir}/beehive-netui-core.jar"/>
+        <delete dir="${build.lib.dir}/beehive-netui-tags.jar"/>
+    </target>
+
+</project>

Propchange: incubator/beehive/trunk/netui/src/jar-assembly/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/netui/src/pageflow/build.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/build.xml?view=diff&r1=156050&r2=156051
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/build.xml (original)
+++ incubator/beehive/trunk/netui/src/pageflow/build.xml Thu Mar  3 07:23:30 
2005
@@ -17,8 +17,8 @@
         <path refid="jsf.dependency.path"/>
         <path refid="commons-discovery.dependency.path"/>
 
-        <pathelement path="${build.lib.dir}/beehive-netui-util.jar"/>
-        <pathelement path="${build.lib.dir}/beehive-netui-scoping.jar"/>
+        <pathelement path="${classes.dir}/util"/>
+        <pathelement path="${classes.dir}/scoping"/>
     </path>
 
     <target name="build">

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalConstants.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalConstants.java?view=diff&r1=156050&r2=156051
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalConstants.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalConstants.java
 Thu Mar  3 07:23:30 2005
@@ -56,7 +56,7 @@
     public static final String CURRENT_LONGLIVED_ATTR = ATTR_PREFIX + 
"curLongLivedModule";
     public static final String SHARED_FLOW_ATTR_PREFIX = ATTR_PREFIX + 
"sharedFlow:";
 
-    public static final String NETUI_CONFIG_PATH = "/WEB-INF/netui-config.xml";
+    public static final String NETUI_CONFIG_PATH = 
"/WEB-INF/beehive-netui-config.xml";
     
     public static final String RETURN_ACTION_VIEW_RENDERER_PARAM = ATTR_PREFIX 
+ "returnActionViewRenderer";
     

Modified: incubator/beehive/trunk/netui/src/tags-databinding/build.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/build.xml?view=diff&r1=156050&r2=156051
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/build.xml (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/build.xml Thu Mar  3 
07:23:30 2005
@@ -12,10 +12,10 @@
         <path refid="xbean.dependency.path"/>
         <path refid="log4j.dependency.path"/>
         <path refid="struts11.dependency.path"/>
-        <pathelement path="${build.lib.dir}/beehive-netui-util.jar"/>
-        <pathelement path="${build.lib.dir}/beehive-netui-tags-html.jar"/>
-        <pathelement path="${build.lib.dir}/beehive-netui-pageflow.jar"/>
-        <pathelement path="${build.lib.dir}/beehive-netui-scoping.jar"/>
+        <pathelement path="${classes.dir}/util"/>
+        <pathelement path="${classes.dir}/tags-html"/>
+        <pathelement path="${classes.dir}/pageflow"/>
+        <pathelement path="${classes.dir}/scoping"/>
     </path>
 
     <target name="build">

Modified: incubator/beehive/trunk/netui/src/tags-html/build.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/build.xml?view=diff&r1=156050&r2=156051
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/build.xml (original)
+++ incubator/beehive/trunk/netui/src/tags-html/build.xml Thu Mar  3 07:23:30 
2005
@@ -11,10 +11,10 @@
         <path refid="xbean.dependency.path"/>
         <path refid="log4j.dependency.path"/>
         <path refid="struts11.dependency.path"/>
-        <pathelement path="${build.lib.dir}/beehive-netui-util.jar"/>
-        <pathelement path="${build.lib.dir}/beehive-netui-tags-html.jar"/>
-        <pathelement path="${build.lib.dir}/beehive-netui-pageflow.jar"/>
-        <pathelement path="${build.lib.dir}/beehive-netui-scoping.jar"/>
+        <pathelement path="${classes.dir}/util"/>
+        <pathelement path="${classes.dir}/tags-html"/>
+        <pathelement path="${classes.dir}/pageflow"/>
+        <pathelement path="${classes.dir}/scoping"/>
     </path>
 
     <target name="build">

Modified: incubator/beehive/trunk/netui/src/tags-template/build.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-template/build.xml?view=diff&r1=156050&r2=156051
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-template/build.xml (original)
+++ incubator/beehive/trunk/netui/src/tags-template/build.xml Thu Mar  3 
07:23:30 2005
@@ -11,10 +11,10 @@
         <path refid="xbean.dependency.path"/>
         <path refid="log4j.dependency.path"/>
         <path refid="struts11.dependency.path"/>
-        <pathelement path="${build.lib.dir}/beehive-netui-util.jar"/>
-        <pathelement path="${build.lib.dir}/beehive-netui-pageflow.jar"/>
-        <pathelement path="${build.lib.dir}/beehive-netui-tags-html.jar"/>
-        <pathelement 
path="${build.lib.dir}/beehive-netui-tags-databinding.jar"/>
+        <pathelement path="${classes.dir}/util"/>
+        <pathelement path="${classes.dir}/pageflow"/>
+        <pathelement path="${classes.dir}/tags-html"/>
+        <pathelement path="${classes.dir}/tags-databinding"/>
     </path>
 
     <target name="build">
@@ -92,7 +92,6 @@
                 <attribute name="Beehive-Version" value="${beehive.version}"/>
             </manifest>
         </jar>
-
     </target>
 
     <target name="clean">

Modified: incubator/beehive/trunk/netui/src/tomcat-webapp/5x/build.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tomcat-webapp/5x/build.xml?view=diff&r1=156050&r2=156051
==============================================================================
--- incubator/beehive/trunk/netui/src/tomcat-webapp/5x/build.xml (original)
+++ incubator/beehive/trunk/netui/src/tomcat-webapp/5x/build.xml Thu Mar  3 
07:23:30 2005
@@ -8,9 +8,9 @@
     <path id="module.classpath">
         <path refid="servlet.dependency.path"/>
         <pathelement 
path="${build.lib.dir}/beehive-netui-tomcat-common-5x.jar"/>
-        <pathelement path="${build.lib.dir}/beehive-netui-scoping.jar"/>
-        <pathelement path="${build.lib.dir}/beehive-netui-util.jar"/>
-        <pathelement path="${build.lib.dir}/beehive-netui-pageflow.jar"/>
+        <pathelement path="${classes.dir}/scoping"/>
+        <pathelement path="${classes.dir}/util"/>
+        <pathelement path="${classes.dir}/pageflow"/>
     </path>
 
     <target name="build">

Modified: incubator/beehive/trunk/netui/src/util/build.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/build.xml?view=diff&r1=156050&r2=156051
==============================================================================
--- incubator/beehive/trunk/netui/src/util/build.xml (original)
+++ incubator/beehive/trunk/netui/src/util/build.xml Thu Mar  3 07:23:30 2005
@@ -6,7 +6,7 @@
 
     <property name="module.name" value="util"/>
     <property name="module.dir" location="${src.dir}/${module.name}"/>
-    <property name="defaultnetuiconfig.xml" 
location="${module.dir}/netui-config-default.xml"/>
+    <property name="defaultnetuiconfig.xml" 
location="${module.dir}/beehive-netui-config-default.xml"/>
 
     <path id="module.classpath">
         <path refid="servlet.dependency.path"/>
@@ -44,7 +44,7 @@
             <fileset dir="${module.dir}" includes="**/*.properties"/>
         </copy>
 
-        <!-- copy the default config file used when one isn't found in 
/WEB-INF/netui-config.xml -->
+        <!-- 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}"/>
 
         <jar jarfile="${build.lib.dir}/${util.jar.name}" 
basedir="${classes.dir}/${module.name}">

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigUtil.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigUtil.java?view=diff&r1=156050&r2=156051
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigUtil.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigUtil.java
 Thu Mar  3 07:23:30 2005
@@ -51,7 +51,7 @@
 
     private static final Logger LOGGER = Logger.getInstance(ConfigUtil.class);
 
-    private static final String DEFAULT_CONFIG = 
"org/apache/beehive/netui/util/config/netui-config-default.xml";
+    private static final String DEFAULT_CONFIG = 
"org/apache/beehive/netui/util/config/beehive-netui-config-default.xml";
 
     private static NetuiConfigDocument _config = null;
 

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigTest.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigTest.java?view=diff&r1=156050&r2=156051
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigTest.java
 (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigTest.java
 Thu Mar  3 07:23:30 2005
@@ -38,7 +38,7 @@
      */
     public void testValidateBeehiveV1Config()
         throws Exception {
-        InputStream is = 
getClass().getClassLoader().getResourceAsStream("WEB-INF/netui-config.xml");
+        InputStream is = 
getClass().getClassLoader().getResourceAsStream("WEB-INF/beehive-netui-config.xml");
 
         ConfigUtil.init(is);
         NetuiConfig config = ConfigUtil.getConfig();

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/TestConfigUtil.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/TestConfigUtil.java?view=diff&r1=156050&r2=156051
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/TestConfigUtil.java
 (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/TestConfigUtil.java
 Thu Mar  3 07:23:30 2005
@@ -28,7 +28,7 @@
 public class TestConfigUtil
     extends ConfigUtil {
 
-    private static final String DEFAULT_CONFIG = "WEB-INF/netui-config.xml";
+    private static final String DEFAULT_CONFIG = 
"WEB-INF/beehive-netui-config.xml";
 
     public static final void testInit(InputStream is)
         throws ConfigInitializationException {

Modified: incubator/beehive/trunk/netui/test/webapps/drt/build.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/build.xml?view=diff&r1=156050&r2=156051
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/build.xml (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/build.xml Thu Mar  3 
07:23:30 2005
@@ -55,10 +55,6 @@
             <property name="webapp.file" 
location="${app.dir}/drt/testRecorder/config/testRecorder-webapp.xml"/>
             <property name="struts.version" value="${struts.version}"/>
         </ant>
-
-        <copy file="${webapp.dir}/WEB-INF/local-netui-config.xml" 
-              tofile="${webapp.dir}/WEB-INF/${netuiconfig.xml.name}" 
-              overwrite="true" failonerror="false"/>
     </target>
 
     <target name="clean" description="Clean webapp">

Modified: incubator/beehive/trunk/netui/test/webapps/jsf/build.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/jsf/build.xml?view=diff&r1=156050&r2=156051
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/jsf/build.xml (original)
+++ incubator/beehive/trunk/netui/test/webapps/jsf/build.xml Thu Mar  3 
07:23:30 2005
@@ -34,10 +34,6 @@
             <property name="struts.version" value="${struts.version}"/>
         </ant>
 
-        <copy file="${webapp.dir}/WEB-INF/local-netui-config.xml" 
-              tofile="${webapp.dir}/WEB-INF/${netuiconfig.xml.name}" 
-              overwrite="true" failonerror="false"/>
-
         <copy file="${webapp.dir}/WEB-INF/web.xml.${jsf.dist}"
               tofile="${webapp.dir}/WEB-INF/web.xml"
               overwrite="true" failonerror="true"/>

Modified: incubator/beehive/trunk/netui/test/webapps/jsf/jsf-myfaces.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/jsf/jsf-myfaces.xml?view=diff&r1=156050&r2=156051
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/jsf/jsf-myfaces.xml (original)
+++ incubator/beehive/trunk/netui/test/webapps/jsf/jsf-myfaces.xml Thu Mar  3 
07:23:30 2005
@@ -34,9 +34,6 @@
             <property name="struts.version" value="${struts.version}"/>
         </ant>
 
-        <copy file="${webapp.dir}/WEB-INF/local-netui-config.xml" 
-              tofile="${webapp.dir}/WEB-INF/${netuiconfig.xml.name}" 
-              overwrite="true" failonerror="false"/>
     </target>
 
     <target name="build.jsf-ri" description="Build webapp, and deploy the JSF 
Reference Implementation">

Modified: incubator/beehive/trunk/netui/test/webapps/tomcat/build.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/tomcat/build.xml?view=diff&r1=156050&r2=156051
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/tomcat/build.xml (original)
+++ incubator/beehive/trunk/netui/test/webapps/tomcat/build.xml Thu Mar  3 
07:23:30 2005
@@ -38,10 +38,6 @@
            <property name="struts.version" value="${struts.version}"/>
        </ant>
 
-       <copy file="${webapp.dir}/WEB-INF/local-netui-config.xml" 
-             tofile="${webapp.dir}/WEB-INF/${netuiconfig.xml.name}" 
-             overwrite="true" failonerror="false"/>
-
         <property name="webinf.dir" value="${webapp.dir}/WEB-INF"/>
         
         <!-- copy the tomcat webapp integration library -->

Modified: incubator/beehive/trunk/netui/test/webapps/urlTemplates/build.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/urlTemplates/build.xml?view=diff&r1=156050&r2=156051
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/urlTemplates/build.xml (original)
+++ incubator/beehive/trunk/netui/test/webapps/urlTemplates/build.xml Thu Mar  
3 07:23:30 2005
@@ -45,10 +45,6 @@
             <property name="webapp.file" 
location="${app.dir}/urlTemplates/testRecorder/config/testRecorder-webapp.xml"/>
             <property name="struts.version" value="${struts.version}"/>
         </ant>
-
-        <copy file="${webapp.dir}/WEB-INF/local-netui-config.xml" 
-              tofile="${webapp.dir}/WEB-INF/${netuiconfig.xml.name}" 
-              overwrite="true" failonerror="false"/>
     </target>
 
     <target name="clean" description="Clean webapp">


Reply via email to