[Carbon-dev] svn commit r43527 - in branches/carbon-platform/2.0.1/carbon-components/bpel: . org.wso2.carbon.bpel org.wso2.carbon.bpel.ode.integration org.wso2.carbon.bpel.ui org.wso2.carbon.bpel.ui/src/main/java/org/wso2/carbon/bpel/ui/fileupload
milinda at wso2.com
milinda at wso2.com
Mon Aug 17 01:24:39 PDT 2009
Author: milinda
Date: Mon Aug 17 01:24:39 2009
New Revision: 43527
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=43527
Log:
Fixing file upload excutor bug due to changes in super class. Change bpel component version.
Modified:
branches/carbon-platform/2.0.1/carbon-components/bpel/org.wso2.carbon.bpel.ode.integration/pom.xml
branches/carbon-platform/2.0.1/carbon-components/bpel/org.wso2.carbon.bpel.ui/pom.xml
branches/carbon-platform/2.0.1/carbon-components/bpel/org.wso2.carbon.bpel.ui/src/main/java/org/wso2/carbon/bpel/ui/fileupload/BPELUploadExecutor.java
branches/carbon-platform/2.0.1/carbon-components/bpel/org.wso2.carbon.bpel/pom.xml
branches/carbon-platform/2.0.1/carbon-components/bpel/pom.xml
Modified: branches/carbon-platform/2.0.1/carbon-components/bpel/org.wso2.carbon.bpel.ode.integration/pom.xml
URL: http://wso2.org/svn/browse/wso2/branches/carbon-platform/2.0.1/carbon-components/bpel/org.wso2.carbon.bpel.ode.integration/pom.xml?rev=43527&r1=43526&r2=43527&view=diff
==============================================================================
--- branches/carbon-platform/2.0.1/carbon-components/bpel/org.wso2.carbon.bpel.ode.integration/pom.xml (original)
+++ branches/carbon-platform/2.0.1/carbon-components/bpel/org.wso2.carbon.bpel.ode.integration/pom.xml Mon Aug 17 01:24:39 2009
@@ -5,7 +5,7 @@
<parent>
<groupId>org.wso2.carbon</groupId>
<artifactId>bpel-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/carbon-platform/2.0.1/carbon-components/bpel/org.wso2.carbon.bpel.ui/pom.xml
URL: http://wso2.org/svn/browse/wso2/branches/carbon-platform/2.0.1/carbon-components/bpel/org.wso2.carbon.bpel.ui/pom.xml?rev=43527&r1=43526&r2=43527&view=diff
==============================================================================
--- branches/carbon-platform/2.0.1/carbon-components/bpel/org.wso2.carbon.bpel.ui/pom.xml (original)
+++ branches/carbon-platform/2.0.1/carbon-components/bpel/org.wso2.carbon.bpel.ui/pom.xml Mon Aug 17 01:24:39 2009
@@ -5,7 +5,7 @@
<parent>
<groupId>org.wso2.carbon</groupId>
<artifactId>bpel-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/carbon-platform/2.0.1/carbon-components/bpel/org.wso2.carbon.bpel.ui/src/main/java/org/wso2/carbon/bpel/ui/fileupload/BPELUploadExecutor.java
URL: http://wso2.org/svn/browse/wso2/branches/carbon-platform/2.0.1/carbon-components/bpel/org.wso2.carbon.bpel.ui/src/main/java/org/wso2/carbon/bpel/ui/fileupload/BPELUploadExecutor.java?rev=43527&r1=43526&r2=43527&view=diff
==============================================================================
--- branches/carbon-platform/2.0.1/carbon-components/bpel/org.wso2.carbon.bpel.ui/src/main/java/org/wso2/carbon/bpel/ui/fileupload/BPELUploadExecutor.java (original)
+++ branches/carbon-platform/2.0.1/carbon-components/bpel/org.wso2.carbon.bpel.ui/src/main/java/org/wso2/carbon/bpel/ui/fileupload/BPELUploadExecutor.java Mon Aug 17 01:24:39 2009
@@ -1,28 +1,27 @@
package org.wso2.carbon.bpel.ui.fileupload;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.CarbonConstants;
import org.wso2.carbon.CarbonException;
import org.wso2.carbon.ui.transports.fileupload.AbstractFileUploadExecutor;
import org.wso2.carbon.utils.FileItemData;
import org.wso2.carbon.utils.ServerConstants;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ode.bpel.compiler.api.CompilationException;
-import org.apache.ode.bpel.iapi.ContextException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import javax.activation.DataHandler;
import javax.activation.DataSource;
import javax.activation.FileDataSource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
-import java.io.File;
+import java.util.ArrayList;
public class BPELUploadExecutor extends AbstractFileUploadExecutor {
private static Log log = LogFactory.getLog(BPELUploadExecutor.class);
-
+
private static final String[] ALLOWED_FILE_EXTENSIONS =
new String[]{".zip"};
private String tmpDir = "bpelTemp";
@@ -51,40 +50,42 @@
try {
for (Object o : fileItemsMap.keySet()) {
String fieldName = (String) o;
- FileItemData fileItemData = fileItemsMap.get(fieldName);
- String fileName = fileItemData.getFileItem().getName();
-
- //Check file extension.
- checkServiceFileExtensionValidity(fileName, ALLOWED_FILE_EXTENSIONS);
-
- if (fileName.lastIndexOf("\\") != -1) {
- int indexOfColon = fileName.lastIndexOf("\\") + 1;
- fileName = fileName.substring(indexOfColon, fileName.length());
- }
- if (fieldName.equals("bpelFileName")) {
- SaveExtractReturn uploadedFiles = saveAndExtractUploadedFile(fileItemData.getFileItem());
-
- if (uploadedFiles == null) {
- errMsg = "Wrong archive format." +
- "BPEL Package contents must be archived after putting into direcotry with the same name as archive.";
- log.error(errMsg);
- throw new Exception(errMsg);
+ ArrayList<FileItemData> fileItemDataList = fileItemsMap.get(fieldName);
+ for (FileItemData fileItemData : fileItemDataList) {
+ String fileName = fileItemData.getFileItem().getName();
+
+ //Check file extension.
+ checkServiceFileExtensionValidity(fileName, ALLOWED_FILE_EXTENSIONS);
+
+ if (fileName.lastIndexOf("\\") != -1) {
+ int indexOfColon = fileName.lastIndexOf("\\") + 1;
+ fileName = fileName.substring(indexOfColon, fileName.length());
}
+ if (fieldName.equals("bpelFileName")) {
+ SaveExtractReturn uploadedFiles = saveAndExtractUploadedFile(fileItemData.getFileItem());
- validateBPELPackage(uploadedFiles.extractedFile);
- DataSource dataSource = new FileDataSource(uploadedFiles.zipFile);
- uploaderClient.addUploadedFileItem(new DataHandler(dataSource), fileName, "zip");
+ if (uploadedFiles == null) {
+ errMsg = "Wrong archive format." +
+ "BPEL Package contents must be archived after putting into direcotry with the same name as archive.";
+ log.error(errMsg);
+ throw new Exception(errMsg);
+ }
+
+ validateBPELPackage(uploadedFiles.extractedFile);
+ DataSource dataSource = new FileDataSource(uploadedFiles.zipFile);
+ uploaderClient.addUploadedFileItem(new DataHandler(dataSource), fileName, "zip");
+ }
}
}
uploaderClient.uploadFileItems();
out.write("<textarea>" +
- //"(function(){CARBON.showInfoDialog('BPEL Package Uploaded Successfully!');})();" +
- "(function(){i18n.bpelPckgUplodedSuccess();})();" +
- "</textarea>");
+ //"(function(){CARBON.showInfoDialog('BPEL Package Uploaded Successfully!');})();" +
+ "(function(){i18n.bpelPckgUplodedSuccess();})();" +
+ "</textarea>");
return true;
} catch (Exception e) {
- errMsg = "<p>BPEL Package Upload Failed!<p><p>" + e.getMessage()+"</p>";
+ errMsg = "<p>BPEL Package Upload Failed!<p><p>" + e.getMessage() + "</p>";
log.error(errMsg);
out.write("<textarea>" +
"(function(){i18n.bpelPckgUplodedFailed();})();" +
@@ -135,17 +136,17 @@
} catch (RuntimeException ce) {
log.error("Process Compilation Failure.", ce);
throw new Exception("BPEL Compilation Failure!");
- } catch(Exception e){
+ } catch (Exception e) {
log.error("Process Compilation Failure.", e);
- throw new Exception("BPEL Compilation Failure!");
+ throw new Exception("BPEL Compilation Failure!");
}
}
- class SaveExtractReturn{
+ class SaveExtractReturn {
private String zipFile;
private String extractedFile;
- public SaveExtractReturn(String zipFile, String extractedFile){
+ public SaveExtractReturn(String zipFile, String extractedFile) {
this.zipFile = zipFile;
this.extractedFile = extractedFile;
}
Modified: branches/carbon-platform/2.0.1/carbon-components/bpel/org.wso2.carbon.bpel/pom.xml
URL: http://wso2.org/svn/browse/wso2/branches/carbon-platform/2.0.1/carbon-components/bpel/org.wso2.carbon.bpel/pom.xml?rev=43527&r1=43526&r2=43527&view=diff
==============================================================================
--- branches/carbon-platform/2.0.1/carbon-components/bpel/org.wso2.carbon.bpel/pom.xml (original)
+++ branches/carbon-platform/2.0.1/carbon-components/bpel/org.wso2.carbon.bpel/pom.xml Mon Aug 17 01:24:39 2009
@@ -5,7 +5,7 @@
<parent>
<groupId>org.wso2.carbon</groupId>
<artifactId>bpel-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/carbon-platform/2.0.1/carbon-components/bpel/pom.xml
URL: http://wso2.org/svn/browse/wso2/branches/carbon-platform/2.0.1/carbon-components/bpel/pom.xml?rev=43527&r1=43526&r2=43527&view=diff
==============================================================================
--- branches/carbon-platform/2.0.1/carbon-components/bpel/pom.xml (original)
+++ branches/carbon-platform/2.0.1/carbon-components/bpel/pom.xml Mon Aug 17 01:24:39 2009
@@ -11,7 +11,7 @@
<groupId>org.wso2.carbon</groupId>
<artifactId>bpel-parent</artifactId>
<packaging>pom</packaging>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1</version>
<name>WSO2 BPEL Deployer</name>
<url>http://wso2.org</url>
<description>BPEL Support for WSO2 WSAS</description>
More information about the Carbon-dev
mailing list