Return-Path: X-Original-To: apmail-deltaspike-commits-archive@www.apache.org Delivered-To: apmail-deltaspike-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CAC511177B for ; Tue, 15 Apr 2014 19:02:09 +0000 (UTC) Received: (qmail 47759 invoked by uid 500); 15 Apr 2014 19:02:07 -0000 Delivered-To: apmail-deltaspike-commits-archive@deltaspike.apache.org Received: (qmail 47718 invoked by uid 500); 15 Apr 2014 19:02:04 -0000 Mailing-List: contact commits-help@deltaspike.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltaspike.apache.org Delivered-To: mailing list commits@deltaspike.apache.org Received: (qmail 47375 invoked by uid 99); 15 Apr 2014 19:01:48 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Apr 2014 19:01:48 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E84AC8BCFAD; Tue, 15 Apr 2014 19:01:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tandraschko@apache.org To: commits@deltaspike.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: DELTASPIKE-574 Versioning for DeltaSpike JSF resources Date: Tue, 15 Apr 2014 19:01:47 +0000 (UTC) Repository: deltaspike Updated Branches: refs/heads/master 89502997c -> 0a4bc446b DELTASPIKE-574 Versioning for DeltaSpike JSF resources Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/0a4bc446 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/0a4bc446 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/0a4bc446 Branch: refs/heads/master Commit: 0a4bc446b5d8a75b67a211a883004c88187ed630 Parents: 8950299 Author: tandraschko Authored: Tue Apr 15 21:01:34 2014 +0200 Committer: tandraschko Committed: Tue Apr 15 21:01:34 2014 +0200 ---------------------------------------------------------------------- .../impl/resource/DeltaSpikeResourceHandler.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/0a4bc446/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/resource/DeltaSpikeResourceHandler.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/resource/DeltaSpikeResourceHandler.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/resource/DeltaSpikeResourceHandler.java index 11a38f6..dbb58c4 100644 --- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/resource/DeltaSpikeResourceHandler.java +++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/resource/DeltaSpikeResourceHandler.java @@ -22,6 +22,7 @@ import javax.faces.application.Resource; import javax.faces.application.ResourceHandler; import javax.faces.application.ResourceHandlerWrapper; import org.apache.deltaspike.core.api.projectstage.ProjectStage; +import org.apache.deltaspike.core.util.ClassUtils; import org.apache.deltaspike.core.util.ProjectStageProducer; /** @@ -33,12 +34,14 @@ public class DeltaSpikeResourceHandler extends ResourceHandlerWrapper private static final String LIBRARY_UNCOMPRESSED = "deltaspike-uncompressed"; private final ResourceHandler wrapped; + private final String version; public DeltaSpikeResourceHandler(ResourceHandler resourceHandler) { super(); wrapped = resourceHandler; + version = ClassUtils.getJarVersion(this.getClass()); } @Override @@ -46,13 +49,14 @@ public class DeltaSpikeResourceHandler extends ResourceHandlerWrapper { Resource resource = wrapped.createResource(resourceName, libraryName); - if (resource != null - && libraryName != null - && LIBRARY.equals(libraryName) - && ProjectStageProducer.getInstance().getProjectStage() == ProjectStage.Development) + if (resource != null && libraryName != null && LIBRARY.equals(libraryName)) { - - resource = wrapped.createResource(resourceName, LIBRARY_UNCOMPRESSED); + if (ProjectStageProducer.getInstance().getProjectStage() == ProjectStage.Development) + { + resource = wrapped.createResource(resourceName, LIBRARY_UNCOMPRESSED); + } + + resource = new DeltaSpikeResource(resource, version); } return resource;