You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2017/01/28 22:22:37 UTC
[03/16] roller git commit: ROL-2091 Adding CDN contents to
distribution for users inside firewall
ROL-2091 Adding CDN contents to distribution for users inside firewall
git-svn-id: https://svn.apache.org/repos/asf/roller/trunk@1720880 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/50a709aa
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/50a709aa
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/50a709aa
Branch: refs/heads/bootstrap-ui
Commit: 50a709aa9c0859fcdd0d528d8ab4b811e708bd04
Parents: 38e9c3f
Author: Kohei Nozaki <ko...@apache.org>
Authored: Sat Dec 19 02:28:39 2015 +0000
Committer: Kohei Nozaki <ko...@apache.org>
Committed: Sat Dec 19 02:28:39 2015 +0000
----------------------------------------------------------------------
app/pom.xml | 14 ++++++++++++++
.../main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp | 2 +-
app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp | 2 +-
app/src/main/webapp/WEB-INF/web.xml | 11 +++++++++++
4 files changed, 27 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/50a709aa/app/pom.xml
----------------------------------------------------------------------
diff --git a/app/pom.xml b/app/pom.xml
index 75c1e92..7eb920e 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -317,6 +317,20 @@
<version>1.10</version>
</dependency>
+ <!-- WebJars deps -->
+
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>webjars-servlet-2.x</artifactId>
+ <version>1.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.webjars.npm</groupId>
+ <artifactId>angular</artifactId>
+ <version>1.2.29</version>
+ </dependency>
+
<!-- test deps -->
<dependency>
http://git-wip-us.apache.org/repos/asf/roller/blob/50a709aa/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp b/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
index 578c302..144e00a 100644
--- a/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
@@ -17,7 +17,7 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
<script src="<s:url value="/roller-ui/scripts/jquery-2.1.1.min.js" />"></script>
-<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.23/angular.min.js"></script>
+<script src="<s:url value='/webjars/angular/1.2.29/angular.min.js' />"></script>
<script>
function handlePreview(handle) {
http://git-wip-us.apache.org/repos/asf/roller/blob/50a709aa/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
index a81a4b2..bce635c 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
@@ -17,7 +17,7 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
<script src="<s:url value='/roller-ui/scripts/jquery-2.1.1.min.js' />"></script>
-<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.23/angular.min.js"></script>
+<script src="<s:url value='/webjars/angular/1.2.29/angular.min.js' />"></script>
<script>
function fullPreview(selector) {
http://git-wip-us.apache.org/repos/asf/roller/blob/50a709aa/app/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/web.xml b/app/src/main/webapp/WEB-INF/web.xml
index 8bb2795..7728cda 100644
--- a/app/src/main/webapp/WEB-INF/web.xml
+++ b/app/src/main/webapp/WEB-INF/web.xml
@@ -297,6 +297,12 @@
</init-param>
</servlet>
+ <servlet>
+ <servlet-name>WebjarsServlet</servlet-name>
+ <servlet-class>org.webjars.servlet.WebjarsServlet</servlet-class>
+ <load-on-startup>2</load-on-startup>
+ </servlet>
+
<!-- BEGIN OAUTH -->
<servlet>
@@ -431,6 +437,11 @@
<url-pattern>/roller-services/opensearch/*</url-pattern>
</servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>WebjarsServlet</servlet-name>
+ <url-pattern>/webjars/*</url-pattern>
+ </servlet-mapping>
+
<session-config>
<session-timeout>30</session-timeout>
</session-config>