Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into feature/10.0

designer-base/src/com/fr/design/mainframe/JTemplate.java

@@ -60,6 +60,7 @@ import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.undo.UndoManager;
 import java.awt.*;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -654,10 +655,9 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             return false;
         }
         try {
-            if (!this.getTarget().export(editingFILE.asOutputStream())) {
-                return false;
-            }
-
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            this.getTarget().export(out);
+            FRContext.getCurrentEnv().getFileOperator().write(out.toByteArray(), editingFILE.getPath());
         } catch (Exception e) {
             FRContext.getLogger().error(e.getMessage(), e);
             JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), e.getMessage(), "Save Error", JOptionPane.ERROR_MESSAGE);

designer-base/src/com/fr/env/RemoteEnv.java

@@ -577,7 +577,8 @@ public class RemoteEnv extends AbstractEnv<RemoteEnvConfig> implements DesignAut
      */
     @Override
     public String getWebReportPath() {
-        return getPath().substring(0, getPath().lastIndexOf("/"));
+    
+        return StableUtils.pathJoin(getPath(), getAppName());
     }
 
     public String[] getProcedureColumns(StoreProcedure storeProcedure, Map parameterMap) throws Exception {