You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wave-commits@incubator.apache.org by wi...@apache.org on 2017/04/18 10:38:32 UTC
[1/3] incubator-wave git commit: Added author tag
Repository: incubator-wave
Updated Branches:
refs/heads/fix/dependendices-2016 448cd1d60 -> 5b6c98736
Added author tag
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/ed8fd86c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/ed8fd86c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/ed8fd86c
Branch: refs/heads/fix/dependendices-2016
Commit: ed8fd86c1d26c997feb6e23f3ac95c54b78ad6f2
Parents: 448cd1d
Author: wisebaldone <eh...@gmail.com>
Authored: Tue Apr 18 19:23:53 2017 +1000
Committer: wisebaldone <eh...@gmail.com>
Committed: Tue Apr 18 19:23:53 2017 +1000
----------------------------------------------------------------------
.../org/apache/wave/box/server/rpc/InitialsAvatarsServlet.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/ed8fd86c/wave/src/main/java/org/apache/wave/box/server/rpc/InitialsAvatarsServlet.java
----------------------------------------------------------------------
diff --git a/wave/src/main/java/org/apache/wave/box/server/rpc/InitialsAvatarsServlet.java b/wave/src/main/java/org/apache/wave/box/server/rpc/InitialsAvatarsServlet.java
index 98a482b..3e63ddf 100644
--- a/wave/src/main/java/org/apache/wave/box/server/rpc/InitialsAvatarsServlet.java
+++ b/wave/src/main/java/org/apache/wave/box/server/rpc/InitialsAvatarsServlet.java
@@ -34,6 +34,8 @@ import java.io.IOException;
/**
* A servlet for fetching the users Initials Avatar.
+ *
+ * @author wisebaldone@apache.org (Evan Hughes)
*/
@Singleton
public final class InitialsAvatarsServlet extends HttpServlet {
[3/3] incubator-wave git commit: Changed instructions for launching
the server and removed old Avatar Default.
Posted by wi...@apache.org.
Changed instructions for launching the server and removed old Avatar Default.
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/5b6c9873
Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/5b6c9873
Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/5b6c9873
Branch: refs/heads/fix/dependendices-2016
Commit: 5b6c9873676790b7fbee2c427dee7b612581a582
Parents: ad48131
Author: wisebaldone <eh...@gmail.com>
Authored: Tue Apr 18 20:28:18 2017 +1000
Committer: wisebaldone <eh...@gmail.com>
Committed: Tue Apr 18 20:28:18 2017 +1000
----------------------------------------------------------------------
README.md | 4 +++-
.../wave/box/server/rpc/InitialsAvatarDefault.jpg | Bin 666 -> 0 bytes
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/5b6c9873/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 4572e41..ac92fe4 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,9 @@ software:
The nightly binaries can be downloaded from https://builds.apache.org/view/S-Z/view/Wave/job/wave-artifacts/lastSuccessfulBuild/artifact/.
The latest "dev" releases can be downloaded from: https://dist.apache.org/repos/dist/dev/incubator/wave/.
The latest officially released binaries can be downloaded from: https://dist.apache.org/repos/dist/release/incubator/wave/.
-Extract the archive and execute run-server.sh for Linux/Mac or run-server.bat for Windows.
+
+Extract the archive and execute ./bin/wave for Linux/Mac or bin\wave.bat for Windows.
+
The web client will be accessible by default at http://localhost:9898/.
## Setup with Vagrant
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/5b6c9873/wave/src/main/resources/org/apache/wave/box/server/rpc/InitialsAvatarDefault.jpg
----------------------------------------------------------------------
diff --git a/wave/src/main/resources/org/apache/wave/box/server/rpc/InitialsAvatarDefault.jpg b/wave/src/main/resources/org/apache/wave/box/server/rpc/InitialsAvatarDefault.jpg
deleted file mode 100644
index d0266df..0000000
Binary files a/wave/src/main/resources/org/apache/wave/box/server/rpc/InitialsAvatarDefault.jpg and /dev/null differ
[2/3] incubator-wave git commit: Tries to get the default from the
static folder first,
if it cannot be found it grabs a backup version from within the jar.
Posted by wi...@apache.org.
Tries to get the default from the static folder first, if it cannot be found it grabs a backup version from within the jar.
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/ad481313
Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/ad481313
Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/ad481313
Branch: refs/heads/fix/dependendices-2016
Commit: ad4813130854be176751c3b42adc0d51ff37228d
Parents: ed8fd86
Author: wisebaldone <eh...@gmail.com>
Authored: Tue Apr 18 20:09:38 2017 +1000
Committer: wisebaldone <eh...@gmail.com>
Committed: Tue Apr 18 20:09:38 2017 +1000
----------------------------------------------------------------------
.../wave/box/server/rpc/InitialsAvatarsServlet.java | 8 +++++++-
.../apache/wave/box/server/rpc/avatar/unknown.jpg | Bin 0 -> 1669 bytes
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/ad481313/wave/src/main/java/org/apache/wave/box/server/rpc/InitialsAvatarsServlet.java
----------------------------------------------------------------------
diff --git a/wave/src/main/java/org/apache/wave/box/server/rpc/InitialsAvatarsServlet.java b/wave/src/main/java/org/apache/wave/box/server/rpc/InitialsAvatarsServlet.java
index 3e63ddf..2df3f83 100644
--- a/wave/src/main/java/org/apache/wave/box/server/rpc/InitialsAvatarsServlet.java
+++ b/wave/src/main/java/org/apache/wave/box/server/rpc/InitialsAvatarsServlet.java
@@ -44,7 +44,13 @@ public final class InitialsAvatarsServlet extends HttpServlet {
@Inject
public InitialsAvatarsServlet() throws IOException {
- DEFAULT = ImageIO.read(Resources.getResource("org/apache/wave/box/server/rpc/InitialsAvatarDefault.jpg"));
+ try {
+ DEFAULT = ImageIO.read(Resources.getResource("static/images/avatar/unknown.jpg"));
+ } catch (Exception e) {
+ LOG.warning("Default Avatar image could not be loaded from disc. " + e.toString());
+ DEFAULT = ImageIO.read(Resources.getResource(
+ "org/apache/wave/box/server/rpc/avatar/unknown.jpg"));
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/ad481313/wave/src/main/resources/org/apache/wave/box/server/rpc/avatar/unknown.jpg
----------------------------------------------------------------------
diff --git a/wave/src/main/resources/org/apache/wave/box/server/rpc/avatar/unknown.jpg b/wave/src/main/resources/org/apache/wave/box/server/rpc/avatar/unknown.jpg
new file mode 100644
index 0000000..0f39513
Binary files /dev/null and b/wave/src/main/resources/org/apache/wave/box/server/rpc/avatar/unknown.jpg differ