You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/02/25 17:03:50 UTC
incubator-juneau git commit: Update default favicon.
Repository: incubator-juneau
Updated Branches:
refs/heads/master 300240033 -> 1c9fe6283
Update default favicon.
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/1c9fe628
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/1c9fe628
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/1c9fe628
Branch: refs/heads/master
Commit: 1c9fe6283bcd060cbb70f9cbcecc8003e779f9c7
Parents: 3002400
Author: JamesBognar <ja...@apache.org>
Authored: Sat Feb 25 12:03:47 2017 -0500
Committer: JamesBognar <ja...@apache.org>
Committed: Sat Feb 25 12:03:47 2017 -0500
----------------------------------------------------------------------
.../java/org/apache/juneau/rest/RestServlet.java | 2 --
.../org/apache/juneau/rest/RestServletDefault.java | 2 +-
.../main/java/org/apache/juneau/rest/juneau.ico | Bin 39438 -> 0 bytes
3 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/1c9fe628/juneau-rest/src/main/java/org/apache/juneau/rest/RestServlet.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestServlet.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestServlet.java
index b7ce3a7..f351088 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestServlet.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestServlet.java
@@ -2764,8 +2764,6 @@ public abstract class RestServlet extends HttpServlet {
int maxRc = 0;
for (MethodMeta m : childMethods) {
int rc = m.invoke(methodName, pathInfo, resource, req, res);
- //if (rc == SC_UNAUTHORIZED)
- // return SC_UNAUTHORIZED;
if (rc == SC_OK)
return SC_OK;
maxRc = Math.max(maxRc, rc);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/1c9fe628/juneau-rest/src/main/java/org/apache/juneau/rest/RestServletDefault.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestServletDefault.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestServletDefault.java
index 12e83b7..2ad34af 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestServletDefault.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestServletDefault.java
@@ -188,7 +188,7 @@ import org.apache.juneau.xml.*;
@Property(name=HTMLDOC_description, value="$R{servletDescription}")
},
stylesheet="styles/juneau.css",
- favicon="juneau.ico",
+ favicon="juneau.png",
staticFiles="{htdocs:'htdocs'}"
)
public abstract class RestServletDefault extends RestServlet {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/1c9fe628/juneau-rest/src/main/java/org/apache/juneau/rest/juneau.ico
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/juneau.ico b/juneau-rest/src/main/java/org/apache/juneau/rest/juneau.ico
deleted file mode 100644
index 737f40a..0000000
Binary files a/juneau-rest/src/main/java/org/apache/juneau/rest/juneau.ico and /dev/null differ