GuvnorNG. ModuleAssembler generated binary extension

tkobayas · Jan 29, 2012 · c8a7945 · c8a7945
1 parent 6ba1602
commit c8a7945
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 3 deletions.
diff --git a/guvnor-webapp-core/src/main/java/org/drools/guvnor/server/builder/ModuleAssembler.java b/guvnor-webapp-core/src/main/java/org/drools/guvnor/server/builder/ModuleAssembler.java
@@ -39,6 +39,7 @@ public interface ModuleAssembler {
     public boolean isModuleConfigurationInError();
 
     public byte[] getCompiledBinary();
+    public String getBinaryExtension();
     public String getCompiledSource();
 
     public boolean hasErrors();

diff --git a/guvnor-webapp-core/src/main/java/org/drools/guvnor/server/builder/PackageAssemblerBase.java b/guvnor-webapp-core/src/main/java/org/drools/guvnor/server/builder/PackageAssemblerBase.java
@@ -52,6 +52,10 @@ public byte[] getCompiledBinary() {
         //NOT_IMPLEMENTED
         return null;
     }
+    public String getBinaryExtension() {
+        return "pkg";
+    }
+
     public String getCompiledSource() {
         //NOT_IMPLEMENTED
         return null;

diff --git a/guvnor-webapp-core/src/main/java/org/drools/guvnor/server/files/FileManagerService.java b/guvnor-webapp-core/src/main/java/org/drools/guvnor/server/files/FileManagerService.java
@@ -173,6 +173,7 @@ public static FormData getFormData(HttpServletRequest request) {
      * @param packageVersion The version (if it is a snapshot).
      * @param isLatest true if the latest package binary will be used (ie NOT a snapshot).
      * @return The filename if its all good.
+     * @deprecated Use JAX-RS based REST API instead
      */
     public String loadBinaryPackage(String packageName,
                                     String packageVersion,

diff --git a/guvnor-webapp-core/src/main/java/org/drools/guvnor/server/jaxrs/PackageResource.java b/guvnor-webapp-core/src/main/java/org/drools/guvnor/server/jaxrs/PackageResource.java
@@ -223,7 +223,10 @@ public Response getPackageSource(@PathParam("packageName") String packageName) {
     public Response getPackageBinary(@PathParam("packageName") String packageName) throws SerializationException {
         try {
             ModuleItem p = rulesRepository.loadModule(packageName);
-            String fileName = packageName + ".pkg";
+
+            ModuleAssembler moduleAssembler = ModuleAssemblerManager.getModuleAssembler(p.getFormat(), p, null);
+
+            String fileName = packageName + "." + moduleAssembler.getBinaryExtension();
             byte[] result;
             if (p.isBinaryUpToDate()) {
                 result = p.getCompiledBinaryBytes();
@@ -312,7 +315,8 @@ public Response getHistoricalPackageBinary(@PathParam("packageName") String pack
         ModuleItem p = rulesRepository.loadModule(packageName, versionNumber);
         byte[] result = p.getCompiledBinaryBytes();
         if (result != null) {
-            String fileName = packageName + ".pkg";
+            ModuleAssembler moduleAssembler = ModuleAssemblerManager.getModuleAssembler(p.getFormat(), p, null);
+            String fileName = packageName + "." + moduleAssembler.getBinaryExtension();
             return Response.ok(result).header("Content-Disposition", "attachment; filename=" + fileName).
                     header("Last-Modified", createDateFormat().format(this.convertToGmt(p.getLastModified()).getTime())).build();
         } else {

diff --git a/guvnor-webapp-soa/src/main/java/org/drools/guvnor/client/resources/Images.java b/guvnor-webapp-soa/src/main/java/org/drools/guvnor/client/resources/Images.java
@@ -18,6 +18,7 @@
 
 import com.google.gwt.resources.client.ClientBundle;
 import com.google.gwt.resources.client.ImageResource;
+import com.google.gwt.resources.client.ClientBundle.Source;
 
 public interface Images
     extends
@@ -344,4 +345,6 @@ public interface Images
     @Source("images/mandatory.png")
     ImageResource mandatory();
 
+    @Source("images/info-large.png")
+    ImageResource infoLarge();
 }
diff --git a/guvnor-webapp-soa/src/main/java/org/drools/guvnor/server/builder/SOAModuleAssembler.java b/guvnor-webapp-soa/src/main/java/org/drools/guvnor/server/builder/SOAModuleAssembler.java
@@ -63,7 +63,9 @@ public String getCompiledSource() {
         //NOT_APPLICABLE
         return null;
     }   
-
+    public String getBinaryExtension() {
+        return "zip";
+    }        
     protected InputStream generateZip() {
         List<AssetItem> jarAssets = new LinkedList<AssetItem>();
         AssetZipper assetZipper = null;