juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [01/21] incubator-juneau git commit: HTML and XML serialization support improvements.
Date Sat, 21 Jan 2017 22:25:00 GMT
Repository: incubator-juneau
Updated Branches:
  refs/heads/master 615190add -> 4fb01038a


http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/4fb01038/juneau-core/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/juneau-core/src/test/resources/log4j.properties b/juneau-core/src/test/resources/log4j.properties
deleted file mode 100644
index 571e55f..0000000
--- a/juneau-core/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,40 +0,0 @@
-# ***************************************************************************************************************************
-# * 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.          
                                   *
-# *                                                                                     
                                   *
-# ***************************************************************************************************************************
-
-# Default logging is for WARN and higher
-log4j.rootLogger=INFO, stdout, file
-
-################################
-#   File Appender              #
-################################
-log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.MaxFileSize=10MB
-log4j.appender.file.MaxBackupIndex=5
-log4j.appender.file.File=target/logs/org.apache.juneau.log
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{ISO8601} [%20t] %5p %-50.50c  - %m%n
-
-################################
-#   stdout Appender            #
-################################
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-# Pattern to output the caller's file name and line number.
-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %5p [%-30.30c] -- %m -- [%t]%n
-# Get file and line numbers, but it's very expensive...
-#log4j.appender.stdout.layout.ConversionPattern=%-8r [%t] %5p (%F:%L)  - %m%n
-# Default conversion pattern
-#log4j.appender.stdout.layout.ConversionPattern=%r [%t] %p %c %x - %m%n
-# Another example pattern
-#log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/4fb01038/juneau-core/src/test/resources/xml/testComparisonWithJson.json
----------------------------------------------------------------------
diff --git a/juneau-core/src/test/resources/xml/testComparisonWithJson.json b/juneau-core/src/test/resources/xml/testComparisonWithJson.json
deleted file mode 100755
index 30020ce..0000000
--- a/juneau-core/src/test/resources/xml/testComparisonWithJson.json
+++ /dev/null
@@ -1,29 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.         
                                    *
-// ***************************************************************************************************************************
-{
-	name: "John Smith", 
-	address: {
-		streetAddress: "21 2nd Street", 
-		city: "New York", 
-		state: "NY", 
-		postalCode: 10021
-	}, 
-	phoneNumbers: [
-		"212 555-1111", 
-		"212 555-2222"
-	], 
-	additionalInfo: null, 
-	remote: false, 
-	height: 62.4, 
-	"fico score": " > 640"
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/4fb01038/juneau-core/src/test/resources/xml/testComparisonWithJson.xml
----------------------------------------------------------------------
diff --git a/juneau-core/src/test/resources/xml/testComparisonWithJson.xml b/juneau-core/src/test/resources/xml/testComparisonWithJson.xml
deleted file mode 100755
index 8994736..0000000
--- a/juneau-core/src/test/resources/xml/testComparisonWithJson.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ***************************************************************************************************************************
- * 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.           
                                  *
- ***************************************************************************************************************************
--->
-<object>
-	<name>John Smith</name>
-	<address _type='object'>
-		<streetAddress>21 2nd Street</streetAddress>
-		<city>New York</city>
-		<state>NY</state>
-		<postalCode _type='number'>10021</postalCode>
-	</address>
-	<phoneNumbers _type='array'>
-		<string>212 555-1111</string>
-		<string>212 555-2222</string>
-	</phoneNumbers>
-	<additionalInfo nil='true'/>
-	<remote _type='boolean'>false</remote>
-	<height _type='number'>62.4</height>
-	<fico_x0020_score>_x0020_&gt; 640</fico_x0020_score>
-</object>

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/4fb01038/juneau-core/src/test/resources/xml/testNamespaces.xml
----------------------------------------------------------------------
diff --git a/juneau-core/src/test/resources/xml/testNamespaces.xml b/juneau-core/src/test/resources/xml/testNamespaces.xml
deleted file mode 100755
index e3b8a77..0000000
--- a/juneau-core/src/test/resources/xml/testNamespaces.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ***************************************************************************************************************************
- * 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.           
                                  *
- ***************************************************************************************************************************
--->
-<object xmlns='http://www.apache.org' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-	<name>John Smith</name>
-	<address _type='object'>
-		<streetAddress>21 2nd Street</streetAddress>
-		<city>New York</city>
-		<state>NY</state>
-		<postalCode _type='number'>10021</postalCode>
-	</address>
-	<phoneNumbers _type='array'>
-		<string>212 555-1111</string>
-		<string>212 555-2222</string>
-	</phoneNumbers>
-	<additionalInfo xsi:nil='true'/>
-	<remote _type='boolean'>false</remote>
-	<height _type='number'>62.4</height>
-	<fico_x0020_score>_x0020_&gt; 640</fico_x0020_score>
-</object>

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/4fb01038/juneau-samples/src/main/java/org/apache/juneau/server/samples/AtomFeedResource.java
----------------------------------------------------------------------
diff --git a/juneau-samples/src/main/java/org/apache/juneau/server/samples/AtomFeedResource.java
b/juneau-samples/src/main/java/org/apache/juneau/server/samples/AtomFeedResource.java
index 6343047..410115f 100755
--- a/juneau-samples/src/main/java/org/apache/juneau/server/samples/AtomFeedResource.java
+++ b/juneau-samples/src/main/java/org/apache/juneau/server/samples/AtomFeedResource.java
@@ -12,7 +12,7 @@
 // ***************************************************************************************************************************
 package org.apache.juneau.server.samples;
 
-import static javax.xml.bind.DatatypeConverter.*;
+import static org.apache.juneau.dto.atom.AtomBuilder.*;
 import static org.apache.juneau.html.HtmlDocSerializerContext.*;
 import static org.apache.juneau.jena.RdfCommonContext.*;
 import static org.apache.juneau.jena.RdfSerializerContext.*;
@@ -20,10 +20,10 @@ import static org.apache.juneau.jena.RdfSerializerContext.*;
 import java.net.*;
 
 import org.apache.juneau.dto.atom.*;
-import org.apache.juneau.dto.atom.Content;
 import org.apache.juneau.encoders.*;
 import org.apache.juneau.microservice.*;
 import org.apache.juneau.server.annotation.*;
+import org.apache.juneau.server.annotation.Body;
 
 /**
  * Sample resource that shows how to generate ATOM feeds.
@@ -48,38 +48,36 @@ public class AtomFeedResource extends ResourceJena {
 	public void init() {
 
 		try {
-			feed = new Feed()
-				.setTitle(new Text("text", "Juneau ATOM specification"))
-				.setSubTitle(new Text("html", "A <em>lot</em> of effort went into making
this effortless"))
-				.setUpdated(parseDateTime("2013-05-08T12:29:29Z"))
-				.setId(new Id("tag:juneau.sample.com,2013:1"))
-				.addLinks(
-					new Link("alternate", "text/html", "http://www.sample.com/").setHreflang("en"),
-					new Link("self", "application/atom+xml", "http://www.sample.com/feed.atom")
+			feed = 
+				feed("tag:juneau.sample.com,2013:1", "Juneau ATOM specification", "2013-05-08T12:29:29Z")
+				.subtitle(text("html").text("A <em>lot</em> of effort went into making this
effortless"))
+				.links(
+					link("alternate", "text/html", "http://www.sample.com/").hreflang("en"),
+					link("self", "application/atom+xml", "http://www.sample.com/feed.atom")
 				)
-				.setRights(new Text("Copyright (c) 2016, Apache Foundation"))
-				.setGenerator(new Generator("Juneau").setUri(new URI("http://juneau.apache.org/")).setVersion("1.0"))
-				.addEntries(
-					new Entry()
-						.setTitle(new Text("Juneau ATOM specification snapshot"))
-						.addLinks(
-							new Link("alternate", "text/html", "http://www.sample.com/2012/05/08/juneau.atom"),
-							new Link("enclosure", "audio/mpeg", "http://www.sample.com/audio/juneau_podcast.mp3").setLength(12345)
-						)
-						.setId(new Id("tag:juneau.sample.com,2013:1.2345"))
-						.setUpdated(parseDateTime("2013-05-08T12:29:29Z"))
-						.setPublished(parseDateTime("2013-05-08T12:29:29Z"))
-						.addAuthors(new Person("James Bognar").setUri(new URI("http://www.sample.com/")).setEmail("james.bognar@salesforce.com"))
-						.addContributors(
-							new Person("Barry M. Caceres")
-						)
-						.setContent(
-							new Content()
-								.setLang("en")
-								.setBase(new URI("http://www.apache.org/"))
-								.setType("xhtml")
-								.setText("<div xmlns=\"http://www.w3.org/1999/xhtml\"><p><i>[Update:
Juneau supports ATOM.]</i></p></div>")
-						)
+				.rights("Copyright (c) 2016, Apache Foundation")
+				.generator(
+					generator("Juneau").uri("http://juneau.apache.org/").version("1.0")
+				)
+				.entries(
+					entry("tag:juneau.sample.com,2013:1.2345", "Juneau ATOM specification snapshot", "2013-05-08T12:29:29Z")
+					.links(
+						link("alternate", "text/html", "http://www.sample.com/2012/05/08/juneau.atom"),
+						link("enclosure", "audio/mpeg", "http://www.sample.com/audio/juneau_podcast.mp3").length(1337)
+					)
+					.published("2013-05-08T12:29:29Z")
+					.authors(
+						person("James Bognar").uri(new URI("http://www.sample.com/")).email("jamesbognar@apache.org")
+					)
+					.contributors(
+						person("Barry M. Caceres")
+					)
+					.content(
+						content("xhtml")
+						.lang("en")
+						.base("http://www.apache.org/")
+						.text("<div><p>[Update: Juneau supports ATOM.]</p></div>")
+					)
 				);
 		} catch (Exception e) {
 			throw new RuntimeException(e);

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/4fb01038/juneau-samples/src/main/java/org/apache/juneau/server/samples/TumblrParserResource.java
----------------------------------------------------------------------
diff --git a/juneau-samples/src/main/java/org/apache/juneau/server/samples/TumblrParserResource.java
b/juneau-samples/src/main/java/org/apache/juneau/server/samples/TumblrParserResource.java
index e6164ee..d4d44e4 100755
--- a/juneau-samples/src/main/java/org/apache/juneau/server/samples/TumblrParserResource.java
+++ b/juneau-samples/src/main/java/org/apache/juneau/server/samples/TumblrParserResource.java
@@ -19,7 +19,7 @@ import java.lang.Object;
 import org.apache.juneau.*;
 import org.apache.juneau.client.*;
 import org.apache.juneau.dto.Link;
-import org.apache.juneau.html.dto.proto.*;
+import org.apache.juneau.dto.html5.*;
 import org.apache.juneau.json.*;
 import org.apache.juneau.microservice.*;
 import org.apache.juneau.server.annotation.*;
@@ -68,7 +68,7 @@ public class TumblrParserResource extends Resource {
 					else if (type.equals("regular"))
 						e.entry = om.getString("regular-body");
 					else if (type.equals("photo"))
-						e.entry = new Img(om.getString("photo-url-250"));
+						e.entry = new Img().src(om.getString("photo-url-250"));
 					else
 						e.entry = new ObjectMap().append("type", type);
 					l.add(e);

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/4fb01038/juneau-samples/src/main/java/org/apache/juneau/server/samples/addressbook/ClientTest.java
----------------------------------------------------------------------
diff --git a/juneau-samples/src/main/java/org/apache/juneau/server/samples/addressbook/ClientTest.java
b/juneau-samples/src/main/java/org/apache/juneau/server/samples/addressbook/ClientTest.java
index e81e8f5..183afd2 100755
--- a/juneau-samples/src/main/java/org/apache/juneau/server/samples/addressbook/ClientTest.java
+++ b/juneau-samples/src/main/java/org/apache/juneau/server/samples/addressbook/ClientTest.java
@@ -32,7 +32,7 @@ public class ClientTest {
 
 			// Create a client to handle XML requests and responses.
 			RestClient client = new RestClient(JsonSerializer.DEFAULT, JsonParser.DEFAULT);
-			RestClient xmlClient = new RestClient(XmlSerializer.DEFAULT, XmlParser.DEFAULT);
+			RestClient xmlClient = new RestClient(XmlSerializer.DEFAULT_NS, XmlParser.DEFAULT);
 			try {
 				String root = "http://localhost:10000/addressBook";
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/4fb01038/juneau-samples/src/test/java/org/apache/juneau/server/samples/TestUtils.java
----------------------------------------------------------------------
diff --git a/juneau-samples/src/test/java/org/apache/juneau/server/samples/TestUtils.java
b/juneau-samples/src/test/java/org/apache/juneau/server/samples/TestUtils.java
index f6b8e77..dce0ac6 100755
--- a/juneau-samples/src/test/java/org/apache/juneau/server/samples/TestUtils.java
+++ b/juneau-samples/src/test/java/org/apache/juneau/server/samples/TestUtils.java
@@ -217,7 +217,7 @@ public class TestUtils {
 	private static Pattern pTargetNs = Pattern.compile("targetNamespace=['\"]([^'\"]+)['\"]");
 
 	public static void validateXml(Object o) throws Exception {
-		validateXml(o, XmlSerializer.DEFAULT_SQ);
+		validateXml(o, XmlSerializer.DEFAULT_NS_SQ);
 	}
 
 	/**

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/4fb01038/juneau-server-test/src/main/java/org/apache/juneau/server/test/InheritanceResource.java
----------------------------------------------------------------------
diff --git a/juneau-server-test/src/main/java/org/apache/juneau/server/test/InheritanceResource.java
b/juneau-server-test/src/main/java/org/apache/juneau/server/test/InheritanceResource.java
index 13445c2..c07468b 100755
--- a/juneau-server-test/src/main/java/org/apache/juneau/server/test/InheritanceResource.java
+++ b/juneau-server-test/src/main/java/org/apache/juneau/server/test/InheritanceResource.java
@@ -294,21 +294,21 @@ public class InheritanceResource extends RestServlet {
 	public static class Foo2 {@Override public String toString(){return "Foo2";}}
 	public static class Foo3 {@Override public String toString(){return "Foo3";}}
 
-	public static class F1Swap extends PojoSwap<Foo1,String> {
+	public static class F1Swap extends StringSwap<Foo1> {
 		@Override /* PojoSwap */
 		public String swap(BeanSession session, Foo1 o) throws SerializeException {
 			return "F1";
 		}
 	}
 
-	public static class F2Swap extends PojoSwap<Foo2,String> {
+	public static class F2Swap extends StringSwap<Foo2> {
 		@Override /* PojoSwap */
 		public String swap(BeanSession session, Foo2 o) throws SerializeException {
 			return "F2";
 		}
 	}
 
-	public static class F3Swap extends PojoSwap<Foo3,String> {
+	public static class F3Swap extends StringSwap<Foo3> {
 		@Override /* PojoSwap */
 		public String swap(BeanSession session, Foo3 o) throws SerializeException {
 			return "F3";

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/4fb01038/juneau-server-test/src/main/java/org/apache/juneau/server/test/MessagesResource.java
----------------------------------------------------------------------
diff --git a/juneau-server-test/src/main/java/org/apache/juneau/server/test/MessagesResource.java
b/juneau-server-test/src/main/java/org/apache/juneau/server/test/MessagesResource.java
index 09d774a..1a0e099 100755
--- a/juneau-server-test/src/main/java/org/apache/juneau/server/test/MessagesResource.java
+++ b/juneau-server-test/src/main/java/org/apache/juneau/server/test/MessagesResource.java
@@ -50,7 +50,7 @@ public class MessagesResource extends RestServletDefault {
 	)
 	public static class Messages2Resource extends MessagesResource {}
 
-	public static class ResourceBundleSwap extends PojoSwap<ResourceBundle,ObjectMap>
{
+	public static class ResourceBundleSwap extends MapSwap<ResourceBundle> {
 		@Override /* Transform */
 		public ObjectMap swap(BeanSession session, ResourceBundle o) throws SerializeException
{
 			ObjectMap m = new ObjectMap();

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/4fb01038/juneau-server-test/src/main/java/org/apache/juneau/server/test/TransformsResource.java
----------------------------------------------------------------------
diff --git a/juneau-server-test/src/main/java/org/apache/juneau/server/test/TransformsResource.java
b/juneau-server-test/src/main/java/org/apache/juneau/server/test/TransformsResource.java
index 8e6088b..6be5731 100755
--- a/juneau-server-test/src/main/java/org/apache/juneau/server/test/TransformsResource.java
+++ b/juneau-server-test/src/main/java/org/apache/juneau/server/test/TransformsResource.java
@@ -67,7 +67,7 @@ public class TransformsResource extends TransformsParentResource {
 		public int f1;
 	}
 
-	public static class SwapA1 extends PojoSwap<A,String> {
+	public static class SwapA1 extends StringSwap<A> {
 		@Override /* PojoSwap */
 		public String swap(BeanSession session, A a) throws SerializeException {
 			return "A1-" + a.f1;
@@ -82,7 +82,7 @@ public class TransformsResource extends TransformsParentResource {
 		}
 	}
 
-	public static class SwapA2 extends PojoSwap<A,String> {
+	public static class SwapA2 extends StringSwap<A> {
 		@Override /* PojoSwap */
 		public String swap(BeanSession session, A a) throws SerializeException {
 			return "A2-" + a.f1;
@@ -97,7 +97,7 @@ public class TransformsResource extends TransformsParentResource {
 		}
 	}
 
-	public static class SwapA3 extends PojoSwap<A,String> {
+	public static class SwapA3 extends StringSwap<A> {
 		@Override /* PojoSwap */
 		public String swap(BeanSession session, A a) throws SerializeException {
 			return "A3-" + a.f1;

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/4fb01038/juneau-server/src/main/java/org/apache/juneau/server/RestRequest.java
----------------------------------------------------------------------
diff --git a/juneau-server/src/main/java/org/apache/juneau/server/RestRequest.java b/juneau-server/src/main/java/org/apache/juneau/server/RestRequest.java
index 4ca5c07..2272604 100755
--- a/juneau-server/src/main/java/org/apache/juneau/server/RestRequest.java
+++ b/juneau-server/src/main/java/org/apache/juneau/server/RestRequest.java
@@ -1107,7 +1107,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 	 * 		</tr>
 	 * 	</table>
 	 * <p>
-	 * 	Refer to <a href='../core/package-summary.html#PojoCategories' class='doclink'>POJO
Categories</a> for a complete definition of supported POJOs.
+	 * 	Refer to <a href='../../../../overview-summary.html#Core.PojoCategories' class='doclink'>POJO
Categories</a> for a complete definition of supported POJOs.
 	 *
 	 * @param type The class type to instantiate.
 	 * @param <T> The class type to instantiate.

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/4fb01038/juneau-server/src/main/java/org/apache/juneau/server/RestResponse.java
----------------------------------------------------------------------
diff --git a/juneau-server/src/main/java/org/apache/juneau/server/RestResponse.java b/juneau-server/src/main/java/org/apache/juneau/server/RestResponse.java
index 9b05266..6b79bfc 100755
--- a/juneau-server/src/main/java/org/apache/juneau/server/RestResponse.java
+++ b/juneau-server/src/main/java/org/apache/juneau/server/RestResponse.java
@@ -152,7 +152,7 @@ public final class RestResponse extends HttpServletResponseWrapper {
 	 * 	<ul>
 	 * 	  <li> {@link InputStream}
 	 * 	  <li> {@link Reader}
-	 * 	  <li> Any serializable type defined in <a href='../core/package-summary.html#PojoCategories'>POJO
Categories</a>
+	 * 	  <li> Any serializable type defined in <a href='../../../../overview-summary.html#Core.PojoCategories'>POJO
Categories</a>
 	 * 	</ul>
 	 * <p>
 	 * 	If it's an {@link InputStream} or {@link Reader}, you must also specify the <code>Content-Type</code>
using the {@link #setContentType(String)} method.

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/4fb01038/juneau-server/src/main/java/org/apache/juneau/server/RestServlet.java
----------------------------------------------------------------------
diff --git a/juneau-server/src/main/java/org/apache/juneau/server/RestServlet.java b/juneau-server/src/main/java/org/apache/juneau/server/RestServlet.java
index 9750449..a3a7c99 100755
--- a/juneau-server/src/main/java/org/apache/juneau/server/RestServlet.java
+++ b/juneau-server/src/main/java/org/apache/juneau/server/RestServlet.java
@@ -2118,7 +2118,7 @@ public abstract class RestServlet extends HttpServlet {
 		 */
 		private void assertCollection(Type t, Method m) throws ServletException {
 			ClassMeta<?> cm = BeanContext.DEFAULT.getClassMeta(t);
-			if (! (cm.isArray() || cm.isCollection()))
+			if (! cm.isCollectionOrArray())
 				throw new ServletException("Use of multipart flag on parameter that's not an array or
Collection on method" + m);
 		}
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/4fb01038/juneau-server/src/main/java/org/apache/juneau/server/remoteable/package.html
----------------------------------------------------------------------
diff --git a/juneau-server/src/main/java/org/apache/juneau/server/remoteable/package.html
b/juneau-server/src/main/java/org/apache/juneau/server/remoteable/package.html
index 6a1305b..5678e21 100755
--- a/juneau-server/src/main/java/org/apache/juneau/server/remoteable/package.html
+++ b/juneau-server/src/main/java/org/apache/juneau/server/remoteable/package.html
@@ -117,7 +117,7 @@
 	</p>
 	<ul class='spaced-list'>
 		<li>The method must be public.
-		<li>The parameter and return types must be <a href='../../core/package-summary.html#PojoCategories'>serializable
and parsable</a>.
+		<li>The parameter and return types must be <a href='../../../../../overview-summary.html#Core.PojoCategories'>serializable
and parsable</a>.
 	</ul>
 </div>
 


Mime
View raw message