[jbosstools-commits] JBoss Tools SVN: r11386 - in branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core: facet and 1 other directories.

Author: dennyxu Date: 2008-10-31 04:10:24 -0400 (Fri, 31 Oct 2008) New Revision: 11386 Modified: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectConstant.java branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetDataModelProvider.java branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java Log: JBIDE-3079:Deployment does not work for the ESB project which is imported from other workspace Modified: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectConstant.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectConstant.java 2008-10-31 06:08:05 UTC (rev 11385) +++ branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectConstant.java 2008-10-31 08:10:24 UTC (rev 11386) @@ -12,7 +12,7 @@ public final static String ESB_CONFIG_QUEUE_SERVICE_JBM = "jbm-queue-service.xml"; public final static String ESB_CONFIG_QUEUE_SERVICE_JBMQ = "jbmq-queue-service.xml"; - public final static String DEFAULT_ESB_CONFIG_RESOURCE_FOLDER = "resources"; + public final static String DEFAULT_ESB_CONFIG_RESOURCE_FOLDER = "esbcontent"; public final static String DEFAULT_ESB_SOURCE_FOLDER = "src"; public final static String ESB_PROJECT_NATURE = "org.jboss.tools.esb.project.ESBNature"; Modified: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetDataModelProvider.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetDataModelProvider.java 2008-10-31 06:08:05 UTC (rev 11385) +++ branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetDataModelProvider.java 2008-10-31 08:10:24 UTC (rev 11386) @@ -29,7 +29,7 @@ return JBOSSESB_PROJECT_FACET; } else if(IJBossESBFacetDataModelProperties.ESB_CONTENT_FOLDER.equals(propertyName)){ - return "esbcontent";//ESBProjectConstant.DEFAULT_ESB_CONFIG_RESOURCE_FOLDER; + return ESBProjectConstant.DEFAULT_ESB_CONFIG_RESOURCE_FOLDER; } else if(IJBossESBFacetDataModelProperties.ESB_SOURCE_FOLDER.equals(propertyName)){ return ESBProjectConstant.DEFAULT_ESB_SOURCE_FOLDER; Modified: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java 2008-10-31 06:08:05 UTC (rev 11385) +++ branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java 2008-10-31 08:10:24 UTC (rev 11386) @@ -36,6 +36,9 @@ public IModuleResource[] members() throws CoreException { IProject project = getProject(); String esbFolder = (String)project.getPersistentProperty(IJBossESBFacetDataModelProperties.QNAME_ESB_CONTENT_FOLDER); + if(esbFolder == null || "".equals(esbFolder)){ + esbFolder = ESBProjectConstant.DEFAULT_ESB_CONFIG_RESOURCE_FOLDER; + } IFolder configFolder = project.getFolder(esbFolder); IJavaProject javaPrj = JavaCore.create(project); IPath output = javaPrj.getOutputLocation();