From 510db4c46faa3a2e135809081bc0d4698b478544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristiano=20Gavi=C3=A3o?= <cvgaviao@gmail.com>
Date: Thu, 15 Jan 2015 08:24:16 -0300
Subject: [PATCH 1/2] FELIX-4764 - Added GZIP support

---
 .../felix/bundlerepository/impl/DataModelHelperImpl.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/DataModelHelperImpl.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/DataModelHelperImpl.java
index 9a4d785bc40..e3fa6493152 100644
--- a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/DataModelHelperImpl.java
+++ b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/DataModelHelperImpl.java
@@ -34,6 +34,7 @@
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
+import java.util.zip.GZIPInputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -108,6 +109,11 @@ public Repository repository(final URL url) throws Exception
                     entry = zin.getNextEntry();
                 }
             }
+            else 
+                if (url.getPath().endsWith(".gz"))
+                {
+                    is = new GZIPInputStream(FileUtil.openURL(url));                    
+                }
             else
             {
                 is = FileUtil.openURL(url);

From 3af84b7d62d0665a791e31dc77da422e3d2cecd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristiano=20Gavi=C3=A3o?= <cvgaviao@gmail.com>
Date: Mon, 30 Mar 2015 18:30:02 -0300
Subject: [PATCH 2/2] added test case for FELIX-4764

---
 .../impl/DataModelHelperTest.java                |  15 +++++++++++++++
 .../src/test/resources/spec_repository.gz        | Bin 0 -> 3347 bytes
 2 files changed, 15 insertions(+)
 create mode 100644 bundlerepository/src/test/resources/spec_repository.gz

diff --git a/bundlerepository/src/test/java/org/apache/felix/bundlerepository/impl/DataModelHelperTest.java b/bundlerepository/src/test/java/org/apache/felix/bundlerepository/impl/DataModelHelperTest.java
index 3953fd3b2bd..758539bff5e 100644
--- a/bundlerepository/src/test/java/org/apache/felix/bundlerepository/impl/DataModelHelperTest.java
+++ b/bundlerepository/src/test/java/org/apache/felix/bundlerepository/impl/DataModelHelperTest.java
@@ -18,11 +18,14 @@
  */
 package org.apache.felix.bundlerepository.impl;
 
+import java.net.URL;
 import java.util.jar.Attributes;
 
 import junit.framework.TestCase;
 import org.apache.felix.bundlerepository.DataModelHelper;
+import org.apache.felix.bundlerepository.Repository;
 import org.apache.felix.bundlerepository.Resource;
+import static org.junit.Assert.*;
 
 public class DataModelHelperTest extends TestCase
 {
@@ -62,4 +65,16 @@ public void testRequirementFilter() throws Exception
         r.setFilter("(&(package=javax.transaction)(partial=true)(mandatory:<*partial))");
         assertEquals("(&(package=javax.transaction)(partial=true)(mandatory:<*partial))", r.getFilter());
     }
+    
+    public void testGzipResource() throws Exception {
+        URL urlArchive = getClass().getResource("/spec_repository.gz");
+        assertNotNull("GZ archive was not found", urlArchive);
+        Repository repository1 = dmh.repository(urlArchive);
+
+        URL urlRepo = getClass().getResource("/spec_repository.xml");
+        assertNotNull("Repository file was not found", urlRepo);
+        Repository repository2 = dmh.repository(urlRepo);
+        assertEquals(repository1.getName(), repository2.getName());
+        assertEquals(repository1.getResources().length, repository2.getResources().length);
+    }
 }
diff --git a/bundlerepository/src/test/resources/spec_repository.gz b/bundlerepository/src/test/resources/spec_repository.gz
new file mode 100644
index 0000000000000000000000000000000000000000..8f065b83f4e6665766bdb0cf4982deca8b4fefa7
GIT binary patch
literal 3347
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

literal 0
HcmV?d00001