11:30 a.m.
Author: bfitzpat
Date: 2010-08-25 12:30:47 -0400 (Wed, 25 Aug 2010)
New Revision: 24435
Added:
branches/jbosstools-3.2.0.M2/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_49.java
Modified:
branches/jbosstools-3.2.0.M2/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml
branches/jbosstools-3.2.0.M2/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java
Log:
OPEN - issue JBIDE-6908: Can't create an ESB project with ESB 4.9 specified
https://jira.jboss.org/browse/JBIDE-6908
Modified:
branches/jbosstools-3.2.0.M2/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml
===================================================================
---
branches/jbosstools-3.2.0.M2/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml 2010-08-25
15:44:48 UTC (rev 24434)
+++
branches/jbosstools-3.2.0.M2/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml 2010-08-25
16:30:47 UTC (rev 24435)
@@ -118,6 +118,24 @@
</and>
</constraint>
</project-facet-version>
+ <project-facet-version
+ facet="jst.jboss.esb"
+ version="4.9">
+ <group-member
+ id="modules">
+ </group-member>
+ <constraint>
+ <and>
+ <conflicts
+ group="modules">
+ </conflicts>
+ <requires
+ facet="jst.java"
+ version="[5.0">
+ </requires>
+ </and>
+ </constraint>
+ </project-facet-version>
<action
facet="jst.jboss.esb"
id="jst.jboss.esb.install"
@@ -147,7 +165,7 @@
<supported>
<facet
id="jst.jboss.esb"
- version="4.2,4.3,4.4,4.5,4.6,4.7">
+ version="4.2,4.3,4.4,4.5,4.6,4.7,4.9">
</facet>
<runtime-component
id="org.jboss.ide.eclipse.as.runtime.component"
@@ -157,7 +175,7 @@
<supported>
<facet
id="jst.jboss.esb"
- version="4.2,4.3,4.4,4.5,4.6,4.7">
+ version="4.2,4.3,4.4,4.5,4.6,4.7,4.9">
</facet>
<runtime-component
id="org.jboss.ide.eclipse.eap.runtime.component"
@@ -200,7 +218,7 @@
projects="true">
<moduleType
types="jst.jboss.esb"
- versions="4.2,4.3,4.4,4.5,4.6,4.7">
+ versions="4.2,4.3,4.4,4.5,4.6,4.7,4.9">
</moduleType>
</moduleFactory>
</extension>
@@ -282,6 +300,23 @@
id="org.jboss.ide.eclipse.as.runtime.51">
</supportedRuntimeType>
</Resolver>
+ <Resolver
+ class="org.jboss.tools.esb.core.runtime.ESBRuntimeResolver_49"
+ esbVersion="4.9"
+ name="ESB runtime resolver">
+ <supportedRuntimeType
+ id="org.jboss.ide.eclipse.as.runtime.eap.51">
+ </supportedRuntimeType>
+ <supportedRuntimeType
+ id="org.jboss.ide.eclipse.as.runtime.50">
+ </supportedRuntimeType>
+ <supportedRuntimeType
+ id="org.jboss.ide.eclipse.as.runtime.51">
+ </supportedRuntimeType>
+ <supportedRuntimeType
+ id="org.jboss.ide.eclipse.as.runtime.60">
+ </supportedRuntimeType>
+ </Resolver>
</extension>
</plugin>
Added:
branches/jbosstools-3.2.0.M2/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_49.java
===================================================================
---
branches/jbosstools-3.2.0.M2/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_49.java
(rev 0)
+++
branches/jbosstools-3.2.0.M2/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_49.java 2010-08-25
16:30:47 UTC (rev 24435)
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.esb.core.runtime;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
+
+public class ESBRuntimeResolver_49 extends AbstractESBRuntimeResolver implements
+ IESBRuntimeResolver {
+
+ private final static String CONFIG_MODEL_JAR_12 =
"jbossesb-config-model-1.2.0.jar";
+ private final static String CONFIG_MODEL_JAR_13 =
"jbossesb-config-model-1.3.0.jar";
+
+
+ public boolean isValidESBRuntime(String location, String version, String
configuration){
+ List<String> jarNames = new ArrayList<String>();
+
+ for(File file : getAllRuntimeJars(location, configuration)){
+ jarNames.add(file.getName());
+ }
+
+ return jarNames.contains(ROSETTA_JAR)
+ && jarNames.contains(CONFIG_MODEL_JAR_12)
+ && jarNames.contains(CONFIG_MODEL_JAR_13);
+ }
+
+
+ public List<IPath> getJarDirectories(String runtimeLocation, String configuration)
{
+ List<IPath> directories = super.getJarDirectories(runtimeLocation,
configuration);
+ IPath rtHome = new Path(runtimeLocation);
+ IPath soapDeployPath = rtHome.append(SOAP_AS_LOCATION)
+ .append(IJBossRuntimeResourceConstants.SERVER).append(configuration)
+ .append(IJBossRuntimeResourceConstants.DEPLOYERS)
+ .append("esb.deployer").append("lib");
+
+ IPath deployPath = rtHome
+ .append(IJBossRuntimeResourceConstants.SERVER).append(configuration)
+ .append(IJBossRuntimeResourceConstants.DEPLOYERS)
+ .append("esb.deployer").append("lib");
+ directories.add(soapDeployPath);
+ directories.add(deployPath);
+
+ return directories;
+ }
+
+
+}
Property changes on:
branches/jbosstools-3.2.0.M2/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_49.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified:
branches/jbosstools-3.2.0.M2/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java
===================================================================
---
branches/jbosstools-3.2.0.M2/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2010-08-25
15:44:48 UTC (rev 24434)
+++
branches/jbosstools-3.2.0.M2/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2010-08-25
16:30:47 UTC (rev 24435)
@@ -636,6 +636,9 @@
if(versionNumber >= 4.7){
cmVersions.add("1.2.0"); //$NON-NLS-1$
}
+ if(versionNumber >= 4.9){
+ cmVersions.add("1.3.0"); //$NON-NLS-1$
+ }
int index = cmVersions.getItemCount() - 1;
String convigVersionName = cmVersions.getItem(index);
cmVersions.select(index);