[Carbon-commits] [tools-branch] svn commit r113631 - in branches/tools/eclipse/carbon-studio/1.0.0: bps/org.wso2.bpel.ide.export/src/org/wso2/wsf/ide/bpel/export/ui bps/org.wso2.bpel.ide.export/src/org/wso2/wsf/ide/bpel/export/utils capp/org.wso2.carbonstudio.eclipse.capp.artifact.jaxws/src/org/wso2/carbonstudio/eclipse/capp/artifact/jaxws/utils

[harshana at wso2.com]

Author: harshana
Date: Sun Oct  9 02:40:43 2011
New Revision: 113631
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=113631

Log:
Added a new validation for bpel deployment descriptor and a small refactor

Modified:
   branches/tools/eclipse/carbon-studio/1.0.0/bps/org.wso2.bpel.ide.export/src/org/wso2/wsf/ide/bpel/export/ui/BpelExportWizard.java
   branches/tools/eclipse/carbon-studio/1.0.0/bps/org.wso2.bpel.ide.export/src/org/wso2/wsf/ide/bpel/export/utils/BpelUtils.java
   branches/tools/eclipse/carbon-studio/1.0.0/capp/org.wso2.carbonstudio.eclipse.capp.artifact.jaxws/src/org/wso2/carbonstudio/eclipse/capp/artifact/jaxws/utils/JaxWSArtifactBundleCreator.java

Modified: branches/tools/eclipse/carbon-studio/1.0.0/bps/org.wso2.bpel.ide.export/src/org/wso2/wsf/ide/bpel/export/ui/BpelExportWizard.java
URL: http://wso2.org/svn/browse/wso2/branches/tools/eclipse/carbon-studio/1.0.0/bps/org.wso2.bpel.ide.export/src/org/wso2/wsf/ide/bpel/export/ui/BpelExportWizard.java?rev=113631&r1=113630&r2=113631&view=diff
==============================================================================
--- branches/tools/eclipse/carbon-studio/1.0.0/bps/org.wso2.bpel.ide.export/src/org/wso2/wsf/ide/bpel/export/ui/BpelExportWizard.java	(original)
+++ branches/tools/eclipse/carbon-studio/1.0.0/bps/org.wso2.bpel.ide.export/src/org/wso2/wsf/ide/bpel/export/ui/BpelExportWizard.java	Sun Oct  9 02:40:43 2011
@@ -95,13 +95,17 @@
 			monitor.worked(25);
 			monitor.setTaskName("Filtering out non BPEL artifacts...");
 			bpelValidFileList = BpelUtils.getBpelValidFileList(path,(String[]) allFilesPresentInFolder.toArray(new String[allFilesPresentInFolder.size()]));
-			if (!BpelUtils.isProjectContainsBpel(p)){
-				throw new Exception("The selected project does not contain any BPEL processes.");
-			}else
-				if (bpelValidFileList.size()==0){
-					throw new Exception("The selected project does not contain any BPEL processes.");
+				if (!BpelUtils.isProjectContainsBpel(p)) {
+					throw new Exception(
+							"The selected project does not contain any BPEL processes.");
+				} else if (!BpelUtils.isProjectContainsDeploymentDescriptor(p)) {
+					throw new Exception(
+							"The selected project does not contain a deployment descriptor for the Bpel process");
+				} else if (bpelValidFileList.size() == 0) {
+					throw new Exception(
+							"The selected project does not contain any BPEL processes.");
 				}
-			
+
 			monitor.worked(40);
 			File tempFolder = null;
 			try {

Modified: branches/tools/eclipse/carbon-studio/1.0.0/bps/org.wso2.bpel.ide.export/src/org/wso2/wsf/ide/bpel/export/utils/BpelUtils.java
URL: http://wso2.org/svn/browse/wso2/branches/tools/eclipse/carbon-studio/1.0.0/bps/org.wso2.bpel.ide.export/src/org/wso2/wsf/ide/bpel/export/utils/BpelUtils.java?rev=113631&r1=113630&r2=113631&view=diff
==============================================================================
--- branches/tools/eclipse/carbon-studio/1.0.0/bps/org.wso2.bpel.ide.export/src/org/wso2/wsf/ide/bpel/export/utils/BpelUtils.java	(original)
+++ branches/tools/eclipse/carbon-studio/1.0.0/bps/org.wso2.bpel.ide.export/src/org/wso2/wsf/ide/bpel/export/utils/BpelUtils.java	Sun Oct  9 02:40:43 2011
@@ -38,20 +38,32 @@
 import org.xml.sax.SAXException;
 
 public class BpelUtils {
+	private static final String DEPLOY_XML = "deploy.xml";
 	private static ICarbonStudioLog log=Logger.getLog(WSO2BPELPlugin.PLUGIN_ID);
-	public static boolean isProjectContainsBpel(IProject p){
+
+	public static boolean isProjectContainsBpel(IProject p) {
 		String prjPath = p.getLocation().toOSString();
 		File prjFolder = new File(prjPath);
-		List fileList = FileManagementUtil.getAllFilesPresentInFolder(prjFolder);
-
-		for(int i=0 ; i< fileList.size(); i++){
-
-				if(fileList.get(i).toString().toLowerCase().endsWith(".bpel")){
-					return true;				
- 			}
-
+		List fileList = FileManagementUtil
+				.getAllFilesPresentInFolder(prjFolder);
+		for (int i = 0; i < fileList.size(); i++) {
+			if (fileList.get(i).toString().toLowerCase().endsWith(".bpel")) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public static boolean isProjectContainsDeploymentDescriptor(IProject p) {
+		String prjPath = p.getLocation().toOSString();
+		File prjFolder = new File(prjPath);
+		List fileList = FileManagementUtil
+				.getAllFilesPresentInFolder(prjFolder);
+		for (int i = 0; i < fileList.size(); i++) {
+			if (DEPLOY_XML.toLowerCase().equalsIgnoreCase(fileList.get(i).toString())) {
+				return true;
+			}
 		}
-
 		return false;
 	}
 	

Modified: branches/tools/eclipse/carbon-studio/1.0.0/capp/org.wso2.carbonstudio.eclipse.capp.artifact.jaxws/src/org/wso2/carbonstudio/eclipse/capp/artifact/jaxws/utils/JaxWSArtifactBundleCreator.java
URL: http://wso2.org/svn/browse/wso2/branches/tools/eclipse/carbon-studio/1.0.0/capp/org.wso2.carbonstudio.eclipse.capp.artifact.jaxws/src/org/wso2/carbonstudio/eclipse/capp/artifact/jaxws/utils/JaxWSArtifactBundleCreator.java?rev=113631&r1=113630&r2=113631&view=diff
==============================================================================
--- branches/tools/eclipse/carbon-studio/1.0.0/capp/org.wso2.carbonstudio.eclipse.capp.artifact.jaxws/src/org/wso2/carbonstudio/eclipse/capp/artifact/jaxws/utils/JaxWSArtifactBundleCreator.java	(original)
+++ branches/tools/eclipse/carbon-studio/1.0.0/capp/org.wso2.carbonstudio.eclipse.capp.artifact.jaxws/src/org/wso2/carbonstudio/eclipse/capp/artifact/jaxws/utils/JaxWSArtifactBundleCreator.java	Sun Oct  9 02:40:43 2011
@@ -30,8 +30,8 @@
         FileUtils.copyDirectory(location, bundleContentPath);
     	IPath workspaceArtifactPath = new Path(location.toString()).append(getArtifact().getFile());
     	if ("jaxws".equalsIgnoreCase(workspaceArtifactPath.getFileExtension())){
-    		JaxWSArtifact axis2Artifact = new JaxWSArtifact(workspaceArtifactPath.toFile());
-    		File archive = axis2Artifact.getArtifact(true);
+    		JaxWSArtifact jaxwsArtifact = new JaxWSArtifact(workspaceArtifactPath.toFile());
+    		File archive = jaxwsArtifact.getArtifact(true);
     		File dst = new File(bundleContentPath,archive.getName());
     		dst.createNewFile();
 			FileUtils.copy(archive, dst);