This commit affects both the v3 annotated demo portlet and the chatroom
demo portlet. In both cases, the "monkey pictures" whose licensing was
unclear were replaced by images from the unsplash.com website. The new
images are clearly licensed appropriately for our use. A text file
containing the unsplash license and the original filenames of the images
is also included in the corresponding image resource directories. A
corresponding code change was made in the demo code to address the new
images rather than the old.
diff --git a/demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/HelloWorldImage.java b/demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/HelloWorldImage.java
index 372fdbc..a16819e 100644
--- a/demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/HelloWorldImage.java
+++ b/demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/HelloWorldImage.java
@@ -41,15 +41,17 @@
// Some chimp pictures to associate with a name
private final static String[] chimps = new String[] {
- "/resources/images/BabyChimp.gif",
- "/resources/images/bonoboMomKid.gif",
- "/resources/images/Chimpanzee_thinking-small.gif",
- "/resources/images/monkey4.gif",
- "/resources/images/monkey5.gif",
- "/resources/images/monkeySmile.gif",
- "/resources/images/monkeySmile2.gif",
- "/resources/images/gorilla2.gif",
- "/resources/images/gorilla1.gif" };
+ "/resources/images/umonkey1.gif",
+ "/resources/images/umonkey2.gif",
+ "/resources/images/umonkey3.gif",
+ "/resources/images/umonkey4.gif",
+ "/resources/images/umonkey5.gif",
+ "/resources/images/umonkey6.gif",
+ "/resources/images/umonkey7.gif",
+ "/resources/images/umonkey8.gif",
+ "/resources/images/umonkey9.gif",
+ "/resources/images/umonkeyA.gif",
+ };
/**
* Render method using automatic include. If a render method has multiple render methods,
diff --git a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/BabyChimp.gif b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/BabyChimp.gif
deleted file mode 100644
index 16513c0..0000000
--- a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/BabyChimp.gif
+++ /dev/null
Binary files differ
diff --git a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/ChimpEatingDollar.gif b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/ChimpEatingDollar.gif
deleted file mode 100644
index 000879f..0000000
--- a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/ChimpEatingDollar.gif
+++ /dev/null
Binary files differ
diff --git a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/Chimpanzee_thinking-small.gif b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/Chimpanzee_thinking-small.gif
deleted file mode 100644
index 5a11b72..0000000
--- a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/Chimpanzee_thinking-small.gif
+++ /dev/null
Binary files differ
diff --git a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/bonoboMomKid.gif b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/bonoboMomKid.gif
deleted file mode 100644
index f89dcb1..0000000
--- a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/bonoboMomKid.gif
+++ /dev/null
Binary files differ
diff --git a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/gorilla1.gif b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/gorilla1.gif
deleted file mode 100644
index 8acb738..0000000
--- a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/gorilla1.gif
+++ /dev/null
Binary files differ
diff --git a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/gorilla2.gif b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/gorilla2.gif
deleted file mode 100644
index 9968e8b..0000000
--- a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/gorilla2.gif
+++ /dev/null
Binary files differ
diff --git a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/monkey4.gif b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/monkey4.gif
deleted file mode 100644
index 40dd673..0000000
--- a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/monkey4.gif
+++ /dev/null
Binary files differ
diff --git a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/monkey5.gif b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/monkey5.gif
deleted file mode 100644
index 2002ba6..0000000
--- a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/monkey5.gif
+++ /dev/null
Binary files differ
diff --git a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/monkeySmile.gif b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/monkeySmile.gif
deleted file mode 100644
index 97302af..0000000
--- a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/monkeySmile.gif
+++ /dev/null
Binary files differ
diff --git a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/monkeySmile2.gif b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/monkeySmile2.gif
deleted file mode 100644
index 13510e4..0000000
--- a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/monkeySmile2.gif
+++ /dev/null
Binary files differ
diff --git a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey1.gif b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey1.gif
new file mode 100644
index 0000000..497093f
--- /dev/null
+++ b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey1.gif
Binary files differ
diff --git a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey2.gif b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey2.gif
new file mode 100644
index 0000000..5989f94
--- /dev/null
+++ b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey2.gif
Binary files differ
diff --git a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey3.gif b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey3.gif
new file mode 100644
index 0000000..319aa7c
--- /dev/null
+++ b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey3.gif
Binary files differ
diff --git a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey4.gif b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey4.gif
new file mode 100644
index 0000000..fdc9c45
--- /dev/null
+++ b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey4.gif
Binary files differ
diff --git a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey5.gif b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey5.gif
new file mode 100644
index 0000000..83bcabb
--- /dev/null
+++ b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey5.gif
Binary files differ
diff --git a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey6.gif b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey6.gif
new file mode 100644
index 0000000..89db912
--- /dev/null
+++ b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey6.gif
Binary files differ
diff --git a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey7.gif b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey7.gif
new file mode 100644
index 0000000..0b3df2a
--- /dev/null
+++ b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey7.gif
Binary files differ
diff --git a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey8.gif b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey8.gif
new file mode 100644
index 0000000..3a35025
--- /dev/null
+++ b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey8.gif
Binary files differ
diff --git a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey9.gif b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey9.gif
new file mode 100644
index 0000000..abeea2f
--- /dev/null
+++ b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkey9.gif
Binary files differ
diff --git a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkeyA.gif b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkeyA.gif
new file mode 100644
index 0000000..a1e7171
--- /dev/null
+++ b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/umonkeyA.gif
Binary files differ
diff --git a/demo/chat-room-demo-portlet/src/main/webapp/resources/images/unsplashLicense.txt b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/unsplashLicense.txt
new file mode 100644
index 0000000..21675db
--- /dev/null
+++ b/demo/chat-room-demo-portlet/src/main/webapp/resources/images/unsplashLicense.txt
@@ -0,0 +1,34 @@
+
+The images in this folder originated from the unsplash website. The original
+photos are licensed as follows:
+
+Unsplash license: https://unsplash.com/license
+=================
+
+All photos published on Unsplash can be used for free. You can use them for
+commercial and noncommercial purposes. You do not need to ask permission from or
+provide credit to the photographer or Unsplash, although it is appreciated when
+possible.
+
+More precisely, Unsplash grants you an irrevocable, nonexclusive, worldwide
+copyright license to download, copy, modify, distribute, perform, and use photos
+from Unsplash for free, including for commercial purposes, without permission
+from or attributing the photographer or Unsplash. This license does not include
+the right to compile photos from Unsplash to replicate a similar or competing
+service.
+
+Original image file names:
+
+dusan-smetana-1539686-unsplash.jpg
+howling-red-570942-unsplash.jpg
+kelly-sikkema-94610-unsplash.jpg
+patrick-beznoska-527680-unsplash.jpg
+quinten-de-graaf-1492080-unsplash.jpg
+ravi-kant-480828-unsplash.jpg
+rishi-ragunathan-1233429-unsplash.jpg
+rob-schreckhise-40905-unsplash.jpg
+sander-wehkamp-532443-unsplash.jpg
+sander-wehkamp-715120-unsplash.jpg
+
+The images were modified to fit the needs of the demo program.
+
diff --git a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/HelloWorldImage.java b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/HelloWorldImage.java
index ef6b52c..b31a6da 100644
--- a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/HelloWorldImage.java
+++ b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/HelloWorldImage.java
@@ -45,10 +45,16 @@
// Some chimp pictures to associate with a name
private final static String[] chimps = new String[] {
- "/resources/images/BabyChimp.gif",
- "/resources/images/bonoboMomKid.gif",
- "/resources/images/Chimpanzee_thinking-small.gif",
- "/resources/images/ChimpEatingDollar.gif"
+ "/resources/images/umonkey1.gif",
+ "/resources/images/umonkey2.gif",
+ "/resources/images/umonkey3.gif",
+ "/resources/images/umonkey4.gif",
+ "/resources/images/umonkey5.gif",
+ "/resources/images/umonkey6.gif",
+ "/resources/images/umonkey7.gif",
+ "/resources/images/umonkey8.gif",
+ "/resources/images/umonkey9.gif",
+ "/resources/images/umonkeyA.gif",
};
@RenderMethod(portletNames = {"BeanPortlet"}, ordinal=100)
diff --git a/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/BabyChimp.gif b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/BabyChimp.gif
deleted file mode 100644
index 16513c0..0000000
--- a/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/BabyChimp.gif
+++ /dev/null
Binary files differ
diff --git a/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/ChimpEatingDollar.gif b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/ChimpEatingDollar.gif
deleted file mode 100644
index 000879f..0000000
--- a/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/ChimpEatingDollar.gif
+++ /dev/null
Binary files differ
diff --git a/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/Chimpanzee_thinking-small.gif b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/Chimpanzee_thinking-small.gif
deleted file mode 100644
index 5a11b72..0000000
--- a/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/Chimpanzee_thinking-small.gif
+++ /dev/null
Binary files differ
diff --git a/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/bonoboMomKid.gif b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/bonoboMomKid.gif
deleted file mode 100644
index f89dcb1..0000000
--- a/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/bonoboMomKid.gif
+++ /dev/null
Binary files differ
diff --git a/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey1.gif b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey1.gif
new file mode 100644
index 0000000..497093f
--- /dev/null
+++ b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey1.gif
Binary files differ
diff --git a/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey2.gif b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey2.gif
new file mode 100644
index 0000000..5989f94
--- /dev/null
+++ b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey2.gif
Binary files differ
diff --git a/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey3.gif b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey3.gif
new file mode 100644
index 0000000..319aa7c
--- /dev/null
+++ b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey3.gif
Binary files differ
diff --git a/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey4.gif b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey4.gif
new file mode 100644
index 0000000..fdc9c45
--- /dev/null
+++ b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey4.gif
Binary files differ
diff --git a/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey5.gif b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey5.gif
new file mode 100644
index 0000000..83bcabb
--- /dev/null
+++ b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey5.gif
Binary files differ
diff --git a/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey6.gif b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey6.gif
new file mode 100644
index 0000000..89db912
--- /dev/null
+++ b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey6.gif
Binary files differ
diff --git a/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey7.gif b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey7.gif
new file mode 100644
index 0000000..0b3df2a
--- /dev/null
+++ b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey7.gif
Binary files differ
diff --git a/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey8.gif b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey8.gif
new file mode 100644
index 0000000..3a35025
--- /dev/null
+++ b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey8.gif
Binary files differ
diff --git a/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey9.gif b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey9.gif
new file mode 100644
index 0000000..abeea2f
--- /dev/null
+++ b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkey9.gif
Binary files differ
diff --git a/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkeyA.gif b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkeyA.gif
new file mode 100644
index 0000000..a1e7171
--- /dev/null
+++ b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/umonkeyA.gif
Binary files differ
diff --git a/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/unsplashLicense.txt b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/unsplashLicense.txt
new file mode 100644
index 0000000..21675db
--- /dev/null
+++ b/demo/v3-annotated-demo-portlet/src/main/webapp/resources/images/unsplashLicense.txt
@@ -0,0 +1,34 @@
+
+The images in this folder originated from the unsplash website. The original
+photos are licensed as follows:
+
+Unsplash license: https://unsplash.com/license
+=================
+
+All photos published on Unsplash can be used for free. You can use them for
+commercial and noncommercial purposes. You do not need to ask permission from or
+provide credit to the photographer or Unsplash, although it is appreciated when
+possible.
+
+More precisely, Unsplash grants you an irrevocable, nonexclusive, worldwide
+copyright license to download, copy, modify, distribute, perform, and use photos
+from Unsplash for free, including for commercial purposes, without permission
+from or attributing the photographer or Unsplash. This license does not include
+the right to compile photos from Unsplash to replicate a similar or competing
+service.
+
+Original image file names:
+
+dusan-smetana-1539686-unsplash.jpg
+howling-red-570942-unsplash.jpg
+kelly-sikkema-94610-unsplash.jpg
+patrick-beznoska-527680-unsplash.jpg
+quinten-de-graaf-1492080-unsplash.jpg
+ravi-kant-480828-unsplash.jpg
+rishi-ragunathan-1233429-unsplash.jpg
+rob-schreckhise-40905-unsplash.jpg
+sander-wehkamp-532443-unsplash.jpg
+sander-wehkamp-715120-unsplash.jpg
+
+The images were modified to fit the needs of the demo program.
+
