juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject incubator-juneau git commit: [JUNEAU-17] - Resolve various small issues pointed out during release of 6.0.0
Date Thu, 27 Oct 2016 23:03:18 GMT
Repository: incubator-juneau
Updated Branches:
  refs/heads/master 691ca4171 -> eb4c53707


[JUNEAU-17] - Resolve various small issues pointed out during release of
6.0.0

Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/eb4c5370
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/eb4c5370
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/eb4c5370

Branch: refs/heads/master
Commit: eb4c537071e2540f3a3d6fa589c3ab1bd7be393a
Parents: 691ca41
Author: JamesBognar <jamesbognar@apache.org>
Authored: Thu Oct 27 19:03:13 2016 -0400
Committer: JamesBognar <jamesbognar@apache.org>
Committed: Thu Oct 27 19:03:13 2016 -0400

----------------------------------------------------------------------
 .../org/apache/juneau/dto/atom/package.html     |  14 ++++++-------
 juneau-core/src/main/javadoc/overview.html      |  21 +++++++++++++++++++
 .../org/apache/juneau/dto/atom/AtomTest.java    |   2 +-
 .../src/test/resources/dto/atom/test1.xml       |   2 +-
 .../src/test/resources/dto/atom/test2.xml       |   2 +-
 .../src/test/resources/dto/atom/test3.xml       |   2 +-
 .../juneau/server/samples/PhotosResource.java   |   2 +-
 .../juneau/server/samples/averycutecat.jpg      | Bin 0 -> 318563 bytes
 .../juneau/server/samples/averycutedog.jpg      | Bin 40879 -> 0 bytes
 9 files changed, 33 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/eb4c5370/juneau-core/src/main/java/org/apache/juneau/dto/atom/package.html
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/package.html b/juneau-core/src/main/java/org/apache/juneau/dto/atom/package.html
index 3fbcf3b..e5b4f90 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/package.html
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/package.html
@@ -100,8 +100,8 @@
 			<jk>new</jk> Link(<js>"alternate"</js>, <js>"text/html"</js>,
<js>"http://www.sample.com/"</js>).setHreflang(<js>"en"</js>),
 			<jk>new</jk> Link(<js>"self"</js>, <js>"application/atom+xml"</js>,
<js>"http://www.sample.com/feed.atom"</js>)
 		)
-		.setRights(<jk>new</jk> Text(<js>"Copyright (c) 2013, IBM"</js>))
-		.setGenerator(<jk>new</jk> Generator(<js>"Juneau"</js>).setUri(<jk>new</jk>
URI(<js>"http://juneau.ibm..com/"</js>)).setVersion(<js>"1.0"</js>))
+		.setRights(<jk>new</jk> Text(<js>"Copyright (c) 2016, Apache Foundation"</js>))
+		.setGenerator(<jk>new</jk> Generator(<js>"Juneau"</js>).setUri(<jk>new</jk>
URI(<js>"http://juneau.ibm.com/"</js>)).setVersion(<js>"1.0"</js>))
 		.addEntries(
 			<jk>new</jk> Entry()
 				.setTitle(<jk>new</jk> Text(<js>"Juneau ATOM specification snapshot"</js>))
@@ -148,7 +148,7 @@
 		<xt>&lt;link</xt> <xa>href</xa>=<xs>'http://www.sample.com/'</xs>
<xa>rel</xa>=<xs>'alternate'</xs> <xa>type</xa>=<xs>'text/html'</xs>
<xa>hreflang</xa>=<xs>'en'</xs>/<xt>&gt;</xt>
 		<xt>&lt;link</xt> <xa>href</xa>=<xs>'http://www.sample.com/feed.atom'</xs>
<xa>rel</xa>=<xs>'self'</xs> <xa>type</xa>=<xs>'application/atom+xml'</xs>/<xt>&gt;</xt>
 		<xt>&lt;rights&gt;</xt>
-			Copyright (c) 2013, IBM
+			Copyright (c) 2016, Apache Foundation
 		<xt>&lt;/rights&gt;</xt>
 		<xt>&lt;title</xt> <xa>type</xa>=<xs>'text'</xs>&gt;</xt>
 			Juneau ATOM specification
@@ -212,7 +212,7 @@
 		<xt>&lt;atom:link</xt> <xa>href</xa>=<xs>'http://www.sample.com/'</xs>
<xa>rel</xa>=<xs>'alternate'</xs> <xa>type</xa>=<xs>'text/html'</xs>
<xa>hreflang</xa>=<xs>'en'</xs><xt>/&gt;</xt>
 		<xt>&lt;atom:link</xt> <xa>href</xa>=<xs>'http://www.sample.com/feed.atom'</xs>
<xa>rel</xa>=<xs>'self'</xs> <xa>type</xa>=<xs>'application/atom+xml'</xs><xt>/&gt;</xt>
 		<xt>&lt;atom:rights&gt;</xt>
-			Copyright (c) 2013, IBM
+			Copyright (c) 2016, Apache Foundation
 		<xt>&lt;/atom:rights&gt;</xt>
 		<xt>&lt;atom:title</xt> <xa>type</xa>=<xs>'text'</xs><xt>&gt;</xt>
 			Juneau ATOM specification
@@ -275,7 +275,7 @@
 		<xt>&lt;link</xt> <xa>href</xa>=<xs>'http://www.sample.com/'</xs>
<xa>rel</xa>=<xs>'alternate'</xs> <xa>type</xa>=<xs>'text/html'</xs>
<xa>hreflang</xa>=<xs>'en'</xs><xt>/&gt;</xt>
 		<xt>&lt;link</xt> <xa>href</xa>=<xs>'http://www.sample.com/feed.atom'</xs>
<xa>rel</xa>=<xs>'self'</xs> <xa>type</xa>=<xs>'application/atom+xml'</xs><xt>/&gt;</xt>
 		<xt>&lt;rights&gt;</xt>
-			Copyright (c) 2013, IBM
+			Copyright (c) 2016, Apache Foundation
 		<xt>&lt;/rights&gt;</xt>
 		<xt>&lt;title</xt> <xa>type</xa>=<xs>'text'</xs><xt>&gt;</xt>
 			Juneau ATOM specification
@@ -351,7 +351,7 @@
 			}
 		], 
 		rights: {
-			text: <js>'Copyright (c) 2013, IBM'</js>
+			text: <js>'Copyright (c) 2016, Apache Foundation'</js>
 		}, 
 		title: {
 			type: <js>'text'</js>, 
@@ -463,7 +463,7 @@
 	         <xt>&lt;/rdf:Seq&gt;</xt>
 	      <xt>&lt;/atom:links&gt;</xt>
 	      <xt>&lt;atom:rights</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>&gt;</xt>
-	         <xt>&lt;atom:text&gt;</xt>Copyright (c) 2013, IBM<xt>&lt;/atom:text&gt;</xt>
+	         <xt>&lt;atom:text&gt;</xt>Copyright (c) 2016, Apache Foundation<xt>&lt;/atom:text&gt;</xt>
 	      <xt>&lt;/atom:rights&gt;</xt>
 	      <xt>&lt;atom:title</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>&gt;</xt>
 	         <xt>&lt;atom:type&gt;</xt>text<xt>&lt;/atom:type&gt;</xt>

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/eb4c5370/juneau-core/src/main/javadoc/overview.html
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/javadoc/overview.html b/juneau-core/src/main/javadoc/overview.html
index 2ee2c64..5172091 100644
--- a/juneau-core/src/main/javadoc/overview.html
+++ b/juneau-core/src/main/javadoc/overview.html
@@ -1099,6 +1099,15 @@
 			<tr class='dark bb' style='background-color:lightyellow'>
 				<td style='text-align:center'>5</td>
 				<td>
+					<b>Objects with standardized static methods and/or constructors for converting
to another POJO that's serializable.</b><br>
+				</td>
+				<td>&nbsp;</td>
+				<td>&nbsp;</td>
+				<td>&nbsp;</td>
+			</tr>		
+			<tr class='light bb' style='background-color:lightyellow'>
+				<td style='text-align:center'>5a</td>
+				<td>
 					<b>Objects with standardized <code>static T valueOf(String)</code>/<code>static
T fromString(String)</code> methods, or constructors with a <code>String</code>
argument.</b><br>
 					During serialization, objects are converted to strings using the <code>toString()</code>
method.
 					During parsing, strings are converted to objects using one of these static methods or
constructors.				
@@ -1106,6 +1115,18 @@
 				<td><code>java.util.UUID</code></td>
 				<td style='background-color:lightgreen;text-align:center'><b>yes</b></td>
 				<td style='background-color:lightgreen;text-align:center'><b>yes</b></td>
+			</tr>		
+			<tr class='light bb' style='background-color:lightyellow'>
+				<td style='text-align:center'>5b</td>
+				<td>
+					<b>Objects with standardized <code>static T valueOf(ObjectMap)</code>/<code>static
T fromObjectMap(ObjectMap)</code> methods, or constructors with an <code>ObjectMap</code>
argument, 
+					and having a <code>toObjectMap()</code> method.</b><br>
+					During serialization, objects are converted to {@link org.apache.juneau.core.ObjectMap
ObjectMaps} using the <code>toObjectMap()</code> method.
+					During parsing, maps are converted to objects using one of these static methods or constructors.
			
+				</td>
+				<td>&nbsp;</td>
+				<td style='background-color:lightgreen;text-align:center'><b>yes</b></td>
+				<td style='background-color:lightgreen;text-align:center'><b>yes</b></td>
 			</tr>			
 			<tr class='dark' style='background-color:lightyellow'>
 				<td style='text-align:center'>6</td>

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/eb4c5370/juneau-core/src/test/java/org/apache/juneau/dto/atom/AtomTest.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/test/java/org/apache/juneau/dto/atom/AtomTest.java b/juneau-core/src/test/java/org/apache/juneau/dto/atom/AtomTest.java
index 236bbb5..8852a56 100755
--- a/juneau-core/src/test/java/org/apache/juneau/dto/atom/AtomTest.java
+++ b/juneau-core/src/test/java/org/apache/juneau/dto/atom/AtomTest.java
@@ -42,7 +42,7 @@ public class AtomTest {
 				new Link("alternate", "text/html", "http://example.org/").setHreflang("en"),
 				new Link("self", "application/atom+xml", "http://example.org/feed.atom")
 			)
-			.setRights(new Text("Copyright (c) 2003, Mark Pilgrim"))
+			.setRights(new Text("Copyright (c) 2016, Apache Foundation"))
 			.setGenerator(new Generator("Example Toolkit").setUri(new URI("http://www.example.com/")).setVersion("1.0"))
 			.addEntries(
 				new Entry()

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/eb4c5370/juneau-core/src/test/resources/dto/atom/test1.xml
----------------------------------------------------------------------
diff --git a/juneau-core/src/test/resources/dto/atom/test1.xml b/juneau-core/src/test/resources/dto/atom/test1.xml
index 8f12770..ce56a64 100755
--- a/juneau-core/src/test/resources/dto/atom/test1.xml
+++ b/juneau-core/src/test/resources/dto/atom/test1.xml
@@ -49,7 +49,7 @@
 	<link href='http://example.org/' hreflang='en' rel='alternate' type='text/html'/>
 	<link href='http://example.org/feed.atom' rel='self' type='application/atom+xml'/>
 	<rights>
-		Copyright (c) 2003, Mark Pilgrim
+		Copyright (c) 2003, Foobar Inc
 	</rights>
 	<subtitle type='html'>
 		A &lt;em&gt;lot&lt;/em&gt; of effort went into making this effortless

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/eb4c5370/juneau-core/src/test/resources/dto/atom/test2.xml
----------------------------------------------------------------------
diff --git a/juneau-core/src/test/resources/dto/atom/test2.xml b/juneau-core/src/test/resources/dto/atom/test2.xml
index d93df46..bee4cb7 100755
--- a/juneau-core/src/test/resources/dto/atom/test2.xml
+++ b/juneau-core/src/test/resources/dto/atom/test2.xml
@@ -49,7 +49,7 @@
 	<atom:link href='http://example.org/' hreflang='en' rel='alternate' type='text/html'/>
 	<atom:link href='http://example.org/feed.atom' rel='self' type='application/atom+xml'/>
 	<atom:rights>
-		Copyright (c) 2003, Mark Pilgrim
+		Copyright (c) 2003, Foobar Inc
 	</atom:rights>
 	<atom:subtitle type='html'>
 		A &lt;em&gt;lot&lt;/em&gt; of effort went into making this effortless

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/eb4c5370/juneau-core/src/test/resources/dto/atom/test3.xml
----------------------------------------------------------------------
diff --git a/juneau-core/src/test/resources/dto/atom/test3.xml b/juneau-core/src/test/resources/dto/atom/test3.xml
index eb1d103..01239aa 100755
--- a/juneau-core/src/test/resources/dto/atom/test3.xml
+++ b/juneau-core/src/test/resources/dto/atom/test3.xml
@@ -49,7 +49,7 @@
 	<link href='http://example.org/' hreflang='en' rel='alternate' type='text/html'/>
 	<link href='http://example.org/feed.atom' rel='self' type='application/atom+xml'/>
 	<rights>
-		Copyright (c) 2003, Mark Pilgrim
+		Copyright (c) 2003, Foobar Inc
 	</rights>
 	<subtitle type='html'>
 		A &lt;em&gt;lot&lt;/em&gt; of effort went into making this effortless

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/eb4c5370/juneau-samples/src/main/java/org/apache/juneau/server/samples/PhotosResource.java
----------------------------------------------------------------------
diff --git a/juneau-samples/src/main/java/org/apache/juneau/server/samples/PhotosResource.java
b/juneau-samples/src/main/java/org/apache/juneau/server/samples/PhotosResource.java
index 77fdc85..8e7f3b8 100755
--- a/juneau-samples/src/main/java/org/apache/juneau/server/samples/PhotosResource.java
+++ b/juneau-samples/src/main/java/org/apache/juneau/server/samples/PhotosResource.java
@@ -55,7 +55,7 @@ public class PhotosResource extends Resource {
 	public void init() {
 		try {
 			// Preload an image.
-			InputStream is = getClass().getResourceAsStream("averycutedog.jpg");
+			InputStream is = getClass().getResourceAsStream("averycutecat.jpg");
 			BufferedImage image = ImageIO.read(is);
 			Photo photo = new Photo(0, image);
 			photos.put(photo.id, photo);

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/eb4c5370/juneau-samples/src/main/resources/org/apache/juneau/server/samples/averycutecat.jpg
----------------------------------------------------------------------
diff --git a/juneau-samples/src/main/resources/org/apache/juneau/server/samples/averycutecat.jpg
b/juneau-samples/src/main/resources/org/apache/juneau/server/samples/averycutecat.jpg
new file mode 100644
index 0000000..9760674
Binary files /dev/null and b/juneau-samples/src/main/resources/org/apache/juneau/server/samples/averycutecat.jpg
differ

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/eb4c5370/juneau-samples/src/main/resources/org/apache/juneau/server/samples/averycutedog.jpg
----------------------------------------------------------------------
diff --git a/juneau-samples/src/main/resources/org/apache/juneau/server/samples/averycutedog.jpg
b/juneau-samples/src/main/resources/org/apache/juneau/server/samples/averycutedog.jpg
deleted file mode 100755
index 335855e..0000000
Binary files a/juneau-samples/src/main/resources/org/apache/juneau/server/samples/averycutedog.jpg
and /dev/null differ


Mime
View raw message