You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2011/05/25 22:14:34 UTC
svn commit: r1127668 -
/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/
Author: simonetripodi
Date: Wed May 25 20:14:33 2011
New Revision: 1127668
URL: http://svn.apache.org/viewvc?rev=1127668&view=rev
Log:
minor format
Modified:
commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/test-call-param-rules.xml
commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/test-node-create-rules-input.xml
commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/test-node-create-rules.xml
commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/test.xml
commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testCircularRules.xml
commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testPropertyAliasRules.xml
commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactory.xml
commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactoryignore.xml
commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactorynoignore.xml
commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testrulesinclude.xml
Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/test-call-param-rules.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/test-call-param-rules.xml?rev=1127668&r1=1127667&r2=1127668&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/test-call-param-rules.xml (original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/test-call-param-rules.xml Wed May 25 20:14:33 2011
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-
+<!DOCTYPE digester-rules PUBLIC "-//Jakarta Apache //DTD digester-rules XML V1.0//EN" "http://jakarta.apache.org/commons/digester/dtds/digester-rules.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,31 +16,23 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<!DOCTYPE digester-rules PUBLIC "-//Jakarta Apache //DTD digester-rules XML V1.0//EN" "http://jakarta.apache.org/commons/digester/dtds/digester-rules.dtd">
-
<digester-rules>
- <pattern value="root">
- <pattern value="foo">
- <call-method-rule
- methodname="triple"
- paramcount="3"
- paramtypes="java.lang.String,java.lang.String,java.lang.String"/>
- <call-param-rule
- paramnumber='0'
- attrname='attr'/>
-
- <pattern value='bar'>
- <call-param-rule paramnumber='1' from-stack='false'/>
- </pattern>
-
- <pattern value='foobar'>
- <object-create-rule classname="java.lang.String"/>
-
- <pattern value='ping'>
- <call-param-rule paramnumber='2' from-stack='true'/>
- </pattern>
- </pattern>
+ <pattern value="root">
+ <pattern value="foo">
+ <call-method-rule methodname="triple" paramcount="3"
+ paramtypes="java.lang.String,java.lang.String,java.lang.String" />
+ <call-param-rule paramnumber='0' attrname='attr' />
+
+ <pattern value='bar'>
+ <call-param-rule paramnumber='1' from-stack='false' />
+ </pattern>
+
+ <pattern value='foobar'>
+ <object-create-rule classname="java.lang.String" />
+ <pattern value='ping'>
+ <call-param-rule paramnumber='2' from-stack='true' />
</pattern>
+ </pattern>
</pattern>
+ </pattern>
</digester-rules>
Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/test-node-create-rules-input.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/test-node-create-rules-input.xml?rev=1127668&r1=1127667&r2=1127668&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/test-node-create-rules-input.xml (original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/test-node-create-rules-input.xml Wed May 25 20:14:33 2011
@@ -17,7 +17,7 @@
limitations under the License.
-->
<root>
- <foo1>
- <bar1>bar1-value</bar1>
- </foo1>
-</root>
+ <foo1>
+ <bar1>bar1-value</bar1>
+ </foo1>
+</root>
\ No newline at end of file
Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/test-node-create-rules.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/test-node-create-rules.xml?rev=1127668&r1=1127667&r2=1127668&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/test-node-create-rules.xml (original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/test-node-create-rules.xml Wed May 25 20:14:33 2011
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
+<!DOCTYPE digester-rules PUBLIC "-//Jakarta Apache //DTD digester-rules XML V1.0//EN" "http://jakarta.apache.org/commons/digester/dtds/digester-rules.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,12 +15,10 @@
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.
-
-<!DOCTYPE digester-rules PUBLIC "-//Jakarta Apache //DTD digester-rules XML V1.0//EN" "http://jakarta.apache.org/commons/digester/dtds/digester-rules.dtd">
-->
<digester-rules>
- <pattern value="root/foo1">
- <node-create-rule/>
- <set-next-rule methodname="add" paramtype="java.lang.Object"/>
- </pattern>
+ <pattern value="root/foo1">
+ <node-create-rule />
+ <set-next-rule methodname="add" paramtype="java.lang.Object" />
+ </pattern>
</digester-rules>
Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/test.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/test.xml?rev=1127668&r1=1127667&r2=1127668&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/test.xml (original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/test.xml Wed May 25 20:14:33 2011
@@ -1,7 +1,5 @@
<?xml version="1.0"?>
-
<!-- Input data to test the DigesterLoader -->
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -18,27 +16,26 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<root>
<foo value="foo1">
- <baz value="baz1"/>
+ <baz value="baz1" />
<bar>
- <foo value="foo2"/>
+ <foo value="foo2" />
</bar>
<call-method-rule-tests value="cmr1">
<longValue>555</longValue>
<defaultParamType>somestringvalue</defaultParamType>
- <pushIt/>
+ <pushIt />
<mapValue name="test1">foo</mapValue>
<mapValue name="test2">bar</mapValue>
</call-method-rule-tests>
<property>I am a property!</property>
</foo>
- <baz value="baz2"/>
+ <baz value="baz2" />
<foo value="foo3">
<bar>
- <baz value="baz3"/>
- <foo value="foo4"/>
+ <baz value="baz3" />
+ <foo value="foo4" />
</bar>
<property>I am a property!</property>
</foo>
Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testCircularRules.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testCircularRules.xml?rev=1127668&r1=1127667&r2=1127668&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testCircularRules.xml (original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testCircularRules.xml Wed May 25 20:14:33 2011
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -20,12 +19,12 @@
<!-- Rules to test the DigesterLoader's circular include detection.
Attempting to create a digester with these rules should result
in an exception. -->
-
+
<digester-rules>
<pattern value="root/foo">
- <object-create-rule classname="org.apache.commons.digester3.xmlrules.ObjectTestImpl"/>
- <set-next-rule methodname="add" paramtype="java.lang.Object"/>
- <set-properties-rule/>
- <include path="classpath:org/apache/commons/digester3/xmlrules/testCircularRules.xml"/>
+ <object-create-rule classname="org.apache.commons.digester3.xmlrules.ObjectTestImpl" />
+ <set-next-rule methodname="add" paramtype="java.lang.Object" />
+ <set-properties-rule />
+ <include path="classpath:org/apache/commons/digester3/xmlrules/testCircularRules.xml" />
</pattern>
</digester-rules>
Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testPropertyAliasRules.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testPropertyAliasRules.xml?rev=1127668&r1=1127667&r2=1127668&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testPropertyAliasRules.xml (original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testPropertyAliasRules.xml Wed May 25 20:14:33 2011
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,35 +15,34 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<digester-rules>
<pattern value="toplevel/one">
- <object-create-rule classname="org.apache.commons.digester3.Address"/>
- <set-next-rule methodname="add" paramtype="java.lang.Object"/>
- <set-properties-rule/>
- </pattern>
+ <object-create-rule classname="org.apache.commons.digester3.Address" />
+ <set-next-rule methodname="add" paramtype="java.lang.Object" />
+ <set-properties-rule />
+ </pattern>
<pattern value="toplevel/two">
- <object-create-rule classname="org.apache.commons.digester3.Address"/>
- <set-next-rule methodname="add" paramtype="java.lang.Object"/>
+ <object-create-rule classname="org.apache.commons.digester3.Address" />
+ <set-next-rule methodname="add" paramtype="java.lang.Object" />
<set-properties-rule>
- <alias attr-name="alt-street" prop-name="street"/>
- <alias attr-name="alt-city" prop-name="city"/>
- <alias attr-name="alt-state" prop-name="state"/>
+ <alias attr-name="alt-street" prop-name="street" />
+ <alias attr-name="alt-city" prop-name="city" />
+ <alias attr-name="alt-state" prop-name="state" />
</set-properties-rule>
- </pattern>
+ </pattern>
<pattern value="toplevel/three">
- <object-create-rule classname="org.apache.commons.digester3.Address"/>
- <set-next-rule methodname="add" paramtype="java.lang.Object"/>
+ <object-create-rule classname="org.apache.commons.digester3.Address" />
+ <set-next-rule methodname="add" paramtype="java.lang.Object" />
<set-properties-rule>
- <alias attr-name="aCity" prop-name="city"/>
- <alias attr-name="state" />
+ <alias attr-name="aCity" prop-name="city" />
+ <alias attr-name="state" />
</set-properties-rule>
- </pattern>
+ </pattern>
<pattern value="toplevel/four">
- <object-create-rule classname="org.apache.commons.digester3.Address"/>
- <set-next-rule methodname="add" paramtype="java.lang.Object"/>
+ <object-create-rule classname="org.apache.commons.digester3.Address" />
+ <set-next-rule methodname="add" paramtype="java.lang.Object" />
<set-properties-rule>
- <alias attr-name="alt-city" prop-name="city"/>
+ <alias attr-name="alt-city" prop-name="city" />
</set-properties-rule>
- </pattern>
+ </pattern>
</digester-rules>
Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactory.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactory.xml?rev=1127668&r1=1127667&r2=1127668&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactory.xml (original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactory.xml Wed May 25 20:14:33 2011
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
+<!DOCTYPE digester-rules PUBLIC "-//Jakarta Apache //DTD digester-rules XML V1.0//EN" "http://jakarta.apache.org/commons/digester/dtds/digester-rules.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,13 +16,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<!DOCTYPE digester-rules PUBLIC "-//Jakarta Apache //DTD digester-rules XML V1.0//EN" "http://jakarta.apache.org/commons/digester/dtds/digester-rules.dtd">
<digester-rules>
- <pattern value="root">
- <factory-create-rule
- classname="org.apache.commons.digester3.ObjectCreationFactoryTestImpl"
- ignore-exceptions='true'/>
- <set-next-rule methodname="add"/>
- </pattern>
+ <pattern value="root">
+ <factory-create-rule classname="org.apache.commons.digester3.ObjectCreationFactoryTestImpl"
+ ignore-exceptions="true" />
+ <set-next-rule methodname="add" />
+ </pattern>
</digester-rules>
Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactoryignore.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactoryignore.xml?rev=1127668&r1=1127667&r2=1127668&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactoryignore.xml (original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactoryignore.xml Wed May 25 20:14:33 2011
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-
+<!DOCTYPE digester-rules PUBLIC "-//Jakarta Apache //DTD digester-rules XML V1.0//EN" "http://jakarta.apache.org/commons/digester/dtds/digester-rules.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,12 +16,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<!DOCTYPE digester-rules PUBLIC "-//Jakarta Apache //DTD digester-rules XML V1.0//EN" "http://jakarta.apache.org/commons/digester/dtds/digester-rules.dtd">
<digester-rules>
- <pattern value="root">
- <factory-create-rule
- classname="org.apache.commons.digester3.xmlrules.ThrowExceptionCreationFactory"
- ignore-exceptions='true'/>
- </pattern>
+ <pattern value="root">
+ <factory-create-rule classname="org.apache.commons.digester3.xmlrules.ThrowExceptionCreationFactory"
+ ignore-exceptions="true" />
+ </pattern>
</digester-rules>
Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactorynoignore.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactorynoignore.xml?rev=1127668&r1=1127667&r2=1127668&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactorynoignore.xml (original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactorynoignore.xml Wed May 25 20:14:33 2011
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-
+<!DOCTYPE digester-rules PUBLIC "-//Jakarta Apache //DTD digester-rules XML V1.0//EN" "http://jakarta.apache.org/commons/digester/dtds/digester-rules.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,10 +16,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<!DOCTYPE digester-rules PUBLIC "-//Jakarta Apache //DTD digester-rules XML V1.0//EN" "http://jakarta.apache.org/commons/digester/dtds/digester-rules.dtd">
<digester-rules>
- <pattern value="root">
- <factory-create-rule classname="org.apache.commons.digester3.xmlrules.ThrowExceptionCreationFactory"/>
- </pattern>
+ <pattern value="root">
+ <factory-create-rule classname="org.apache.commons.digester3.xmlrules.ThrowExceptionCreationFactory" />
+ </pattern>
</digester-rules>
Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testrulesinclude.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testrulesinclude.xml?rev=1127668&r1=1127667&r2=1127668&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testrulesinclude.xml (original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testrulesinclude.xml Wed May 25 20:14:33 2011
@@ -15,13 +15,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<digester-rules>
- <pattern value = "bar">
+ <pattern value="bar">
<pattern value="foo">
- <object-create-rule classname="org.apache.commons.digester3.xmlrules.ObjectTestImpl"/>
- <set-next-rule methodname="add" paramtype="java.lang.Object"/>
- <set-properties-rule/>
+ <object-create-rule classname="org.apache.commons.digester3.xmlrules.ObjectTestImpl" />
+ <set-next-rule methodname="add" paramtype="java.lang.Object" />
+ <set-properties-rule />
</pattern>
</pattern>
</digester-rules>