svn commit: r169900 - in /incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler: FlowControllerChecker.java grammar/WebappPathType.java

[rich]

Author: rich
Date: Thu May 12 15:42:03 2005
New Revision: 169900

URL: http://svn.apache.org/viewcvs?rev=169900&view=rev
Log:
Fix for http://issues.apache.org/jira/browse/BEEHIVE-452 : No compiler error 
when strutsMerge file is missing in the extending page flow

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


Modified:
    
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java
    
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathType.java

Modified: 
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java?rev=169900&r1=169899&r2=169900&view=diff
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java
 Thu May 12 15:42:03 2005
@@ -482,8 +482,7 @@
             {
                 String path = ( String ) pathVal.getValue();
                 
-                if ( path.charAt( 0 ) != '/' &&
-                     ! WebappPathType.relativePathExists( path, jclass, 
getEnv() ) )
+                if ( path.charAt( 0 ) != '/' && ! 
WebappPathType.relativePathExists( path, jclass, getEnv() ) )
                 {
                     String[] args = {
                         path,

Modified: 
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathType.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathType.java?rev=169900&r1=169899&r2=169900&view=diff
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathType.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathType.java
 Thu May 12 15:42:03 2005
@@ -46,6 +46,7 @@
                 JSP_FILE_EXTENSION, 
                 XJSP_FILE_EXTENSION, 
                 JPF_FILE_EXTENSION, 
+                "xml",
                 "htm", 
                 "html" 
             };