You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ko...@apache.org on 2015/12/19 03:28:39 UTC
svn commit: r1720880 - in /roller/trunk/app: pom.xml
src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
src/main/webapp/WEB-INF/web.xml
Author: kohei
Date: Sat Dec 19 02:28:39 2015
New Revision: 1720880
URL: http://svn.apache.org/viewvc?rev=1720880&view=rev
Log:
ROL-2091 Adding CDN contents to distribution for users inside firewall
Modified:
roller/trunk/app/pom.xml
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/web.xml
Modified: roller/trunk/app/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1720880&r1=1720879&r2=1720880&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Sat Dec 19 02:28:39 2015
@@ -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>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp?rev=1720880&r1=1720879&r2=1720880&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp Sat Dec 19 02:28:39 2015
@@ -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) {
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp?rev=1720880&r1=1720879&r2=1720880&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp Sat Dec 19 02:28:39 2015
@@ -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) {
Modified: roller/trunk/app/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/web.xml?rev=1720880&r1=1720879&r2=1720880&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/web.xml (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/web.xml Sat Dec 19 02:28:39 2015
@@ -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>