myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1796062 - in /myfaces/tobago/trunk: tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/ tobago-extension/tobago-sandbox/src/main/resources/META-INF/ tobago-theme/ tobago-theme/tobago-theme-charlotteville/src/main/resources...
Date Wed, 24 May 2017 13:32:13 GMT
Author: lofwyr
Date: Wed May 24 13:32:13 2017
New Revision: 1796062

URL: http://svn.apache.org/viewvc?rev=1796062&view=rev
Log:
TOBAGO-1700: Re-Add the version of Tobago to the resources URL to avoid caching when updating
Tobago 
* Simplify version in resource (compile time instead of runtime)

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
    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/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/src/main/resources/META-INF/tobago-config.xml

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java?rev=1796062&r1=1796061&r2=1796062&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
Wed May 24 13:32:13 2017
@@ -98,11 +98,8 @@ public class TobagoConfigParser extends
   private String type;
 
   private Stack<String> stack;
-  private String version;
 
   public TobagoConfigParser() {
-    version = Package.getPackage("org.apache.myfaces.tobago.internal.config").getImplementationVersion();
-    LOG.debug("Tobago version: {}", version);
   }
 
   public TobagoConfigFragment parse(final URL url)
@@ -201,8 +198,7 @@ public class TobagoConfigParser extends
 
       case SCRIPT:
         final ThemeScript script = new ThemeScript();
-        final String scriptName = attributes.getValue("name").replace("/_version/", '/' +
version + '/');
-        script.setName(scriptName);
+        script.setName(attributes.getValue("name"));
         if (production) {
           currentTheme.getProductionResources().addScript(script, exclude);
         } else {
@@ -212,8 +208,7 @@ public class TobagoConfigParser extends
 
       case STYLE:
         final ThemeStyle style = new ThemeStyle();
-        final String styleName = attributes.getValue("name").replace("/_version/", '/' +
version + '/');
-        style.setName(styleName);
+        style.setName(attributes.getValue("name"));
         if (production) {
           currentTheme.getProductionResources().addStyle(style, exclude);
         } else {

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=1796062&r1=1796061&r2=1796062&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 May 24 13:32:13 2017
@@ -35,12 +35,12 @@
       <fallback>speyside</fallback>
       <versioned>false</versioned>
       <resources production="true">
-        <script name="tobago-bootstrap/_version/js/tobago.js"/>
-        <style name="tobago-bootstrap/_version/css/tobago.css"/>
+        <script name="tobago-bootstrap/${project.version}/js/tobago.js"/>
+        <style name="tobago-bootstrap/${project.version}/css/tobago.css"/>
       </resources>
       <resources production="false">
-        <script name="tobago-bootstrap/_version/js/tobago.js"/>
-        <style name="tobago-bootstrap/_version/css/tobago.css"/>
+        <script name="tobago-bootstrap/${project.version}/js/tobago.js"/>
+        <style name="tobago-bootstrap/${project.version}/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=1796062&r1=1796061&r2=1796062&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/pom.xml Wed May 24 13:32:13 2017
@@ -31,6 +31,24 @@
   </properties>
 
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>META-INF/tobago-config.xml
+          </include>
+        </includes>
+        <filtering>true</filtering>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+        <excludes>
+          <exclude>META-INF/tobago-config.xml</exclude>
+        </excludes>
+        <filtering>false</filtering>
+      </resource>
+    </resources>
+
     <pluginManagement>
       <plugins>
         <plugin>

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=1796062&r1=1796061&r2=1796062&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 May 24 13:32:13 2017
@@ -36,19 +36,19 @@
       <versioned>true</versioned>
       <resources production="true">
         <excludes>
-          <script name="/tobago/standard/tobago-bootstrap/_version/js/bootstrap.min.js"/>
-          <style name="/tobago/standard/tobago-bootstrap/_version/css/bootstrap.min.css"/>
+          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/bootstrap.min.js"/>
+          <style name="/tobago/standard/tobago-bootstrap/${project.version}/css/bootstrap.min.css"/>
         </excludes>
-        <script name="/tobago/charlotteville/tobago-bootstrap/_version/js/bootstrap.min.js"/>
-        <style name="/tobago/charlotteville/tobago-bootstrap/_version/css/bootstrap.min.css"/>
+        <script name="/tobago/charlotteville/tobago-bootstrap/${project.version}/js/bootstrap.min.js"/>
+        <style name="/tobago/charlotteville/tobago-bootstrap/${project.version}/css/bootstrap.min.css"/>
       </resources>
       <resources production="false">
         <excludes>
-          <script name="/tobago/standard/tobago-bootstrap/_version/js/bootstrap.js"/>
-          <style name="/tobago/standard/tobago-bootstrap/_version/css/bootstrap.css"/>
+          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/bootstrap.js"/>
+          <style name="/tobago/standard/tobago-bootstrap/${project.version}/css/bootstrap.css"/>
         </excludes>
-        <script name="/tobago/charlotteville/tobago-bootstrap/_version/js/bootstrap.js"/>
-        <style name="/tobago/charlotteville/tobago-bootstrap/_version/css/bootstrap.css"/>
+        <script name="/tobago/charlotteville/tobago-bootstrap/${project.version}/js/bootstrap.js"/>
+        <style name="/tobago/charlotteville/tobago-bootstrap/${project.version}/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=1796062&r1=1796061&r2=1796062&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 May 24 13:32:13 2017
@@ -36,19 +36,19 @@
       <versioned>true</versioned>
       <resources production="true">
         <excludes>
-          <script name="/tobago/standard/tobago-bootstrap/_version/js/bootstrap.min.js"/>
-          <style name="/tobago/standard/tobago-bootstrap/_version/css/bootstrap.min.css"/>
+          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/bootstrap.min.js"/>
+          <style name="/tobago/standard/tobago-bootstrap/${project.version}/css/bootstrap.min.css"/>
         </excludes>
-        <script name="/tobago/richmond/tobago-bootstrap/_version/js/bootstrap.min.js"/>
-        <style name="/tobago/richmond/tobago-bootstrap/_version/css/bootstrap.min.css"/>
+        <script name="/tobago/richmond/tobago-bootstrap/${project.version}/js/bootstrap.min.js"/>
+        <style name="/tobago/richmond/tobago-bootstrap/${project.version}/css/bootstrap.min.css"/>
       </resources>
       <resources production="false">
         <excludes>
-          <script name="/tobago/standard/tobago-bootstrap/_version/js/bootstrap.js"/>
-          <style name="/tobago/standard/tobago-bootstrap/_version/css/bootstrap.css"/>
+          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/bootstrap.js"/>
+          <style name="/tobago/standard/tobago-bootstrap/${project.version}/css/bootstrap.css"/>
         </excludes>
-        <script name="/tobago/richmond/tobago-bootstrap/_version/js/bootstrap.js"/>
-        <style name="/tobago/richmond/tobago-bootstrap/_version/css/bootstrap.css"/>
+        <script name="/tobago/richmond/tobago-bootstrap/${project.version}/js/bootstrap.js"/>
+        <style name="/tobago/richmond/tobago-bootstrap/${project.version}/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=1796062&r1=1796061&r2=1796062&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 May 24 13:32:13 2017
@@ -36,19 +36,19 @@
       <versioned>true</versioned>
       <resources production="true">
         <excludes>
-          <script name="/tobago/standard/tobago-bootstrap/_version/js/bootstrap.min.js"/>
-          <style name="/tobago/standard/tobago-bootstrap/_version/css/bootstrap.min.css"/>
+          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/bootstrap.min.js"/>
+          <style name="/tobago/standard/tobago-bootstrap/${project.version}/css/bootstrap.min.css"/>
         </excludes>
-        <script name="/tobago/scarborough/tobago-bootstrap/_version/js/bootstrap.min.js"/>
-        <style name="/tobago/scarborough/tobago-bootstrap/_version/css/bootstrap.min.css"/>
+        <script name="/tobago/scarborough/tobago-bootstrap/${project.version}/js/bootstrap.min.js"/>
+        <style name="/tobago/scarborough/tobago-bootstrap/${project.version}/css/bootstrap.min.css"/>
       </resources>
       <resources production="false">
         <excludes>
-          <script name="/tobago/standard/tobago-bootstrap/_version/js/bootstrap.js"/>
-          <style name="/tobago/standard/tobago-bootstrap/_version/css/bootstrap.css"/>
+          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/bootstrap.js"/>
+          <style name="/tobago/standard/tobago-bootstrap/${project.version}/css/bootstrap.css"/>
         </excludes>
-        <script name="/tobago/scarborough/tobago-bootstrap/_version/js/bootstrap.js"/>
-        <style name="/tobago/scarborough/tobago-bootstrap/_version/css/bootstrap.css"/>
+        <script name="/tobago/scarborough/tobago-bootstrap/${project.version}/js/bootstrap.js"/>
+        <style name="/tobago/scarborough/tobago-bootstrap/${project.version}/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=1796062&r1=1796061&r2=1796062&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 May 24 13:32:13 2017
@@ -36,19 +36,19 @@
       <versioned>true</versioned>
       <resources production="true">
         <excludes>
-          <script name="/tobago/standard/tobago-bootstrap/_version/js/bootstrap.min.js"/>
-          <style name="/tobago/standard/tobago-bootstrap/_version/css/bootstrap.min.css"/>
+          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/bootstrap.min.js"/>
+          <style name="/tobago/standard/tobago-bootstrap/${project.version}/css/bootstrap.min.css"/>
         </excludes>
-        <script name="/tobago/speyside/tobago-bootstrap/_version/js/bootstrap.min.js"/>
-        <style name="/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.min.css"/>
+        <script name="/tobago/speyside/tobago-bootstrap/${project.version}/js/bootstrap.min.js"/>
+        <style name="/tobago/speyside/tobago-bootstrap/${project.version}/css/bootstrap.min.css"/>
       </resources>
       <resources production="false">
         <excludes>
-          <script name="/tobago/standard/tobago-bootstrap/_version/js/bootstrap.js"/>
-          <style name="/tobago/standard/tobago-bootstrap/_version/css/bootstrap.css"/>
+          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/bootstrap.js"/>
+          <style name="/tobago/standard/tobago-bootstrap/${project.version}/css/bootstrap.css"/>
         </excludes>
-        <script name="/tobago/speyside/tobago-bootstrap/_version/js/bootstrap.js"/>
-        <style name="/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.css"/>
+        <script name="/tobago/speyside/tobago-bootstrap/${project.version}/js/bootstrap.js"/>
+        <style name="/tobago/speyside/tobago-bootstrap/${project.version}/css/bootstrap.css"/>
       </resources>
     </theme-definition>
   </theme-definitions>

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=1796062&r1=1796061&r2=1796062&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 May 24 13:32:13 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/tobago-bootstrap/_version/js/bootstrap.min.js"/>
+        <script name="/tobago/standard/tobago-bootstrap/${project.version}/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/tobago-bootstrap/_version/js/tobago.min.js"/>
+        <script name="/tobago/standard/tobago-bootstrap/${project.version}/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/tobago-bootstrap/_version/css/bootstrap.min.css"/>
+        <style name="/tobago/standard/tobago-bootstrap/${project.version}/css/bootstrap.min.css"/>
         <style name="/tobago/standard/font-awesome/4.7.0/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/tobago-bootstrap/_version/js/bootstrap.js"/>
+        <script name="/tobago/standard/tobago-bootstrap/${project.version}/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/tobago-bootstrap/_version/js/tobago-jsf.js"/>
-        <script name="/tobago/standard/tobago-bootstrap/_version/js/tobago.js"/>
-        <script name="/tobago/standard/tobago-bootstrap/_version/js/tobago-calendar.js"/>
-        <script name="/tobago/standard/tobago-bootstrap/_version/js/tobago-console.js"/>
-        <script name="/tobago/standard/tobago-bootstrap/_version/js/tobago-in.js"/>
-        <script name="/tobago/standard/tobago-bootstrap/_version/js/tobago-layout.js"/>
-        <script name="/tobago/standard/tobago-bootstrap/_version/js/tobago-overlay.js"/>
-        <script name="/tobago/standard/tobago-bootstrap/_version/js/tobago-popup.js"/>
-        <script name="/tobago/standard/tobago-bootstrap/_version/js/tobago-sheet.js"/>
-        <script name="/tobago/standard/tobago-bootstrap/_version/js/tobago-suggest.js"/>
-        <script name="/tobago/standard/tobago-bootstrap/_version/js/tobago-tab.js"/>
-        <script name="/tobago/standard/tobago-bootstrap/_version/js/tobago-tree.js"/>
-        <script name="/tobago/standard/tobago-bootstrap/_version/js/tobago-utils.js"/>
+        <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-jsf.js"/>
+        <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago.js"/>
+        <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-calendar.js"/>
+        <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-console.js"/>
+        <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-in.js"/>
+        <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-layout.js"/>
+        <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-overlay.js"/>
+        <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-popup.js"/>
+        <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-sheet.js"/>
+        <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-suggest.js"/>
+        <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-tab.js"/>
+        <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-tree.js"/>
+        <script name="/tobago/standard/tobago-bootstrap/${project.version}/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/tobago-bootstrap/_version/css/bootstrap.css"/>
+        <style name="/tobago/standard/tobago-bootstrap/${project.version}/css/bootstrap.css"/>
         <style name="/tobago/standard/font-awesome/4.7.0/css/font-awesome.css"/>
         <style name="/tobago/standard/bootstrap-datetimepicker/4.17.37/css/bootstrap-datetimepicker.css"/>
       </resources>



Mime
View raw message