You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ri...@apache.org on 2005/05/15 18:11:46 UTC
svn commit: r170231 - in /incubator/beehive/trunk: netui/ant/ netui/src/compiler-core/org/apache/beehive/netui/compiler/model/ netui/src/webapp-template/default/WEB-INF/ netui/test/src/junitTests/ netui/test/webapps/drt/coreWeb/WEB-INF/ samples/netui-samples/WEB-INF/

Author: rich
Date: Sun May 15 09:11:45 2005
New Revision: 170231

URL: http://svn.apache.org/viewcvs?rev=170231&view=rev
Log:
Fix for http://issues.apache.org/jira/browse/BEEHIVE-731 : netui-validator-config.xml file should have "beehive-" prefix for consistency

tests: bvt in netui (WinXP)
BB: self (linux)


Added:
    incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/beehive-netui-validator-rules.xml
      - copied unchanged from r170197, incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/netui-validator-rules.xml
    incubator/beehive/trunk/samples/netui-samples/WEB-INF/beehive-netui-validator-rules.xml
      - copied unchanged from r170197, incubator/beehive/trunk/samples/netui-samples/WEB-INF/netui-validator-rules.xml
Removed:
    incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/netui-validator-rules.xml
    incubator/beehive/trunk/samples/netui-samples/WEB-INF/netui-validator-rules.xml
Modified:
    incubator/beehive/trunk/netui/ant/netui.properties
    incubator/beehive/trunk/netui/ant/webappTemplate.xml
    incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/model/StrutsApp.java
    incubator/beehive/trunk/netui/test/src/junitTests/build.xml
    incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/strutsValidator-merge-config.xml

Modified: incubator/beehive/trunk/netui/ant/netui.properties
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/netui.properties?rev=170231&r1=170230&r2=170231&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/ant/netui.properties (original)
+++ incubator/beehive/trunk/netui/ant/netui.properties Sun May 15 09:11:45 2005
@@ -73,7 +73,7 @@
 netuiconfig.xml=${src.dir}/webapp-template/default/WEB-INF/beehive-netui-config.xml
 
 # Validator rules file references
-netui-validator-rules.xml=${src.dir}/webapp-template/default/WEB-INF/netui-validator-rules.xml
+beehive-netui-validator-rules.xml=${src.dir}/webapp-template/default/WEB-INF/beehive-netui-validator-rules.xml
 validator-rules.xml=${src.dir}/webapp-template/default/WEB-INF/validator-rules.xml
 
 #compile options

Modified: incubator/beehive/trunk/netui/ant/webappTemplate.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/webappTemplate.xml?rev=170231&r1=170230&r2=170231&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/ant/webappTemplate.xml (original)
+++ incubator/beehive/trunk/netui/ant/webappTemplate.xml Sun May 15 09:11:45 2005
@@ -225,7 +225,7 @@
     </patternset>
 
     <patternset id="netui.webinf">
-        <include name="netui-validator-rules.xml"/>
+        <include name="beehive-netui-validator-rules.xml"/>
     </patternset>
 
     <patternset id="netui.tld">

Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/model/StrutsApp.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/model/StrutsApp.java?rev=170231&r1=170230&r2=170231&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/model/StrutsApp.java (original)
+++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/model/StrutsApp.java Sun May 15 09:11:45 2005
@@ -83,7 +83,7 @@
     protected static final String TILES_PLUG_IN_CLASSNAME = STRUTS_PACKAGE + ".tiles.TilesPlugin";
     protected static final String TILES_DEFINITIONS_CONFIG_PROPERTY = "definitions-config";
     protected static final String TILES_MODULE_AWARE_PROPERTY = "moduleAware";
-    protected static final String NETUI_VALIDATOR_RULES_URI = '/' + WEBINF_DIR_NAME + "/netui-validator-rules.xml";
+    protected static final String NETUI_VALIDATOR_RULES_URI = '/' + WEBINF_DIR_NAME + "/beehive-netui-validator-rules.xml";
     protected static final String STRUTS_VALIDATOR_RULES_URI = '/' + WEBINF_DIR_NAME + "/validator-rules.xml";
 
     

Modified: incubator/beehive/trunk/netui/test/src/junitTests/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/build.xml?rev=170231&r1=170230&r2=170231&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/src/junitTests/build.xml (original)
+++ incubator/beehive/trunk/netui/test/src/junitTests/build.xml Sun May 15 09:11:45 2005
@@ -32,7 +32,7 @@
         </copy>
 
         <copy todir="${module.classes.dir}/WEB-INF/" file="${netuiconfig.xml}"/>
-        <copy todir="${module.classes.dir}/WEB-INF/" file="${netui-validator-rules.xml}"/>
+        <copy todir="${module.classes.dir}/WEB-INF/" file="${beehive-netui-validator-rules.xml}"/>
         <copy todir="${module.classes.dir}/WEB-INF/" file="${validator-rules.xml}"/>
 
         <!-- Build all page flows and other classes. -->

Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/strutsValidator-merge-config.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/strutsValidator-merge-config.xml?rev=170231&r1=170230&r2=170231&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/strutsValidator-merge-config.xml (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/strutsValidator-merge-config.xml Sun May 15 09:11:45 2005
@@ -10,7 +10,7 @@
 
   <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
     <set-property property="pathnames"
-        value="/WEB-INF/netui-validator-rules.xml,/WEB-INF/validator-rules.xml,/WEB-INF/strutsValidator-validation.xml"/>
+        value="/WEB-INF/beehive-netui-validator-rules.xml,/WEB-INF/validator-rules.xml,/WEB-INF/strutsValidator-validation.xml"/>
   </plug-in>
 
 </struts-config>