You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2006/03/19 04:14:38 UTC
svn commit: r386914 - in /beehive/trunk/netui:
src/util/org/apache/beehive/netui/util/config/internal/
test/src/junitTests/org/apache/beehive/netui/test/util/config/
test/src/junitTests/org/apache/beehive/netui/test/util/config/xmls/
test/webapps/drt/w...
Author: ekoneil
Date: Sat Mar 18 19:14:37 2006
New Revision: 386914
URL: http://svn.apache.org/viewcvs?rev=386914&view=rev
Log:
Switch the NetUI test webapp over to the Command pattern from the RequestInterceptor pattern. This takes the XmlHttpRequestServlet request interceptors out of the list of global interceptors run for every request, forward, etc.
They will work in either place (until RequestInterceptor support is removed in the next point release).
BB: self
Test: NetUI pass
Added:
beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/xmls/beehive-netui-config-default-1.0.xml (contents, props changed)
- copied, changed from r386798, beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/xmls/beehive-netui-config-default.xml
beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/xmls/beehive-netui-config-default-1.x.xml
Removed:
beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/xmls/beehive-netui-config-default.xml
Modified:
beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/beehive-netui-config-default.xml
beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigBeanTest.java
beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/SchemaValidationTest.java
beehive/trunk/netui/test/webapps/drt/web/WEB-INF/beehive-netui-config.xml
Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/beehive-netui-config-default.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/beehive-netui-config-default.xml?rev=386914&r1=386913&r2=386914&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/beehive-netui-config-default.xml (original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/beehive-netui-config-default.xml Sat Mar 18 19:14:37 2006
@@ -50,7 +50,7 @@
</prefix-handlers>
<catalog>
- <chain name="xhr-servlet">
+ <chain name="xhr-commands">
<command>
<command-class>org.apache.beehive.netui.tags.tree.TreeCRI</command-class>
</command>
Modified: beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigBeanTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigBeanTest.java?rev=386914&r1=386913&r2=386914&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigBeanTest.java (original)
+++ beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigBeanTest.java Sat Mar 18 19:14:37 2006
@@ -82,7 +82,7 @@
public void testParsing()
throws Exception {
- String resourcePath = "org/apache/beehive/netui/test/util/config/xmls/beehive-netui-config-default.xml";
+ String resourcePath = "org/apache/beehive/netui/test/util/config/xmls/beehive-netui-config-default-1.0.xml";
NetUIConfig config = parseNetUIConfig(resourcePath);
Modified: beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/SchemaValidationTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/SchemaValidationTest.java?rev=386914&r1=386913&r2=386914&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/SchemaValidationTest.java (original)
+++ beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/SchemaValidationTest.java Sat Mar 18 19:14:37 2006
@@ -44,7 +44,30 @@
new TestXmlInputStreamResolver("org/apache/beehive/netui/util/config/schema/beehive-netui-config.xsd");
XmlInputStreamResolver xmlInputStreamResolver =
- new TestXmlInputStreamResolver("org/apache/beehive/netui/test/util/config/xmls/beehive-netui-config-default.xml");
+ new TestXmlInputStreamResolver("org/apache/beehive/netui/test/util/config/xmls/beehive-netui-config-default-1.0.xml");
+
+ InputStream xsdIs = xsdInputStreamResolver.getInputStream();
+ InputStream xmlIs = xmlInputStreamResolver.getInputStream();
+ try {
+ validate(xsdInputStreamResolver, xmlInputStreamResolver, "/beehive-netui-config.xsd");
+ }
+ catch(SchemaValidationException e) {
+ assertTrue("Received an unexpected schema validation error", false);
+ }
+ finally {
+ try {if(xsdIs != null) xsdIs.close();}catch(IOException io) {}
+ try {if(xmlIs != null) xmlIs.close();}catch(IOException io) {}
+ }
+ }
+
+ public void testNetUI1xConfigValidationSuccess()
+ throws Exception {
+
+ XmlInputStreamResolver xsdInputStreamResolver =
+ new TestXmlInputStreamResolver("org/apache/beehive/netui/util/config/schema/beehive-netui-config.xsd");
+
+ XmlInputStreamResolver xmlInputStreamResolver =
+ new TestXmlInputStreamResolver("org/apache/beehive/netui/test/util/config/xmls/beehive-netui-config-default-1.x.xml");
InputStream xsdIs = xsdInputStreamResolver.getInputStream();
InputStream xmlIs = xmlInputStreamResolver.getInputStream();
Copied: beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/xmls/beehive-netui-config-default-1.0.xml (from r386798, beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/xmls/beehive-netui-config-default.xml)
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/xmls/beehive-netui-config-default-1.0.xml?p2=beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/xmls/beehive-netui-config-default-1.0.xml&p1=beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/xmls/beehive-netui-config-default.xml&r1=386798&r2=386914&rev=386914&view=diff
==============================================================================
(empty)
Propchange: beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/xmls/beehive-netui-config-default-1.0.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/xmls/beehive-netui-config-default-1.x.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/xmls/beehive-netui-config-default-1.x.xml?rev=386914&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/xmls/beehive-netui-config-default-1.x.xml (added)
+++ beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/xmls/beehive-netui-config-default-1.x.xml Sat Mar 18 19:14:37 2006
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright 2004-2006 The Apache Software Foundation.
+
+ Licensed 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.
+
+ $Header:$
+ -->
+
+<!--
+ This file defines the default, OOTB required runtime configuration for the NetUI framework
+-->
+<netui-config xmlns="http://beehive.apache.org/netui/2004/server/config">
+ <expression-languages>
+ <default-language>netuiel</default-language>
+ <expression-language>
+ <name>netuiel</name>
+ <factory-class>org.apache.beehive.netui.script.el.ExpressionEvaluatorImpl$NetUIELEngineFactory</factory-class>
+ </expression-language>
+ </expression-languages>
+
+ <prefix-handlers>
+ <prefix-handler>
+ <name>checkbox_key</name>
+ <handler-class>org.apache.beehive.netui.tags.html.CheckBox$CheckBoxPrefixHandler</handler-class>
+ </prefix-handler>
+ <prefix-handler>
+ <name>checkbox_group_key</name>
+ <handler-class>org.apache.beehive.netui.tags.html.CheckBoxGroup$CheckboxGroupPrefixHandler</handler-class>
+ </prefix-handler>
+ <prefix-handler>
+ <name>radio_button_group_key</name>
+ <handler-class>org.apache.beehive.netui.tags.html.RadioButtonGroup$RadioButtonGroupPrefixHandler</handler-class>
+ </prefix-handler>
+ <prefix-handler>
+ <name>select_key</name>
+ <handler-class>org.apache.beehive.netui.tags.html.Select$SelectPrefixHandler</handler-class>
+ </prefix-handler>
+ </prefix-handlers>
+
+ <catalog>
+ <chain name="xhr-commands">
+ <command>
+ <command-class>org.apache.beehive.netui.tags.tree.TreeCRI</command-class>
+ </command>
+ <command>
+ <command-class>org.apache.beehive.netui.tags.divpanel.DivPanelCRI</command-class>
+ </command>
+ </chain>
+ </catalog>
+</netui-config>
\ No newline at end of file
Modified: beehive/trunk/netui/test/webapps/drt/web/WEB-INF/beehive-netui-config.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/WEB-INF/beehive-netui-config.xml?rev=386914&r1=386913&r2=386914&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/WEB-INF/beehive-netui-config.xml (original)
+++ beehive/trunk/netui/test/webapps/drt/web/WEB-INF/beehive-netui-config.xml Sat Mar 18 19:14:37 2006
@@ -182,18 +182,6 @@
<id-javascript>legacy</id-javascript>
</jsp-tag-config>
- <request-interceptors>
- <global>
- <request-interceptor>
- <interceptor-class>org.apache.beehive.netui.tags.tree.TreeCRI</interceptor-class>
- </request-interceptor>
- <request-interceptor>
- <interceptor-class>org.apache.beehive.netui.tags.divpanel.DivPanelCRI</interceptor-class>
- </request-interceptor>
- </global>
- </request-interceptors>
-
-<!--
<catalog>
<chain name="xhr-commands">
<command>
@@ -204,6 +192,5 @@
</command>
</chain>
</catalog>
--->
</netui-config>