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 2016/12/07 21:42:11 UTC
svn commit: r1773150 - in /myfaces/tobago/trunk: ./ tobago-theme/
tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/
tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/
tobago-the...
Author: lofwyr
Date: Wed Dec 7 21:42:10 2016
New Revision: 1773150
URL: http://svn.apache.org/viewvc?rev=1773150&view=rev
Log:
TOBAGO-1653: Shorten the resource path of CSS, JavaScript, etc. in the themes
Added:
myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/
- copied from r1773147, myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/
myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/
- copied from r1773147, myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/
- copied from r1772430, myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/
- copied from r1772430, myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/
- copied from r1772430, myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/
- copied from r1772430, myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/
- copied from r1772430, myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/
- copied from r1772430, myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/
- copied from r1772430, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/
- copied from r1772430, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/
Removed:
myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/
myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/renderkit/html/charlotteville/standard/
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/renderkit/html/richmond/standard/
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/renderkit/html/scarborough/standard/
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/renderkit/html/speyside/standard/
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/renderkit/html/standard/standard/
Modified:
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/tobago-theme/pom.xml
myfaces/tobago/trunk/tobago-theme/rebuild-theme.sh
myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/script/tobago.js
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/html/CssClassCompareUnitTest.java
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=1773150&r1=1773149&r2=1773150&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Wed Dec 7 21:42:10 2016
@@ -891,28 +891,28 @@
<exclude>DEPENDENCIES</exclude>
<!-- bootstrap -->
- <exclude>**/org/apache/myfaces/tobago/renderkit/html/*/standard/bootstrap/**/bootstrap*.*</exclude>
+ <exclude>**/tobago/*/bootstrap/**/bootstrap*.*</exclude>
<!-- bootstrap datetimepicker -->
- <exclude>**/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap-datetimepicker/**/bootstrap*.*</exclude>
+ <exclude>**/tobago/standard/bootstrap-datetimepicker/**/bootstrap*.*</exclude>
<!-- font-awesome -->
- <exclude>**/org/apache/myfaces/tobago/renderkit/html/standard/standard/font-awesome/**/font*awesome*.*</exclude>
+ <exclude>**/tobago/standard/font-awesome/**/font*awesome*.*</exclude>
<!-- jQuery -->
- <exclude>**/org/apache/myfaces/tobago/renderkit/html/standard/standard/jquery/**/jquery*.*</exclude>
+ <exclude>**/tobago/standard/jquery/**/jquery*.*</exclude>
<!-- jQuery UI -->
- <exclude>**/org/apache/myfaces/tobago/renderkit/html/standard/standard/jquery-ui/**/jquery*.*</exclude>
+ <exclude>**/tobago/standard/jquery-ui/**/jquery*.*</exclude>
<!-- moment -->
- <exclude>**/org/apache/myfaces/tobago/renderkit/html/standard/standard/moment/**/moment*.*</exclude>
+ <exclude>**/tobago/standard/moment/**/moment*.*</exclude>
<!-- tether -->
- <exclude>**/org/apache/myfaces/tobago/renderkit/html/standard/standard/tether/**/tether*.*</exclude>
+ <exclude>**/tobago/standard/tether/**/tether*.*</exclude>
<!-- typeahead -->
- <exclude>**/org/apache/myfaces/tobago/renderkit/html/standard/standard/typeahead/**/typeahead*.*</exclude>
+ <exclude>**/tobago/standard/typeahead/**/typeahead*.*</exclude>
<!-- prism (tobago-example-demo) -->
<exclude>**/src/main/webapp/script/prism*.*</exclude>
Modified: myfaces/tobago/trunk/tobago-theme/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/pom.xml?rev=1773150&r1=1773149&r2=1773150&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/pom.xml Wed Dec 7 21:42:10 2016
@@ -140,7 +140,7 @@
</goals>
<configuration>
<outputDirectory>
- ${basedir}/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/renderkit/html/${theme.name}/standard/bootstrap/${bootstrap.version}
+ ${basedir}/src/main/resources/META-INF/resources/tobago/${theme.name}/bootstrap/${bootstrap.version}
</outputDirectory>
<resources>
<resource>
Modified: myfaces/tobago/trunk/tobago-theme/rebuild-theme.sh
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/rebuild-theme.sh?rev=1773150&r1=1773149&r2=1773150&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/rebuild-theme.sh (original)
+++ myfaces/tobago/trunk/tobago-theme/rebuild-theme.sh Wed Dec 7 21:42:10 2016
@@ -31,19 +31,19 @@ echo check ok, building now...
mvn clean
mvn -P rebuild-theme -f tobago-theme-charlotteville/pom.xml
-rm tobago-theme-charlotteville/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/bootstrap/4.0.0-alpha.5/css/bootstrap-*
+rm tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/bootstrap/4.0.0-alpha.5/css/bootstrap-*
mvn -P rebuild-theme -f tobago-theme-richmond/pom.xml
-rm tobago-theme-richmond/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/bootstrap/4.0.0-alpha.5/css/bootstrap-*
+rm tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/bootstrap/4.0.0-alpha.5/css/bootstrap-*
mvn -P rebuild-theme -f tobago-theme-scarborough/pom.xml
-rm tobago-theme-scarborough/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/bootstrap/4.0.0-alpha.5/css/bootstrap-*
+rm tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/bootstrap/4.0.0-alpha.5/css/bootstrap-*
mvn -P rebuild-theme -f tobago-theme-speyside/pom.xml
-rm tobago-theme-speyside/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/bootstrap/4.0.0-alpha.5/css/bootstrap-*
+rm tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/bootstrap/4.0.0-alpha.5/css/bootstrap-*
mvn -P rebuild-theme -f tobago-theme-standard/pom.xml
-rm tobago-theme-standard/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.5/css/bootstrap-*
+rm tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/bootstrap/4.0.0-alpha.5/css/bootstrap-*
mvn install
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml?rev=1773150&r1=1773149&r2=1773150&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml Wed Dec 7 21:42:10 2016
@@ -36,19 +36,19 @@
<versioned>true</versioned>
<resources production="true">
<excludes>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js"/>
- <style name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"/>
+ <script name="/tobago/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js"/>
+ <style name="/tobago/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"/>
</excludes>
- <script name="/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js"/>
- <style name="/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"/>
+ <script name="/tobago/charlotteville/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js"/>
+ <style name="/tobago/charlotteville/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"/>
</resources>
<resources production="false">
<excludes>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.js"/>
- <style name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.css"/>
+ <script name="/tobago/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.js"/>
+ <style name="/tobago/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.css"/>
</excludes>
- <script name="/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.js"/>
- <style name="/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.css"/>
+ <script name="/tobago/charlotteville/bootstrap/4.0.0-alpha.5/js/bootstrap.js"/>
+ <style name="/tobago/charlotteville/bootstrap/4.0.0-alpha.5/css/bootstrap.css"/>
</resources>
</theme-definition>
</theme-definitions>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml?rev=1773150&r1=1773149&r2=1773150&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml Wed Dec 7 21:42:10 2016
@@ -36,19 +36,19 @@
<versioned>true</versioned>
<resources production="true">
<excludes>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js"/>
- <style name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"/>
+ <script name="/tobago/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js"/>
+ <style name="/tobago/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"/>
</excludes>
- <script name="/org/apache/myfaces/tobago/renderkit/html/richmond/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js"/>
- <style name="/org/apache/myfaces/tobago/renderkit/html/richmond/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"/>
+ <script name="/tobago/richmond/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js"/>
+ <style name="/tobago/richmond/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"/>
</resources>
<resources production="false">
<excludes>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.js"/>
- <style name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.css"/>
+ <script name="/tobago/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.js"/>
+ <style name="/tobago/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.css"/>
</excludes>
- <script name="/org/apache/myfaces/tobago/renderkit/html/richmond/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.js"/>
- <style name="/org/apache/myfaces/tobago/renderkit/html/richmond/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.css"/>
+ <script name="/tobago/richmond/bootstrap/4.0.0-alpha.5/js/bootstrap.js"/>
+ <style name="/tobago/richmond/bootstrap/4.0.0-alpha.5/css/bootstrap.css"/>
</resources>
</theme-definition>
</theme-definitions>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml?rev=1773150&r1=1773149&r2=1773150&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml Wed Dec 7 21:42:10 2016
@@ -36,19 +36,19 @@
<versioned>true</versioned>
<resources production="true">
<excludes>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js"/>
- <style name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"/>
+ <script name="/tobago/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js"/>
+ <style name="/tobago/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"/>
</excludes>
- <script name="/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js"/>
- <style name="/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"/>
+ <script name="/tobago/scarborough/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js"/>
+ <style name="/tobago/scarborough/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"/>
</resources>
<resources production="false">
<excludes>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.js"/>
- <style name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.css"/>
+ <script name="/tobago/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.js"/>
+ <style name="/tobago/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.css"/>
</excludes>
- <script name="/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.js"/>
- <style name="/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.css"/>
+ <script name="/tobago/scarborough/bootstrap/4.0.0-alpha.5/js/bootstrap.js"/>
+ <style name="/tobago/scarborough/bootstrap/4.0.0-alpha.5/css/bootstrap.css"/>
</resources>
</theme-definition>
</theme-definitions>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml?rev=1773150&r1=1773149&r2=1773150&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml Wed Dec 7 21:42:10 2016
@@ -36,19 +36,19 @@
<versioned>true</versioned>
<resources production="true">
<excludes>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js"/>
- <style name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"/>
+ <script name="/tobago/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js"/>
+ <style name="/tobago/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"/>
</excludes>
- <script name="/org/apache/myfaces/tobago/renderkit/html/speyside/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js"/>
- <style name="/org/apache/myfaces/tobago/renderkit/html/speyside/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"/>
+ <script name="/tobago/speyside/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js"/>
+ <style name="/tobago/speyside/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"/>
</resources>
<resources production="false">
<excludes>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.js"/>
- <style name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.css"/>
+ <script name="/tobago/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.js"/>
+ <style name="/tobago/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.css"/>
</excludes>
- <script name="/org/apache/myfaces/tobago/renderkit/html/speyside/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.js"/>
- <style name="/org/apache/myfaces/tobago/renderkit/html/speyside/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.css"/>
+ <script name="/tobago/speyside/bootstrap/4.0.0-alpha.5/js/bootstrap.js"/>
+ <style name="/tobago/speyside/bootstrap/4.0.0-alpha.5/css/bootstrap.css"/>
</resources>
</theme-definition>
</theme-definitions>
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=1773150&r1=1773149&r2=1773150&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml Wed Dec 7 21:42:10 2016
@@ -44,7 +44,7 @@
<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/org/apache/myfaces/tobago/renderkit/html/standard/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" />
+ <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>
<replaceregexp match="^.*//.*@DEV_ONLY.*$" replace="" byline="true">
<fileset dir="${project.build.directory}/javascript-min">
@@ -81,9 +81,7 @@
<argument>--js</argument>
<argument>${project.build.directory}/javascript-min/standard/script/tobago.min.js</argument>
<argument>--js_output_file</argument>
- <argument>
- target/classes/META-INF/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.min.js
- </argument>
+ <argument>target/classes/META-INF/resources/tobago/standard/script/tobago.min.js</argument>
</arguments>
</configuration>
</execution>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/script/tobago.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/script/tobago.js?rev=1773150&r1=1772430&r2=1773150&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/script/tobago.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/script/tobago.js Wed Dec 7 21:42:10 2016
@@ -997,7 +997,6 @@ Tobago.Config = {
}
};
-Tobago.Config.set("Tobago", "themeConfig", "standard/standard");
Tobago.registerListener(Tobago.preventFrameAttacks, Tobago.Phase.DOCUMENT_READY);
// using Tobago.Phase.Order.LATE, because the command event generated by data-tobago-commands
// may produce a submit, but we need to do something before the submit (and also on click,
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=1773150&r1=1773149&r2=1773150&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 Dec 7 21:42:10 2016
@@ -356,45 +356,45 @@
</renderer>
</renderers>
<resources production="true">
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/jquery/jquery-2.2.4.min.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/jquery-ui/1.12.1.custom/jquery-ui.min.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/tether/1.1.1/js/tether.min.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/moment/2.13.0/moment-with-locales.min.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap-datetimepicker/4.17.37/js/bootstrap-datetimepicker.min.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.min.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/typeahead/0.11.1-patched-with-1212/typeahead.min.js"/>
- <style name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/tether/1.1.1/css/tether.min.css"/>
- <style name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"/>
- <style name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/font-awesome/4.6.1/css/font-awesome.min.css"/>
- <style name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.min.css"/>
- <style name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap-datetimepicker/4.17.37/css/bootstrap-datetimepicker.min.css"/>
+ <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/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/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/font-awesome/4.6.1/css/font-awesome.min.css"/>
+ <style name="/tobago/standard/style/tobago.min.css"/>
+ <style name="/tobago/standard/bootstrap-datetimepicker/4.17.37/css/bootstrap-datetimepicker.min.css"/>
</resources>
<resources production="false">
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/jquery/jquery-2.2.4.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/jquery-ui/1.12.1.custom/jquery-ui.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/tether/1.1.1/js/tether.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.5/js/bootstrap.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/moment/2.13.0/moment-with-locales.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap-datetimepicker/4.17.37/js/bootstrap-datetimepicker.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-jsf.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-calendar.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-console.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-in.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-layout.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-overlay.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-popup.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-suggest.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-tab.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-tree.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-utils.js"/>
- <script name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/typeahead/0.11.1-patched-with-1212/typeahead.js"/>
- <style name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/tether/1.1.1/css/tether.css"/>
- <style name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.css"/>
- <style name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/font-awesome/4.6.1/css/font-awesome.css"/>
- <style name="/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap-datetimepicker/4.17.37/css/bootstrap-datetimepicker.css"/>
+ <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/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/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/font-awesome/4.6.1/css/font-awesome.css"/>
+ <style name="/tobago/standard/bootstrap-datetimepicker/4.17.37/css/bootstrap-datetimepicker.css"/>
</resources>
</theme-definition>
</theme-definitions>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/html/CssClassCompareUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/html/CssClassCompareUnitTest.java?rev=1773150&r1=1773149&r2=1773150&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/html/CssClassCompareUnitTest.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/html/CssClassCompareUnitTest.java Wed Dec 7 21:42:10 2016
@@ -47,8 +47,7 @@ public class CssClassCompareUnitTest ext
@Test
public void testCompareBootstrapCss() throws FileNotFoundException {
File bootstrapCss = new File(
- "src/main/resources/META-INF/resources/org/apache/myfaces/"
- + "tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.css");
+ "src/main/resources/META-INF/resources/tobago/standard/bootstrap/4.0.0-alpha.5/css/bootstrap.css");
compareCss(bootstrapCss, BootstrapClass.values());
}