Skip to content

S
solo
Commit f5f183b8 authored by Liang Ding's avatar Liang Ding
Browse files
Options

Merge remote-tracking branch 'refs/remotes/origin/1.8.0-dev'

parents 63e75321 6275ab79
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 88 deletions
nb-configuration.xml deleted 100644 → 0
View file @ 63e75321
<?xml version="1.0" encoding="UTF-8"?>
<project-shared-configuration>
<!--
This file contains additional configuration written by modules in the NetBeans IDE.
The configuration is intended to be shared among all the users of project and
therefore it is assumed to be part of version control checkout.
Without this configuration present, some functionality in the IDE may be limited or fail altogether.
-->
<spellchecker-wordlist xmlns="http://www.netbeans.org/ns/spellchecker-wordlist/1">
<word>admin</word>
<word>Favicon</word>
<word>servlet</word>
</spellchecker-wordlist>
</project-shared-configuration>
src/main/webapp/WEB-INF/static-resources.xml
View file @ f5f183b8
......@@ -19,83 +19,88 @@
<!--
Description: Static resources definition.
Version: 2.7.5.6, Aug 26, 2016
Version: 2.7.6.6, Dec 10, 2016
Author: Liang Ding
-->
<static-files>
<!-- Uses the STANDARD Ant Path Pattern to configure these paths! -->
<include path="/favicon.ico" />
<include path="/favicon.png" />
<include path="/robots.txt" />
<include path="/js/**.js" />
<include path="/js/**/*.js" />
<include path="/js/**.css" />
<include path="/js/**/*.css" />
<include path="/js/**.htm" />
<include path="/js/**/*.htm" />
<include path="/js/**.html" />
<include path="/js/**/*.html" />
<include path="/js/**.gif" />
<include path="/js/**/*.gif" />
<include path="/js/**.png" />
<include path="/js/**/*.png" />
<include path="/js/**.jpg" />
<include path="/js/**/*.jpg" />
<include path="/skins/**.css" />
<include path="/skins/**.css.map" />
<include path="/skins/**/*.css" />
<include path="/skins/**/*.css.map" />
<include path="/skins/**.js" />
<include path="/skins/**/*.js" />
<include path="/skins/**.png" />
<include path="/skins/**/*.png" />
<include path="/skins/**.jpg" />
<include path="/skins/**/*.jpg" />
<include path="/skins/**.swf" />
<include path="/skins/**/*.swf" />
<include path="/skins/**.gif" />
<include path="/skins/**/*.gif" />
<include path="/skins/**/*.eot" />
<include path="/skins/**/*.svg" />
<include path="/skins/**/*.ttf" />
<include path="/skins/**/*.woff" />
<include path="/css/**.css" />
<include path="/css/**/*.css" />
<include path="/css/fonts/*.eot" />
<include path="/css/fonts/*.svg" />
<include path="/css/fonts/*.ttf" />
<include path="/css/fonts/*.woff" />
<include path="/images/**.png" />
<include path="/images/**/*.png" />
<include path="/images/**.jpg" />
<include path="/images/**/*.jpg" />
<include path="/images/**.gif" />
<include path="/images/**/*.gif" />
<include path="/plugins/**.css" />
<include path="/plugins/**/*.css" />
<include path="/plugins/**.js" />
<include path="/plugins/**/*.js" />
<include path="/plugins/**.png" />
<include path="/plugins/**/*.png" />
<include path="/plugins/**.jpg" />
<include path="/plugins/**/*.jpg" />
<include path="/plugins/**.swf" />
<include path="/plugins/**/*.swf" />
<include path="/plugins/**.gif" />
<include path="/plugins/**/*.gif" />
<include path="/plugins/**.html" />
<include path="/plugins/**/*.html" />
<include path="/plugins/**.htm" />
<include path="/plugins/**/*.htm" />
<include path="/CHANGE_LOGS.html" />
<include path="/README.txt" />
<include path="/LICENSE.txt" />
<include path="/favicon.ico"/>
<include path="/favicon.png"/>
<include path="/robots.txt"/>
<include path="/js/**.js"/>
<include path="/js/**/*.js"/>
<include path="/js/**.css"/>
<include path="/js/**/*.css"/>
<include path="/js/**.htm"/>
<include path="/js/**/*.htm"/>
<include path="/js/**.html"/>
<include path="/js/**/*.html"/>
<include path="/js/**.gif"/>
<include path="/js/**/*.gif"/>
<include path="/js/**.png"/>
<include path="/js/**/*.png"/>
<include path="/js/**.jpg"/>
<include path="/js/**/*.jpg"/>
<include path="/js/**/*.swf"/>
<include path="/js/**/*.eot"/>
<include path="/js/**/*.svg"/>
<include path="/js/**/*.ttf"/>
<include path="/js/**/*.woff"/>
<include path="/skins/**.css"/>
<include path="/skins/**.css.map"/>
<include path="/skins/**/*.css"/>
<include path="/skins/**/*.css.map"/>
<include path="/skins/**.js"/>
<include path="/skins/**/*.js"/>
<include path="/skins/**.png"/>
<include path="/skins/**/*.png"/>
<include path="/skins/**.jpg"/>
<include path="/skins/**/*.jpg"/>
<include path="/skins/**.swf"/>
<include path="/skins/**/*.swf"/>
<include path="/skins/**.gif"/>
<include path="/skins/**/*.gif"/>
<include path="/skins/**/*.eot"/>
<include path="/skins/**/*.svg"/>
<include path="/skins/**/*.ttf"/>
<include path="/skins/**/*.woff"/>
<include path="/css/**.css"/>
<include path="/css/**/*.css"/>
<include path="/css/fonts/*.eot"/>
<include path="/css/fonts/*.svg"/>
<include path="/css/fonts/*.ttf"/>
<include path="/css/fonts/*.woff"/>
<include path="/images/**.png"/>
<include path="/images/**/*.png"/>
<include path="/images/**.jpg"/>
<include path="/images/**/*.jpg"/>
<include path="/images/**.gif"/>
<include path="/images/**/*.gif"/>
<include path="/plugins/**.css"/>
<include path="/plugins/**/*.css"/>
<include path="/plugins/**.js"/>
<include path="/plugins/**/*.js"/>
<include path="/plugins/**.png"/>
<include path="/plugins/**/*.png"/>
<include path="/plugins/**.jpg"/>
<include path="/plugins/**/*.jpg"/>
<include path="/plugins/**.swf"/>
<include path="/plugins/**/*.swf"/>
<include path="/plugins/**.gif"/>
<include path="/plugins/**/*.gif"/>
<include path="/plugins/**.html"/>
<include path="/plugins/**/*.html"/>
<include path="/plugins/**.htm"/>
<include path="/plugins/**/*.htm"/>
<include path="/CHANGE_LOGS.html"/>
<include path="/README.txt"/>
<include path="/LICENSE.txt"/>
</static-files>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment