JS

2 files changed, 22 insertions, 14 deletions

diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentLoadStrategyImpl.java
index 47c0c2238..27a0f875b 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentLoadStrategyImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentLoadStrategyImpl.java
@@ -17,7 +17,6 @@ public class WebComponentLoadStrategyImpl extends ComponentLoadStrategyImpl {
 
 	public WebComponentLoadStrategyImpl(IVirtualComponent vComponent) {
 		super(vComponent);
-		// TODO Auto-generated constructor stub
 	}
 
 }
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleExportOperationNEW.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleExportOperationNEW.java
index 61c6425bf..09ff67896 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleExportOperationNEW.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleExportOperationNEW.java
@@ -13,30 +13,39 @@ package org.eclipse.jst.j2ee.internal.web.archive.operations;
 import java.lang.reflect.InvocationTargetException;
 
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
+import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
 import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
+import org.eclipse.jst.j2ee.internal.archive.operations.AppClientArchiveOpsResourceHandler;
 import org.eclipse.jst.j2ee.internal.archive.operations.J2EEArtifactExportOperationNEW;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 
 public class WebModuleExportOperationNEW extends J2EEArtifactExportOperationNEW {
 
-    public WebModuleExportOperationNEW() {
-        super();
-        // TODO Auto-generated constructor stub
-    }
+	public WebModuleExportOperationNEW() {
+		super();
+	}
 
-    public WebModuleExportOperationNEW(IDataModel model) {
-        super(model);
-        // TODO Auto-generated constructor stub
-    }
+	public WebModuleExportOperationNEW(IDataModel model) {
+		super(model);
+	}
 
 	protected void export() throws SaveFailureException, CoreException, InvocationTargetException, InterruptedException {
-		// TODO Auto-generated method stub
-		
-	}
+		try {
+			CommonarchiveFactory caf = ((CommonarchivePackage) EPackage.Registry.INSTANCE.getEPackage(CommonarchivePackage.eNS_URI)).getCommonarchiveFactory();
+			WebComponentLoadStrategyImpl ls = new WebComponentLoadStrategyImpl(getComponent());
+			ls.setExportSource(isExportSource());
+			setModuleFile(caf.openWARFile(ls, getDestinationPath().toOSString()));
+			getModuleFile().saveAsNoReopen(getDestinationPath().toOSString());
+		} catch (SaveFailureException ex) {
+			throw ex;
+		} catch (Exception e) {
+			throw new SaveFailureException(AppClientArchiveOpsResourceHandler.getString("ARCHIVE_OPERATION_OpeningArchive"), e);//$NON-NLS-1$
+		}	}
 
 	protected String archiveString() {
-		// TODO Auto-generated method stub
-		return null;
+		return "War File";
 	}
 
 }