svn commit: r466312 - in /shale/framework/trunk/shale-clay/src: main/java/org/apache/shale/clay/parser/builder/JsfDefaultBuilder.java test/java/org/apache/shale/clay/config/ImplicitMappingTestCase.java

[gvanmatre]

Author: gvanmatre
Date: Fri Oct 20 17:38:56 2006
New Revision: 466312

URL: http://svn.apache.org/viewvc?view=rev&rev=466312
Log:
Changed the handling of html template process for name spaces to allow the 
f:verbatim node to contain whitespace or text.  Cleaned up a missing ASF 
license.

Modified:
    
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/JsfDefaultBuilder.java
    
shale/framework/trunk/shale-clay/src/test/java/org/apache/shale/clay/config/ImplicitMappingTestCase.java

Modified: 
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/JsfDefaultBuilder.java
URL: 
http://svn.apache.org/viewvc/shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/JsfDefaultBuilder.java?view=diff&rev=466312&r1=466311&r2=466312
==============================================================================
--- 
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/JsfDefaultBuilder.java
 (original)
+++ 
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/JsfDefaultBuilder.java
 Fri Oct 20 17:38:56 2006
@@ -372,7 +372,7 @@
 
         List deleteList = new ArrayList();
         Iterator ci = node.getChildren().iterator();
-        while (ci.hasNext()) {
+        next: while (ci.hasNext()) {
             Node child = (Node) ci.next();
             if (child.isWellFormed() && child.getName() != null) {
                 if (child.getName().equals("symbol")) {
@@ -399,7 +399,9 @@
                     deleteList.add(child);
                 }
             } else {
-
+                if (node.getName() != null && 
node.getName().equals("verbatim")) {
+                    continue next;
+                }
                 // remove white space
                 deleteList.add(child);
             }

Modified: 
shale/framework/trunk/shale-clay/src/test/java/org/apache/shale/clay/config/ImplicitMappingTestCase.java
URL: 
http://svn.apache.org/viewvc/shale/framework/trunk/shale-clay/src/test/java/org/apache/shale/clay/config/ImplicitMappingTestCase.java?view=diff&rev=466312&r1=466311&r2=466312
==============================================================================
--- 
shale/framework/trunk/shale-clay/src/test/java/org/apache/shale/clay/config/ImplicitMappingTestCase.java
 (original)
+++ 
shale/framework/trunk/shale-clay/src/test/java/org/apache/shale/clay/config/ImplicitMappingTestCase.java
 Fri Oct 20 17:38:56 2006
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.shale.clay.config;
 
 import java.io.StringWriter;