SAK-33798: Version all JS/CSS loaded from JSF tools (sakaiproject#5169)

DaweiXia · Dec 28, 2017 · 824923f · 824923f
1 parent 70a90f8
commit 824923f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/jsf/jsf-widgets/pom.xml b/jsf/jsf-widgets/pom.xml
@@ -28,6 +28,10 @@
     </description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.sakaiproject.portal</groupId>
+            <artifactId>sakai-portal-util</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.sakaiproject.kernel</groupId>
             <artifactId>sakai-kernel-util</artifactId>

diff --git a/jsf/jsf-widgets/src/java/org/sakaiproject/jsf/renderer/ScriptRenderer.java b/jsf/jsf-widgets/src/java/org/sakaiproject/jsf/renderer/ScriptRenderer.java
@@ -30,6 +30,7 @@
 import javax.faces.render.Renderer;
 
 import org.sakaiproject.jsf.util.RendererUtil;
+import org.sakaiproject.portal.util.PortalUtils;
 
 /**
  * <p>Description: </p>
@@ -113,7 +114,7 @@ public void encodeEnd(FacesContext context, UIComponent component)
     }
 
 
-    writer.write("<script src=\"" + contextPath + path + "\" type=\"" + type + "\">");
+    writer.write("<script src=\"" + contextPath + path + PortalUtils.getCDNQuery() + "\" type=\"" + type + "\">");
     // ie requires
     writer.write("</script>");
   }

diff --git a/jsf/jsf-widgets/src/java/org/sakaiproject/jsf/renderer/StylesheetRenderer.java b/jsf/jsf-widgets/src/java/org/sakaiproject/jsf/renderer/StylesheetRenderer.java
@@ -30,6 +30,7 @@
 import javax.faces.render.Renderer;
 
 import org.sakaiproject.jsf.util.RendererUtil;
+import org.sakaiproject.portal.util.PortalUtils;
 
 /**
  * <p>Description: </p>
@@ -101,6 +102,7 @@ public void encodeEnd(FacesContext context, UIComponent component)
 
     writer.write(contextPath);
     writer.write( (String) RendererUtil.getAttribute(context, component, "path"));
+    writer.write(PortalUtils.getCDNQuery());
     writer.write("\"/>");
   }
 

diff --git a/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/jsf/renderer/ScriptRenderer.java b/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/jsf/renderer/ScriptRenderer.java
@@ -30,6 +30,7 @@
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 import javax.faces.render.Renderer;
+import org.sakaiproject.portal.util.PortalUtils;
 
 /**
  * <p>Description: </p>
@@ -101,7 +102,7 @@ public void encodeEnd(FacesContext context, UIComponent component)
     ResponseWriter writer = context.getResponseWriter();
     String contextPath = context.getExternalContext()
       .getRequestContextPath();
-    writer.write("<script src=\"" + contextPath + path + "\" type=\"" + type + "\">");
+    writer.write("<script src=\"" + contextPath + path + PortalUtils.getCDNQuery() + "\" type=\"" + type + "\">");
     // ie requires
     writer.write("</script>");
   }

diff --git a/...samigo-app/src/java/org/sakaiproject/tool/assessment/jsf/renderer/StylesheetRenderer.java b/...samigo-app/src/java/org/sakaiproject/tool/assessment/jsf/renderer/StylesheetRenderer.java
@@ -30,6 +30,7 @@
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 import javax.faces.render.Renderer;
+import org.sakaiproject.portal.util.PortalUtils;
 
 /**
  * <p>Description: </p>
@@ -95,6 +96,7 @@ public void encodeEnd(FacesContext context, UIComponent component)
 
     writer.write(contextPath);
     writer.write( (String) component.getAttributes().get("path"));
+    writer.write(PortalUtils.getCDNQuery());
     writer.write("\"/>");
   }