struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From musa...@apache.org
Subject svn commit: r799110 [7/7] - in /struts/sandbox/trunk/struts2-json-plugin: ./ src/main/java/org/apache/struts2/json/ src/main/java/org/apache/struts2/json/annotations/ src/main/java/org/apache/struts2/json/rpc/ src/main/java/org/apache/struts2/json/smd/...
Date Wed, 29 Jul 2009 22:44:29 GMT
Modified: struts/sandbox/trunk/struts2-json-plugin/src/test/java/org/apache/struts2/json/TestUtils.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-json-plugin/src/test/java/org/apache/struts2/json/TestUtils.java?rev=799110&r1=799109&r2=799110&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-json-plugin/src/test/java/org/apache/struts2/json/TestUtils.java (original)
+++ struts/sandbox/trunk/struts2-json-plugin/src/test/java/org/apache/struts2/json/TestUtils.java Wed Jul 29 22:44:26 2009
@@ -1,95 +1,95 @@
-/*
- * $Id: TestResult.java 471756 2006-11-06 15:01:43Z husted $
- *
- * 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.struts2.json;
-
-import java.io.InputStream;
-import java.net.URL;
-import java.util.StringTokenizer;
-
-/**
- * Utility methods for test classes
- */
-public class TestUtils {
-    /**
-     * normalizes a string so that strings generated on different platforms can
-     * be compared. any group of one or more space, tab, \r, and \n characters
-     * are converted to a single space character
-     * 
-     * @param obj
-     *            the object to be normalized. normalize will perform its
-     *            operation on obj.toString().trim() ;
-     * @param appendSpace
-     * @return the normalized string
-     */
-    public static String normalize(Object obj, boolean appendSpace) {
-        StringTokenizer st = new StringTokenizer(obj.toString().trim(), " \t\r\n");
-        StringBuffer buffer = new StringBuffer(128);
-
-        while (st.hasMoreTokens()) {
-            buffer.append(st.nextToken());
-        }
-
-        return buffer.toString();
-    }
-
-    public static String normalize(URL url) throws Exception {
-        return normalize(readContent(url), true);
-    }
-
-    /**
-     * Attempt to verify the contents of text against the contents of the URL
-     * specified. Performs a trim on both ends
-     * 
-     * @param url
-     *            the HTML snippet that we want to validate against
-     * @throws Exception
-     *             if the validation failed
-     */
-    public static boolean compare(URL url, String text) throws Exception {
-        /**
-         * compare the trimmed values of each buffer and make sure they're
-         * equivalent. however, let's make sure to normalize the strings first
-         * to account for line termination differences between platforms.
-         */
-        String writerString = TestUtils.normalize(text, true);
-        String bufferString = TestUtils.normalize(readContent(url), true);
-
-        return bufferString.equals(writerString);
-    }
-
-    public static String readContent(URL url) throws Exception {
-        if (url == null)
-            throw new Exception("unable to verify a null URL");
-
-        StringBuffer buffer = new StringBuffer(128);
-        InputStream in = url.openStream();
-        byte[] buf = new byte[4096];
-        int nbytes;
-
-        while ((nbytes = in.read(buf)) > 0) {
-            buffer.append(new String(buf, 0, nbytes));
-        }
-
-        in.close();
-
-        return buffer.toString();
-    }
-}
+/*
+ * $Id$
+ *
+ * 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.struts2.json;
+
+import java.io.InputStream;
+import java.net.URL;
+import java.util.StringTokenizer;
+
+/**
+ * Utility methods for test classes
+ */
+public class TestUtils {
+    /**
+     * normalizes a string so that strings generated on different platforms can
+     * be compared. any group of one or more space, tab, \r, and \n characters
+     * are converted to a single space character
+     * 
+     * @param obj
+     *            the object to be normalized. normalize will perform its
+     *            operation on obj.toString().trim() ;
+     * @param appendSpace
+     * @return the normalized string
+     */
+    public static String normalize(Object obj, boolean appendSpace) {
+        StringTokenizer st = new StringTokenizer(obj.toString().trim(), " \t\r\n");
+        StringBuffer buffer = new StringBuffer(128);
+
+        while (st.hasMoreTokens()) {
+            buffer.append(st.nextToken());
+        }
+
+        return buffer.toString();
+    }
+
+    public static String normalize(URL url) throws Exception {
+        return normalize(readContent(url), true);
+    }
+
+    /**
+     * Attempt to verify the contents of text against the contents of the URL
+     * specified. Performs a trim on both ends
+     * 
+     * @param url
+     *            the HTML snippet that we want to validate against
+     * @throws Exception
+     *             if the validation failed
+     */
+    public static boolean compare(URL url, String text) throws Exception {
+        /**
+         * compare the trimmed values of each buffer and make sure they're
+         * equivalent. however, let's make sure to normalize the strings first
+         * to account for line termination differences between platforms.
+         */
+        String writerString = TestUtils.normalize(text, true);
+        String bufferString = TestUtils.normalize(readContent(url), true);
+
+        return bufferString.equals(writerString);
+    }
+
+    public static String readContent(URL url) throws Exception {
+        if (url == null)
+            throw new Exception("unable to verify a null URL");
+
+        StringBuffer buffer = new StringBuffer(128);
+        InputStream in = url.openStream();
+        byte[] buf = new byte[4096];
+        int nbytes;
+
+        while ((nbytes = in.read(buf)) > 0) {
+            buffer.append(new String(buf, 0, nbytes));
+        }
+
+        in.close();
+
+        return buffer.toString();
+    }
+}

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/java/org/apache/struts2/json/TestUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/java/org/apache/struts2/json/TestUtils.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/sandbox/trunk/struts2-json-plugin/src/test/java/org/apache/struts2/json/WrapperClassBean.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-json-plugin/src/test/java/org/apache/struts2/json/WrapperClassBean.java?rev=799110&r1=799109&r2=799110&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-json-plugin/src/test/java/org/apache/struts2/json/WrapperClassBean.java (original)
+++ struts/sandbox/trunk/struts2-json-plugin/src/test/java/org/apache/struts2/json/WrapperClassBean.java Wed Jul 29 22:44:26 2009
@@ -1,161 +1,181 @@
-package org.apache.struts2.json;
-
-import java.util.List;
-import java.util.Map;
-
-public class WrapperClassBean {
-
-    private String stringField;
-    private Integer intField;
-    private int nullIntField;
-    private Boolean booleanField;
-    private boolean primitiveBooleanField1;
-    private boolean primitiveBooleanField2;
-    private boolean primitiveBooleanField3;
-    private Character charField;
-    private Long longField;
-    private Float floatField;
-    private Double doubleField;
-    private Object objectField;
-    private Byte byteField;
-    private List<SimpleValue> listField;
-    private List<Map<String, Long>> listMapField;
-    private Map<String, List<Long>> mapListField;
-    private Map<String, Long>[] arrayMapField;
-
-    public List<SimpleValue> getListField() {
-        return listField;
-    }
-
-    public void setListField(List<SimpleValue> listField) {
-        this.listField = listField;
-    }
-
-    public List<Map<String, Long>> getListMapField() {
-        return listMapField;
-    }
-
-    public void setListMapField(List<Map<String, Long>> listMapField) {
-        this.listMapField = listMapField;
-    }
-
-    public Map<String, List<Long>> getMapListField() {
-        return mapListField;
-    }
-
-    public void setMapListField(Map<String, List<Long>> mapListField) {
-        this.mapListField = mapListField;
-    }
-
-    public Map<String, Long>[] getArrayMapField() {
-        return arrayMapField;
-    }
-
-    public void setArrayMapField(Map<String, Long>[] arrayMapField) {
-        this.arrayMapField = arrayMapField;
-    }
-
-    public Boolean getBooleanField() {
-        return booleanField;
-    }
-
-    public void setBooleanField(Boolean booleanField) {
-        this.booleanField = booleanField;
-    }
-
-    public boolean isPrimitiveBooleanField1() {
-        return primitiveBooleanField1;
-    }
-
-    public void setPrimitiveBooleanField1(boolean primitiveBooleanField1) {
-        this.primitiveBooleanField1 = primitiveBooleanField1;
-    }
-
-    public boolean isPrimitiveBooleanField2() {
-        return primitiveBooleanField2;
-    }
-
-    public void setPrimitiveBooleanField2(boolean primitiveBooleanField2) {
-        this.primitiveBooleanField2 = primitiveBooleanField2;
-    }
-
-    public boolean isPrimitiveBooleanField3() {
-        return primitiveBooleanField3;
-    }
-
-    public void setPrimitiveBooleanField3(boolean primitiveBooleanField3) {
-        this.primitiveBooleanField3 = primitiveBooleanField3;
-    }
-
-    public Byte getByteField() {
-        return byteField;
-    }
-
-    public void setByteField(Byte byteField) {
-        this.byteField = byteField;
-    }
-
-    public Character getCharField() {
-        return charField;
-    }
-
-    public void setCharField(Character charField) {
-        this.charField = charField;
-    }
-
-    public Double getDoubleField() {
-        return doubleField;
-    }
-
-    public void setDoubleField(Double doubleField) {
-        this.doubleField = doubleField;
-    }
-
-    public Float getFloatField() {
-        return floatField;
-    }
-
-    public void setFloatField(Float floatField) {
-        this.floatField = floatField;
-    }
-
-    public Integer getIntField() {
-        return intField;
-    }
-
-    public void setIntField(Integer intField) {
-        this.intField = intField;
-    }
-
-    public int getNullIntField() {
-        return nullIntField;
-    }
-
-    public void setNullIntField(int nullIntField) {
-        this.nullIntField = nullIntField;
-    }
-
-    public Long getLongField() {
-        return longField;
-    }
-
-    public void setLongField(Long longField) {
-        this.longField = longField;
-    }
-
-    public Object getObjectField() {
-        return objectField;
-    }
-
-    public void setObjectField(Object objectField) {
-        this.objectField = objectField;
-    }
-
-    public String getStringField() {
-        return stringField;
-    }
-
-    public void setStringField(String stringField) {
-        this.stringField = stringField;
-    }
-}
+/*
+ * $Id$
+ *
+ * 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.struts2.json;
+
+import java.util.List;
+import java.util.Map;
+
+public class WrapperClassBean {
+
+    private String stringField;
+    private Integer intField;
+    private int nullIntField;
+    private Boolean booleanField;
+    private boolean primitiveBooleanField1;
+    private boolean primitiveBooleanField2;
+    private boolean primitiveBooleanField3;
+    private Character charField;
+    private Long longField;
+    private Float floatField;
+    private Double doubleField;
+    private Object objectField;
+    private Byte byteField;
+    private List<SimpleValue> listField;
+    private List<Map<String, Long>> listMapField;
+    private Map<String, List<Long>> mapListField;
+    private Map<String, Long>[] arrayMapField;
+
+    public List<SimpleValue> getListField() {
+        return listField;
+    }
+
+    public void setListField(List<SimpleValue> listField) {
+        this.listField = listField;
+    }
+
+    public List<Map<String, Long>> getListMapField() {
+        return listMapField;
+    }
+
+    public void setListMapField(List<Map<String, Long>> listMapField) {
+        this.listMapField = listMapField;
+    }
+
+    public Map<String, List<Long>> getMapListField() {
+        return mapListField;
+    }
+
+    public void setMapListField(Map<String, List<Long>> mapListField) {
+        this.mapListField = mapListField;
+    }
+
+    public Map<String, Long>[] getArrayMapField() {
+        return arrayMapField;
+    }
+
+    public void setArrayMapField(Map<String, Long>[] arrayMapField) {
+        this.arrayMapField = arrayMapField;
+    }
+
+    public Boolean getBooleanField() {
+        return booleanField;
+    }
+
+    public void setBooleanField(Boolean booleanField) {
+        this.booleanField = booleanField;
+    }
+
+    public boolean isPrimitiveBooleanField1() {
+        return primitiveBooleanField1;
+    }
+
+    public void setPrimitiveBooleanField1(boolean primitiveBooleanField1) {
+        this.primitiveBooleanField1 = primitiveBooleanField1;
+    }
+
+    public boolean isPrimitiveBooleanField2() {
+        return primitiveBooleanField2;
+    }
+
+    public void setPrimitiveBooleanField2(boolean primitiveBooleanField2) {
+        this.primitiveBooleanField2 = primitiveBooleanField2;
+    }
+
+    public boolean isPrimitiveBooleanField3() {
+        return primitiveBooleanField3;
+    }
+
+    public void setPrimitiveBooleanField3(boolean primitiveBooleanField3) {
+        this.primitiveBooleanField3 = primitiveBooleanField3;
+    }
+
+    public Byte getByteField() {
+        return byteField;
+    }
+
+    public void setByteField(Byte byteField) {
+        this.byteField = byteField;
+    }
+
+    public Character getCharField() {
+        return charField;
+    }
+
+    public void setCharField(Character charField) {
+        this.charField = charField;
+    }
+
+    public Double getDoubleField() {
+        return doubleField;
+    }
+
+    public void setDoubleField(Double doubleField) {
+        this.doubleField = doubleField;
+    }
+
+    public Float getFloatField() {
+        return floatField;
+    }
+
+    public void setFloatField(Float floatField) {
+        this.floatField = floatField;
+    }
+
+    public Integer getIntField() {
+        return intField;
+    }
+
+    public void setIntField(Integer intField) {
+        this.intField = intField;
+    }
+
+    public int getNullIntField() {
+        return nullIntField;
+    }
+
+    public void setNullIntField(int nullIntField) {
+        this.nullIntField = nullIntField;
+    }
+
+    public Long getLongField() {
+        return longField;
+    }
+
+    public void setLongField(Long longField) {
+        this.longField = longField;
+    }
+
+    public Object getObjectField() {
+        return objectField;
+    }
+
+    public void setObjectField(Object objectField) {
+        this.objectField = objectField;
+    }
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    public void setStringField(String stringField) {
+        this.stringField = stringField;
+    }
+}

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/java/org/apache/struts2/json/WrapperClassBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/java/org/apache/struts2/json/WrapperClassBean.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/bad-1.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/bad-1.txt?rev=799110&r1=799109&r2=799110&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/bad-1.txt (original)
+++ struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/bad-1.txt Wed Jul 29 22:44:26 2009
@@ -1,3 +1,3 @@
-{ 
-    aField: NaN 
+{ 
+    aField: NaN 
 }
\ No newline at end of file

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/bad-1.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/bad-1.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/bad-2.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/bad-2.txt?rev=799110&r1=799109&r2=799110&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/bad-2.txt (original)
+++ struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/bad-2.txt Wed Jul 29 22:44:26 2009
@@ -1,2 +1,2 @@
-{ 
-    aField: 10 
+{ 
+    aField: 10 

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/bad-2.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/bad-2.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/bad-3.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/bad-3.txt?rev=799110&r1=799109&r2=799110&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/bad-3.txt (original)
+++ struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/bad-3.txt Wed Jul 29 22:44:26 2009
@@ -1,3 +1,3 @@
-
-    aField: 10 
+
+    aField: 10 
     }
\ No newline at end of file

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/bad-3.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/bad-3.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/bad-4.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/bad-4.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/bad-5.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/bad-5.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/bad-to-the-bone.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/bad-to-the-bone.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-1.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-1.txt?rev=799110&r1=799109&r2=799110&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-1.txt (original)
+++ struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-1.txt Wed Jul 29 22:44:26 2009
@@ -1,49 +1,49 @@
-{
-    "date": "1999-12-31T23:59:59",
-    "date2": "31\/12\/99",
-  	"array": ["str0", "str1"],
-  	"intArray": [1, 2],
-  	"beanArray": [ {
-  						"stringField": "bean1"
-  					},
-  					{
-  					    "stringField": "bean2"
-  					}
-  	],
-	"list": ["a", "a", "\"", "\\", "\/", "\b", "\f", "\n", "\r", "\t"],
-	"collection": ["b", 1, [10, 12]],
-	"collection2": [{
-						"booleanField": true,
-						"charField": "s",
-						"doubleField": 10.1,
-						"floatField": 1.5,
-						"intField": 10,
-						"longField": 100,
-						"objectField": {
-							"booleanField": false,
-							"charField": "\u0000",
-							"doubleField": 2.2,
-							"floatField": 1.1,
-							"intField": 0,
-							"longField":0,
-							"objectField":null,
-							"stringField":"  "
-					    },
-					    "stringField": "str"
-	}],
-	"foo": "foo",
-	"map": {
-		"a": 1,
-		"c": [1.0, 2.0]
-	},
-	"result": null,
-	"bean": {
-	    "booleanField": true,
-		"stringField" : "test",
-		"intField" : 10,
-		"charField": "s",
-		"doubleField": 10.1,
-		"byteField": 3
-	},
-	"foo2" : "ignoreme"
+{
+    "date": "1999-12-31T23:59:59",
+    "date2": "31\/12\/99",
+  	"array": ["str0", "str1"],
+  	"intArray": [1, 2],
+  	"beanArray": [ {
+  						"stringField": "bean1"
+  					},
+  					{
+  					    "stringField": "bean2"
+  					}
+  	],
+	"list": ["a", "a", "\"", "\\", "\/", "\b", "\f", "\n", "\r", "\t"],
+	"collection": ["b", 1, [10, 12]],
+	"collection2": [{
+						"booleanField": true,
+						"charField": "s",
+						"doubleField": 10.1,
+						"floatField": 1.5,
+						"intField": 10,
+						"longField": 100,
+						"objectField": {
+							"booleanField": false,
+							"charField": "\u0000",
+							"doubleField": 2.2,
+							"floatField": 1.1,
+							"intField": 0,
+							"longField":0,
+							"objectField":null,
+							"stringField":"  "
+					    },
+					    "stringField": "str"
+	}],
+	"foo": "foo",
+	"map": {
+		"a": 1,
+		"c": [1.0, 2.0]
+	},
+	"result": null,
+	"bean": {
+	    "booleanField": true,
+		"stringField" : "test",
+		"intField" : 10,
+		"charField": "s",
+		"doubleField": 10.1,
+		"byteField": 3
+	},
+	"foo2" : "ignoreme"
 }
\ No newline at end of file

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-1.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-1.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-10.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-10.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-2-enum.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-2-enum.txt?rev=799110&r1=799109&r2=799110&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-2-enum.txt (original)
+++ struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-2-enum.txt Wed Jul 29 22:44:26 2009
@@ -1,21 +1,21 @@
-{
-    "bigDecimal": null,
-    "bigInteger": null,
-	"booleanField": true,
-	"byteField": 0,
-	"charField": "s",
-	"doubleField": 10.1,
-	"enumBean": {
-	    "propA":"A",
-	    "propB":"B",
-	    "_name":"One"
-	 },
-	"enumField": {
-	    "_name":"ValueA"
-   },
-	"floatField": 1.5,
-	"intField": 10,
-	"longField": 100,
-	"objectField": null,
-	"stringField": "str"
+{
+    "bigDecimal": null,
+    "bigInteger": null,
+	"booleanField": true,
+	"byteField": 0,
+	"charField": "s",
+	"doubleField": 10.1,
+	"enumBean": {
+	    "propA":"A",
+	    "propB":"B",
+	    "_name":"One"
+	 },
+	"enumField": {
+	    "_name":"ValueA"
+   },
+	"floatField": 1.5,
+	"intField": 10,
+	"longField": 100,
+	"objectField": null,
+	"stringField": "str"
 }
\ No newline at end of file

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-2-enum.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-2-enum.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-2.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-2.txt?rev=799110&r1=799109&r2=799110&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-2.txt (original)
+++ struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-2.txt Wed Jul 29 22:44:26 2009
@@ -1,15 +1,15 @@
-{
-    "bigDecimal": null,
-    "bigInteger": null,
-	"booleanField": true,
-	"byteField": 0,
-	"charField": "s",
-	"doubleField": 10.1,
-	"enumBean": "One",
-	"enumField": "ValueA",	
-	"floatField": 1.5,
-	"intField": 10,
-	"longField": 100,
-	"objectField": null,
-	"stringField": "str"
+{
+    "bigDecimal": null,
+    "bigInteger": null,
+	"booleanField": true,
+	"byteField": 0,
+	"charField": "s",
+	"doubleField": 10.1,
+	"enumBean": "One",
+	"enumField": "ValueA",	
+	"floatField": 1.5,
+	"intField": 10,
+	"longField": 100,
+	"objectField": null,
+	"stringField": "str"
 }
\ No newline at end of file

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-2.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-2.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-3.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-3.txt?rev=799110&r1=799109&r2=799110&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-3.txt (original)
+++ struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-3.txt Wed Jul 29 22:44:26 2009
@@ -1,43 +1,43 @@
-/* {
-    "array": ["a", "a", "\"", "\\", "\/", "\b", "\f", "\n", "\r", "\t"],
-    "bean": null,
-    "collection": ["b", 1, [10, 12]],
-    "collection2": [{
-                        "bigDecimal": null,
-                        "bigInteger": null,
-                        "booleanField": true,
-                        "byteField": 0,
-                        "charField": "s",
-                        "doubleField": 10.1,
-                        "enumBean": null,
-                        "enumField": null,
-                        "floatField": 1.5,
-                        "intField": 10,
-                        "longField": 100,
-                        "objectField": {
-                            "bigDecimal": null,
-                            "bigInteger": null,
-                            "booleanField": false,
-                            "byteField": 0,
-                            "charField": "\u0000",
-                            "doubleField": 2.2,
-                            "enumBean": "Three",
-                            "enumField": "ValueC",                            
-                            "floatField": 1.1,
-                            "intField": 0,
-                            "longField":0,
-                            "objectField":null,
-                            "stringField":"  "
-                        },
-                        "stringField": "str"
-    }],
-    "date": "1999-12-31T11:59:59",
-    "date2": "31\/12\/99",
-    "foo": "foo",
-    "list": null,
-    "map": {
-        "a": 1,
-        "c": [1.0, 2.0]
-    },
-    "result":null
+/* {
+    "array": ["a", "a", "\"", "\\", "\/", "\b", "\f", "\n", "\r", "\t"],
+    "bean": null,
+    "collection": ["b", 1, [10, 12]],
+    "collection2": [{
+                        "bigDecimal": null,
+                        "bigInteger": null,
+                        "booleanField": true,
+                        "byteField": 0,
+                        "charField": "s",
+                        "doubleField": 10.1,
+                        "enumBean": null,
+                        "enumField": null,
+                        "floatField": 1.5,
+                        "intField": 10,
+                        "longField": 100,
+                        "objectField": {
+                            "bigDecimal": null,
+                            "bigInteger": null,
+                            "booleanField": false,
+                            "byteField": 0,
+                            "charField": "\u0000",
+                            "doubleField": 2.2,
+                            "enumBean": "Three",
+                            "enumField": "ValueC",                            
+                            "floatField": 1.1,
+                            "intField": 0,
+                            "longField":0,
+                            "objectField":null,
+                            "stringField":"  "
+                        },
+                        "stringField": "str"
+    }],
+    "date": "1999-12-31T11:59:59",
+    "date2": "31\/12\/99",
+    "foo": "foo",
+    "list": null,
+    "map": {
+        "a": 1,
+        "c": [1.0, 2.0]
+    },
+    "result":null
 } */
\ No newline at end of file

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-3.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-3.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-4.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-4.txt?rev=799110&r1=799109&r2=799110&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-4.txt (original)
+++ struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-4.txt Wed Jul 29 22:44:26 2009
@@ -1,4 +1,4 @@
-{
-    "name":"name",
-    "name2":"name"
+{
+    "name":"name",
+    "name2":"name"
 }
\ No newline at end of file

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-4.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-4.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-5.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-5.txt?rev=799110&r1=799109&r2=799110&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-5.txt (original)
+++ struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-5.txt Wed Jul 29 22:44:26 2009
@@ -1,8 +1,8 @@
-{
-    "booleanField": true,
-    "stringField" : "test",
-    "intField" : 10,
-    "charField": "s",
-    "doubleField": 10.1,
-    "byteField": 3
+{
+    "booleanField": true,
+    "stringField" : "test",
+    "intField" : 10,
+    "charField": "s",
+    "doubleField": 10.1,
+    "byteField": 3
 }
\ No newline at end of file

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-5.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-5.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-6.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-6.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-7.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-7.txt?rev=799110&r1=799109&r2=799110&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-7.txt (original)
+++ struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-7.txt Wed Jul 29 22:44:26 2009
@@ -1,20 +1,20 @@
-{
-        "bigDecimal": 111111.5,
-        "bigInteger": 111111,
-        "booleanField": true,
-        "primitiveBooleanField1": true,
-        "primitiveBooleanField2": false,
-        "primitiveBooleanField3": null,
-        "stringField" : "test\u000e\u000F",
-        "intField" : 10,
-        "nullIntField" : null,
-        "charField": "s",
-        "doubleField": 10.1,
-        "byteField": 3,
-        "objectField": { "empty": "to test issue 28 (http://code.google.com/p/jsonplugin/issues/detail?id=28) the value of objectField should be simply empty curly braces { } " },
-        "enumField": "ValueA",
-        "listField": [{"value":"1"},{"value":"2"}],
-        "listMapField": [{"id1":2073501,"id2":3}],
-        "mapListField": {"id1":[1,2,3],"id2":[4,3,2,1]},
-        "arrayMapField": [{"id1":2073501,"id2":3}]
-}
+{
+        "bigDecimal": 111111.5,
+        "bigInteger": 111111,
+        "booleanField": true,
+        "primitiveBooleanField1": true,
+        "primitiveBooleanField2": false,
+        "primitiveBooleanField3": null,
+        "stringField" : "test\u000e\u000F",
+        "intField" : 10,
+        "nullIntField" : null,
+        "charField": "s",
+        "doubleField": 10.1,
+        "byteField": 3,
+        "objectField": { "empty": "to test issue 28 (http://code.google.com/p/jsonplugin/issues/detail?id=28) the value of objectField should be simply empty curly braces { } " },
+        "enumField": "ValueA",
+        "listField": [{"value":"1"},{"value":"2"}],
+        "listMapField": [{"id1":2073501,"id2":3}],
+        "mapListField": {"id1":[1,2,3],"id2":[4,3,2,1]},
+        "arrayMapField": [{"id1":2073501,"id2":3}]
+}

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-7.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-7.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-8.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-8.txt?rev=799110&r1=799109&r2=799110&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-8.txt (original)
+++ struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-8.txt Wed Jul 29 22:44:26 2009
@@ -1,13 +1,13 @@
-{
-        "booleanField": "true",
-        "stringField" : "test",
-        "intField" : "10",
-        "charField": "s",
-        "doubleField": "10.1",
-        "byteField": "3",
-        "objectField": { "empty": "to test issue 28 (http://code.google.com/p/jsonplugin/issues/detail?id=28) the value of objectField should be simply empty curly braces { } " },
-        "listField": null,
-        "listMapField": null,
-        "mapListField": null,
-        "arrayMapField": null
+{
+        "booleanField": "true",
+        "stringField" : "test",
+        "intField" : "10",
+        "charField": "s",
+        "doubleField": "10.1",
+        "byteField": "3",
+        "objectField": { "empty": "to test issue 28 (http://code.google.com/p/jsonplugin/issues/detail?id=28) the value of objectField should be simply empty curly braces { } " },
+        "listField": null,
+        "listMapField": null,
+        "mapListField": null,
+        "arrayMapField": null
 }
\ No newline at end of file

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-8.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-8.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-9.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json-9.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json.txt?rev=799110&r1=799109&r2=799110&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json.txt (original)
+++ struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json.txt Wed Jul 29 22:44:26 2009
@@ -1,43 +1,43 @@
-{
-	"array": ["a", "a", "\"", "\\", "\/", "\b", "\f", "\n", "\r", "\t"],
-	"bean": null,
-	"collection": ["b", 1, [10, 12]],
-	"collection2": [{
-	                    "bigDecimal": 111111.111111,
-                        "bigInteger": 111111111111,
-						"booleanField": true,
-						"byteField": 0,
-						"charField": "s",
-						"doubleField": 10.1,
-						"enumBean": "One",
-						"enumField": "ValueA",
-						"floatField": 1.5,						
-						"intField": 10,
-						"longField": 100,
-						"objectField": {
-						    "bigDecimal": null,
-                            "bigInteger": null,
-							"booleanField": false,
-							"byteField": 0,
-							"charField": "\u0000",
-							"doubleField": 2.2,
-							"enumBean": "Two",
-							"enumField": "ValueB",
-							"floatField": 1.1,
-							"intField": 0,
-							"longField":0,
-							"objectField":null,
-							"stringField":"  "
-					    },
-					    "stringField": "str"
-	}],
-	"date": "1999-12-31T11:59:59",
-	"date2": "31\/12\/99",
-	"foo": "foo",
-	"list": null,
-	"map": {
-		"a": 1,
-		"c": [1.0, 2.0]
-	},
-	"result":null
+{
+	"array": ["a", "a", "\"", "\\", "\/", "\b", "\f", "\n", "\r", "\t"],
+	"bean": null,
+	"collection": ["b", 1, [10, 12]],
+	"collection2": [{
+	                    "bigDecimal": 111111.111111,
+                        "bigInteger": 111111111111,
+						"booleanField": true,
+						"byteField": 0,
+						"charField": "s",
+						"doubleField": 10.1,
+						"enumBean": "One",
+						"enumField": "ValueA",
+						"floatField": 1.5,						
+						"intField": 10,
+						"longField": 100,
+						"objectField": {
+						    "bigDecimal": null,
+                            "bigInteger": null,
+							"booleanField": false,
+							"byteField": 0,
+							"charField": "\u0000",
+							"doubleField": 2.2,
+							"enumBean": "Two",
+							"enumField": "ValueB",
+							"floatField": 1.1,
+							"intField": 0,
+							"longField":0,
+							"objectField":null,
+							"stringField":"  "
+					    },
+					    "stringField": "str"
+	}],
+	"date": "1999-12-31T11:59:59",
+	"date2": "31\/12\/99",
+	"foo": "foo",
+	"list": null,
+	"map": {
+		"a": 1,
+		"c": [1.0, 2.0]
+	},
+	"result":null
 }
\ No newline at end of file

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/json.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/jsonp-1.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/jsonp-1.txt?rev=799110&r1=799109&r2=799110&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/jsonp-1.txt (original)
+++ struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/jsonp-1.txt Wed Jul 29 22:44:26 2009
@@ -1,15 +1,15 @@
-exec({
-    "bigDecimal": null,
-    "bigInteger": null,
-	"booleanField": true,
-	"byteField": 0,
-	"charField": "s",
-	"doubleField": 10.1,
-	"enumBean": "One",
-	"enumField": "ValueA",
-	"floatField": 1.5,
-	"intField": 10,
-	"longField": 100,
-	"objectField": null,
-	"stringField": "str"
+exec({
+    "bigDecimal": null,
+    "bigInteger": null,
+	"booleanField": true,
+	"byteField": 0,
+	"charField": "s",
+	"doubleField": 10.1,
+	"enumBean": "One",
+	"enumField": "ValueA",
+	"floatField": 1.5,
+	"intField": 10,
+	"longField": 100,
+	"objectField": null,
+	"stringField": "str"
 })
\ No newline at end of file

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/jsonp-1.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/jsonp-1.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/nulls-1.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/nulls-1.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/prefix-1.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/prefix-1.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-1.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-1.txt?rev=799110&r1=799109&r2=799110&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-1.txt (original)
+++ struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-1.txt Wed Jul 29 22:44:26 2009
@@ -1,41 +1,41 @@
-{
-    "methods":[
-        {
-            "name":"add",
-            "parameters":[
-                {"name":"p0"},
-                {"name":"p1"}
-            ]
-        },
-        {
-            "name":"doSomething",
-            "parameters":[]
-        },
-        {
-            "name":"doSomethingObjects",
-            "parameters":[
-                {"name":"p0"},
-                {"name":"p1"},
-                {"name":"p2"}
-            ]
-        },
-        {
-            "name":"doSomethingPrimitives",
-            "parameters":[
-                {"name":"p0"},
-                {"name":"p1"},
-                {"name":"p2"},
-                {"name":"p3"},
-                {"name":"p4"},
-                {"name":"p5"},
-                {"name":"p6"},
-                {"name":"p7"},
-                {"name":"p8"}
-             ]
-        }
-    ],
-    "objectName":null,
-    "serviceType":"JSON-RPC",
-    "serviceUrl":"http:\/\/sumeruri",
-    "version":".1"
+{
+    "methods":[
+        {
+            "name":"add",
+            "parameters":[
+                {"name":"p0"},
+                {"name":"p1"}
+            ]
+        },
+        {
+            "name":"doSomething",
+            "parameters":[]
+        },
+        {
+            "name":"doSomethingObjects",
+            "parameters":[
+                {"name":"p0"},
+                {"name":"p1"},
+                {"name":"p2"}
+            ]
+        },
+        {
+            "name":"doSomethingPrimitives",
+            "parameters":[
+                {"name":"p0"},
+                {"name":"p1"},
+                {"name":"p2"},
+                {"name":"p3"},
+                {"name":"p4"},
+                {"name":"p5"},
+                {"name":"p6"},
+                {"name":"p7"},
+                {"name":"p8"}
+             ]
+        }
+    ],
+    "objectName":null,
+    "serviceType":"JSON-RPC",
+    "serviceUrl":"http:\/\/sumeruri",
+    "version":".1"
 }
\ No newline at end of file

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-1.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-1.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-10.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-10.txt?rev=799110&r1=799109&r2=799110&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-10.txt (original)
+++ struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-10.txt Wed Jul 29 22:44:26 2009
@@ -1,4 +1,4 @@
-{
-    "method": "getBean",
-    "id":15
+{
+    "method": "getBean",
+    "id":15
 }
\ No newline at end of file

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-10.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-10.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-11.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-11.txt?rev=799110&r1=799109&r2=799110&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-11.txt (original)
+++ struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-11.txt Wed Jul 29 22:44:26 2009
@@ -1,5 +1,5 @@
-{
-    "error":null,
-    "id":"2",
-    "result":null
+{
+    "error":null,
+    "id":"2",
+    "result":null
 }
\ No newline at end of file

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-11.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-11.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-12.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-12.txt?rev=799110&r1=799109&r2=799110&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-12.txt (original)
+++ struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-12.txt Wed Jul 29 22:44:26 2009
@@ -1,19 +1,19 @@
-{
-    "error":null,
-    "id":"15",
-    "result": {
-        "bigDecimal": null,
-        "bigInteger": null,
-        "booleanField": true,
-        "byteField": 0,
-        "charField": "s",
-        "doubleField": 10.1,
-        "enumBean": null,
-        "enumField": null,        
-        "floatField": 1.5,
-        "intField": 10,
-        "longField": 100,
-        "objectField": null,
-        "stringField": "str"
-    }
+{
+    "error":null,
+    "id":"15",
+    "result": {
+        "bigDecimal": null,
+        "bigInteger": null,
+        "booleanField": true,
+        "byteField": 0,
+        "charField": "s",
+        "doubleField": 10.1,
+        "enumBean": null,
+        "enumField": null,        
+        "floatField": 1.5,
+        "intField": 10,
+        "longField": 100,
+        "objectField": null,
+        "stringField": "str"
+    }
 }    
\ No newline at end of file

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-12.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-12.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-13.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-13.txt?rev=799110&r1=799109&r2=799110&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-13.txt (original)
+++ struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-13.txt Wed Jul 29 22:44:26 2009
@@ -1,10 +1,10 @@
-{
-    "error": {
-        "code":100,
-        "message": "'method' is required for JSON RPC",
-        "name":null,
-        "stack":null
-    },
-    "id":"1",
-    "result":null
+{
+    "error": {
+        "code":100,
+        "message": "'method' is required for JSON RPC",
+        "name":null,
+        "stack":null
+    },
+    "id":"1",
+    "result":null
 }
\ No newline at end of file

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-13.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-13.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-14.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-14.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-15.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-15.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-2.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-2.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-3.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-3.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-4.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-4.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-5.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-5.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-6.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-6.txt?rev=799110&r1=799109&r2=799110&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-6.txt (original)
+++ struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-6.txt Wed Jul 29 22:44:26 2009
@@ -1,5 +1,5 @@
-{
-    "params": ["string", 1, true, 'c', 2, 3.3, 4.4, 5, 6],
-    "method": "doSomethingPrimitives",
-    "id":"2"
+{
+    "params": ["string", 1, true, 'c', 2, 3.3, 4.4, 5, 6],
+    "method": "doSomethingPrimitives",
+    "id":"2"
 }
\ No newline at end of file

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-6.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-6.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-7.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-7.txt?rev=799110&r1=799109&r2=799110&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-7.txt (original)
+++ struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-7.txt Wed Jul 29 22:44:26 2009
@@ -1,19 +1,19 @@
-{
-    "params": [
-        {
-            "booleanField": true,
-            "stringField" : "test",
-            "intField" : 10,
-            "charField": "s",
-            "doubleField": 10.1,
-            "byteField": 3
-        },
-        {
-            "a": 1,
-            "c": [1.0, 2.0]
-        },
-        ["str0", "str1"]
-    ],
-    "method": "doSomethingObjects",
-    "id":"2"
+{
+    "params": [
+        {
+            "booleanField": true,
+            "stringField" : "test",
+            "intField" : 10,
+            "charField": "s",
+            "doubleField": 10.1,
+            "byteField": 3
+        },
+        {
+            "a": 1,
+            "c": [1.0, 2.0]
+        },
+        ["str0", "str1"]
+    ],
+    "method": "doSomethingObjects",
+    "id":"2"
 }
\ No newline at end of file

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-7.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-7.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-8.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-8.txt?rev=799110&r1=799109&r2=799110&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-8.txt (original)
+++ struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-8.txt Wed Jul 29 22:44:26 2009
@@ -1,16 +1,16 @@
-{
-    "addWasCalled":false,
-    "beanParam":null,
-    "booleanParam":false,
-    "byteParam":0,
-    "charParam":"\u0000",
-    "doubleParam":0.0,
-    "floatParam":0.0,
-    "intParam":0,
-    "listParam":null,
-    "longParam":0,
-    "mapParam":null,
-    "objectParam":null,
-    "shortParam":0,
-    "stringParam":null
+{
+    "addWasCalled":false,
+    "beanParam":null,
+    "booleanParam":false,
+    "byteParam":0,
+    "charParam":"\u0000",
+    "doubleParam":0.0,
+    "floatParam":0.0,
+    "intParam":0,
+    "listParam":null,
+    "longParam":0,
+    "mapParam":null,
+    "objectParam":null,
+    "shortParam":0,
+    "stringParam":null
 }
\ No newline at end of file

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-8.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-8.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-9.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-9.txt?rev=799110&r1=799109&r2=799110&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-9.txt (original)
+++ struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-9.txt Wed Jul 29 22:44:26 2009
@@ -1,5 +1,5 @@
-{
-    "params": [0, 0],
-    "method": "methodWithoutAnnotation",
-    "id":1
+{
+    "params": [0, 0],
+    "method": "methodWithoutAnnotation",
+    "id":1
 }
\ No newline at end of file

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-9.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd-9.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/struts2-json-plugin/src/test/resources/org/apache/struts2/json/smd.txt
------------------------------------------------------------------------------
    svn:keywords = Id



Mime
View raw message