You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2017/02/15 12:38:55 UTC
svn commit: r1783100 - in /myfaces/tobago/trunk:
tobago-extension/tobago-sandbox/src/main/resources/META-INF/
tobago-extension/tobago-sandbox/src/main/resources/META-INF/resources/
tobago-extension/tobago-sandbox/src/main/resources/META-INF/resources/t...
Author: lofwyr
Date: Wed Feb 15 12:38:54 2017
New Revision: 1783100
URL: http://svn.apache.org/viewvc?rev=1783100&view=rev
Log:
TOBAGO-1700: Re-Add the version of Tobago to the resources URL to avoid caching when updating Tobago
Added:
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/resources/
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/resources/tobago/
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/resources/tobago/sandbox/
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/resources/tobago/sandbox/tobago-bootstrap/
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/resources/tobago/sandbox/tobago-bootstrap/3.1.0/
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/resources/tobago/sandbox/tobago-bootstrap/3.1.0/css/
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/resources/tobago/sandbox/tobago-bootstrap/3.1.0/css/tobago.css
- copied unchanged from r1783081, myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/org/apache/myfaces/tobago/sandbox/html/scarborough/standard/style/tobago.css
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/resources/tobago/sandbox/tobago-bootstrap/3.1.0/image/
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/resources/tobago/sandbox/tobago-bootstrap/3.1.0/image/sliderEnd.png
- copied unchanged from r1783091, myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/org/apache/myfaces/tobago/sandbox/html/scarborough/standard/image/sliderEnd.png
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/resources/tobago/sandbox/tobago-bootstrap/3.1.0/image/sliderTriangle.png
- copied unchanged from r1783081, myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/org/apache/myfaces/tobago/sandbox/html/scarborough/standard/image/sliderTriangle.png
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/resources/tobago/sandbox/tobago-bootstrap/3.1.0/js/
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/resources/tobago/sandbox/tobago-bootstrap/3.1.0/js/tobago.js
- copied unchanged from r1783081, myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/org/apache/myfaces/tobago/sandbox/html/scarborough/standard/script/tobago.js
myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/tobago-bootstrap/
- copied from r1783081, myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/bootstrap/
myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/tobago-bootstrap/3.1.0/
- copied from r1783081, myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/bootstrap/4.0.0-alpha.5/
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/
- copied from r1783081, myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/bootstrap/
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/3.1.0/
- copied from r1783081, myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/bootstrap/4.0.0-alpha.5/
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/tobago-bootstrap/
- copied from r1783081, myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/bootstrap/
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/tobago-bootstrap/3.1.0/
- copied from r1783081, myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/bootstrap/4.0.0-alpha.5/
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/
- copied from r1783081, myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/bootstrap/
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/3.1.0/
- copied from r1783081, myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/bootstrap/4.0.0-alpha.5/
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/
- copied from r1783081, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/bootstrap/
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/3.1.0/
- copied from r1783081, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/bootstrap/4.0.0-alpha.5/
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/3.1.0/js/tobago-calendar.js
- copied unchanged from r1783081, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/script/tobago-calendar.js
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/3.1.0/js/tobago-console.js
- copied unchanged from r1783081, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/script/tobago-console.js
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/3.1.0/js/tobago-in.js
- copied unchanged from r1783081, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/script/tobago-in.js
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/3.1.0/js/tobago-jsf.js
- copied unchanged from r1783081, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/script/tobago-jsf.js
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/3.1.0/js/tobago-layout.js
- copied unchanged from r1783081, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/script/tobago-layout.js
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/3.1.0/js/tobago-overlay.js
- copied unchanged from r1783081, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/script/tobago-overlay.js
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/3.1.0/js/tobago-popup.js
- copied unchanged from r1783081, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/script/tobago-popup.js
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/3.1.0/js/tobago-sheet.js
- copied unchanged from r1783081, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/script/tobago-sheet.js
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/3.1.0/js/tobago-suggest.js
- copied unchanged from r1783081, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/script/tobago-suggest.js
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/3.1.0/js/tobago-tab.js
- copied unchanged from r1783081, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/script/tobago-tab.js
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/3.1.0/js/tobago-tree.js
- copied unchanged from r1783081, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/script/tobago-tree.js
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/3.1.0/js/tobago-utils.js
- copied unchanged from r1783081, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/script/tobago-utils.js
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/3.1.0/js/tobago.js
- copied unchanged from r1783081, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/script/tobago.js
Removed:
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/org/
myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/bootstrap/
myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/tobago-bootstrap/4.0.0-alpha.5/
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/bootstrap/
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/4.0.0-alpha.5/
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/bootstrap/
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/tobago-bootstrap/4.0.0-alpha.5/
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/bootstrap/
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/4.0.0-alpha.5/
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/bootstrap/
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/script/
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/4.0.0-alpha.5/
Modified:
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-config.xml
myfaces/tobago/trunk/tobago-theme/pom.xml
myfaces/tobago/trunk/tobago-theme/rebuild-theme.sh
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClassUnitTest.java
Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-config.xml?rev=1783100&r1=1783099&r2=1783100&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-config.xml Wed Feb 15 12:38:54 2017
@@ -35,12 +35,12 @@
<fallback>speyside</fallback>
<versioned>false</versioned>
<resources production="true">
- <script name="script/tobago.js"/>
- <style name="style/tobago.css"/>
+ <script name="tobago-bootstrap/3.1.0/js/tobago.js"/>
+ <style name="tobago-bootstrap/3.1.0/css/tobago.css"/>
</resources>
<resources production="false">
- <script name="script/tobago.js"/>
- <style name="style/tobago.css"/>
+ <script name="tobago-bootstrap/3.1.0/js/tobago.js"/>
+ <style name="tobago-bootstrap/3.1.0/css/tobago.css"/>
</resources>
</theme-definition>
</theme-definitions>
Modified: myfaces/tobago/trunk/tobago-theme/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/pom.xml?rev=1783100&r1=1783099&r2=1783100&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/pom.xml Wed Feb 15 12:38:54 2017
@@ -28,6 +28,7 @@
<properties>
<bootstrap.version>4.0.0-alpha.5</bootstrap.version>
+ <tobago.version>3.1.0</tobago.version>
</properties>
<build>
@@ -49,10 +50,7 @@
<modules>
<module>tobago-theme-standard</module>
- <!--<module>tobago-theme-scarborough</module>-->
<module>tobago-theme-speyside</module>
- <!--<module>tobago-theme-richmond</module>-->
- <!--<module>tobago-theme-charlotteville</module>-->
</modules>
<dependencies>
@@ -132,8 +130,7 @@
<outputDirectory>${project.build.directory}/bootstrap</outputDirectory>
<resources>
<resource>
- <directory>src/main
- </directory>
+ <directory>src/main</directory>
<includes>
<include>scss/*</include>
</includes>
@@ -150,11 +147,19 @@
</goals>
<configuration>
<outputDirectory>
- ${basedir}/src/main/resources/META-INF/resources/tobago/${theme.name}/bootstrap/${bootstrap.version}
+ ${basedir}/src/main/resources/META-INF/resources/tobago/${theme.name}/tobago-bootstrap/${tobago.version}-${bootstrap.version}
</outputDirectory>
<resources>
<resource>
<directory>${project.build.directory}/bootstrap/dist</directory>
+ <includes>
+ <include>css/bootstrap.css</include>
+ <include>css/bootstrap.min.css</include>
+ <include>css/bootstrap.css.map</include>
+ <include>css/bootstrap.min.css.map</include>
+ <include>js/bootstrap.js</include>
+ <include>js/bootstrap.min.js</include>
+ </includes>
</resource>
</resources>
</configuration>
Modified: myfaces/tobago/trunk/tobago-theme/rebuild-theme.sh
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/rebuild-theme.sh?rev=1783100&r1=1783099&r2=1783100&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/rebuild-theme.sh (original)
+++ myfaces/tobago/trunk/tobago-theme/rebuild-theme.sh Wed Feb 15 12:38:54 2017
@@ -19,22 +19,25 @@
set -e
+TOBAGO_VERSION=3.1.0
+BOOTSTRAP_VERSION=4.0.0-alpha.5
+
mvn -P all-modules clean
mvn -P rebuild-theme -f tobago-theme-charlotteville/pom.xml
-rm tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/bootstrap/4.0.0-alpha.5/css/bootstrap-*
+rm tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/bootstrap/${BOOTSTRAP_VERSION}-${TOBAGO_VERSION}/css/bootstrap-*
mvn -P rebuild-theme -f tobago-theme-richmond/pom.xml
-rm tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/bootstrap/4.0.0-alpha.5/css/bootstrap-*
+rm tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/bootstrap/${BOOTSTRAP_VERSION}-${TOBAGO_VERSION}/css/bootstrap-*
mvn -P rebuild-theme -f tobago-theme-scarborough/pom.xml
-rm tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/bootstrap/4.0.0-alpha.5/css/bootstrap-*
+rm tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/bootstrap/${BOOTSTRAP_VERSION}-${TOBAGO_VERSION}/css/bootstrap-*
mvn -P rebuild-theme -f tobago-theme-speyside/pom.xml
-rm tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/bootstrap/4.0.0-alpha.5/css/bootstrap-*
+rm tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/bootstrap/${BOOTSTRAP_VERSION}-${TOBAGO_VERSION}/css/bootstrap-*
mvn -P rebuild-theme -f tobago-theme-standard/pom.xml
-rm tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/bootstrap/4.0.0-alpha.5/css/bootstrap-*
+rm tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/bootstrap/${BOOTSTRAP_VERSION}-${TOBAGO_VERSION}/css/bootstrap-*
mvn -P all-modules install
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml?rev=1783100&r1=1783099&r2=1783100&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml Wed Feb 15 12:38:54 2017
@@ -43,8 +43,8 @@
<phase>compile</phase>
<configuration>
<target>
- <concat destfile="${project.build.directory}/javascript-min/standard/script/tobago.min.js" force="no">
- <filelist dir="${basedir}/src/main/resources/META-INF/resources/tobago/standard/script" files="tobago-jsf.js,tobago.js,tobago-calendar.js,tobago-in.js,tobago-layout.js,tobago-overlay.js,tobago-popup.js,tobago-sheet.js,tobago-suggest.js,tobago-tab.js,tobago-tree.js,tobago-utils.js" />
+ <concat destfile="${project.build.directory}/javascript-min/tobago.min.js" force="no">
+ <filelist dir="${basedir}/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/3.1.0/js" files="tobago-jsf.js,tobago.js,tobago-calendar.js,tobago-in.js,tobago-layout.js,tobago-overlay.js,tobago-popup.js,tobago-sheet.js,tobago-suggest.js,tobago-tab.js,tobago-tree.js,tobago-utils.js" />
</concat>
<replaceregexp match="^.*//.*@DEV_ONLY.*$" replace="" byline="true">
<fileset dir="${project.build.directory}/javascript-min">
@@ -79,9 +79,9 @@
<argument>-jar</argument>
<argument>lib/compiler-20120430.jar</argument>
<argument>--js</argument>
- <argument>${project.build.directory}/javascript-min/standard/script/tobago.min.js</argument>
+ <argument>${project.build.directory}/javascript-min/tobago.min.js</argument>
<argument>--js_output_file</argument>
- <argument>target/classes/META-INF/resources/tobago/standard/script/tobago.min.js</argument>
+ <argument>target/classes/META-INF/resources/tobago/standard/tobago-bootstrap/3.1.0/js/tobago.min.js</argument>
</arguments>
</configuration>
</execution>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml?rev=1783100&r1=1783099&r2=1783100&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml Wed Feb 15 12:38:54 2017
@@ -359,13 +359,13 @@
<script name="/tobago/standard/jquery/jquery-2.2.4.min.js"/>
<script name="/tobago/standard/jquery-ui/1.12.1.custom/jquery-ui.min.js"/>
<script name="/tobago/standard/tether/1.1.1/js/tether.min.js"/>
- <script name="/tobago/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js"/>
+ <script name="/tobago/standard/tobago-bootstrap/3.1.0/js/bootstrap.min.js"/>
<script name="/tobago/standard/moment/2.13.0/moment-with-locales.min.js"/>
<script name="/tobago/standard/bootstrap-datetimepicker/4.17.37/js/bootstrap-datetimepicker.min.js"/>
- <script name="/tobago/standard/script/tobago.min.js"/>
+ <script name="/tobago/standard/tobago-bootstrap/3.1.0/js/tobago.min.js"/>
<script name="/tobago/standard/typeahead/0.11.1-patched-with-1212/typeahead.min.js"/>
<style name="/tobago/standard/tether/1.1.1/css/tether.min.css"/>
- <style name="/tobago/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"/>
+ <style name="/tobago/standard/tobago-bootstrap/3.1.0/css/bootstrap.min.css"/>
<style name="/tobago/standard/font-awesome/4.6.1/css/font-awesome.min.css"/>
<style name="/tobago/standard/bootstrap-datetimepicker/4.17.37/css/bootstrap-datetimepicker.min.css"/>
</resources>
@@ -373,25 +373,25 @@
<script name="/tobago/standard/jquery/jquery-2.2.4.js"/>
<script name="/tobago/standard/jquery-ui/1.12.1.custom/jquery-ui.js"/>
<script name="/tobago/standard/tether/1.1.1/js/tether.js"/>
- <script name="/tobago/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.js"/>
+ <script name="/tobago/standard/tobago-bootstrap/3.1.0/js/bootstrap.js"/>
<script name="/tobago/standard/moment/2.13.0/moment-with-locales.js"/>
<script name="/tobago/standard/bootstrap-datetimepicker/4.17.37/js/bootstrap-datetimepicker.js"/>
- <script name="/tobago/standard/script/tobago-jsf.js"/>
- <script name="/tobago/standard/script/tobago.js"/>
- <script name="/tobago/standard/script/tobago-calendar.js"/>
- <script name="/tobago/standard/script/tobago-console.js"/>
- <script name="/tobago/standard/script/tobago-in.js"/>
- <script name="/tobago/standard/script/tobago-layout.js"/>
- <script name="/tobago/standard/script/tobago-overlay.js"/>
- <script name="/tobago/standard/script/tobago-popup.js"/>
- <script name="/tobago/standard/script/tobago-sheet.js"/>
- <script name="/tobago/standard/script/tobago-suggest.js"/>
- <script name="/tobago/standard/script/tobago-tab.js"/>
- <script name="/tobago/standard/script/tobago-tree.js"/>
- <script name="/tobago/standard/script/tobago-utils.js"/>
+ <script name="/tobago/standard/tobago-bootstrap/3.1.0/js/tobago-jsf.js"/>
+ <script name="/tobago/standard/tobago-bootstrap/3.1.0/js/tobago.js"/>
+ <script name="/tobago/standard/tobago-bootstrap/3.1.0/js/tobago-calendar.js"/>
+ <script name="/tobago/standard/tobago-bootstrap/3.1.0/js/tobago-console.js"/>
+ <script name="/tobago/standard/tobago-bootstrap/3.1.0/js/tobago-in.js"/>
+ <script name="/tobago/standard/tobago-bootstrap/3.1.0/js/tobago-layout.js"/>
+ <script name="/tobago/standard/tobago-bootstrap/3.1.0/js/tobago-overlay.js"/>
+ <script name="/tobago/standard/tobago-bootstrap/3.1.0/js/tobago-popup.js"/>
+ <script name="/tobago/standard/tobago-bootstrap/3.1.0/js/tobago-sheet.js"/>
+ <script name="/tobago/standard/tobago-bootstrap/3.1.0/js/tobago-suggest.js"/>
+ <script name="/tobago/standard/tobago-bootstrap/3.1.0/js/tobago-tab.js"/>
+ <script name="/tobago/standard/tobago-bootstrap/3.1.0/js/tobago-tree.js"/>
+ <script name="/tobago/standard/tobago-bootstrap/3.1.0/js/tobago-utils.js"/>
<script name="/tobago/standard/typeahead/0.11.1-patched-with-1212/typeahead.js"/>
<style name="/tobago/standard/tether/1.1.1/css/tether.css"/>
- <style name="/tobago/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.css"/>
+ <style name="/tobago/standard/tobago-bootstrap/3.1.0/css/bootstrap.css"/>
<style name="/tobago/standard/font-awesome/4.6.1/css/font-awesome.css"/>
<style name="/tobago/standard/bootstrap-datetimepicker/4.17.37/css/bootstrap-datetimepicker.css"/>
</resources>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClassUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClassUnitTest.java?rev=1783100&r1=1783099&r2=1783100&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClassUnitTest.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClassUnitTest.java Wed Feb 15 12:38:54 2017
@@ -34,7 +34,7 @@ public class BootstrapClassUnitTest {
@Test
public void testCompareBootstrapCss() throws FileNotFoundException {
CssClassUtils.compareCss(
- "src/main/resources/META-INF/resources/tobago/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.css",
+ "src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/3.1.0/css/bootstrap.css",
BootstrapClass.values());
}