Author: bfitzpat Date: 2011-09-28 16:36:01 -0400 (Wed, 28 Sep 2011) New Revision: 35136 Added: branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_410.java branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/project/ branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/project/core/ branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/project/core/comparator/ branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/project/core/comparator/ESBRuntimeVersionComparator.java Modified: branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/pom.xml branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_49.java branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.ui/pom.xml branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java Log: JBDS-1864- adding ESB 4.10 to the list of supported runtimes Modified: branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF 2011-09-28 20:09:29 UTC (rev 35135) +++ branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF 2011-09-28 20:36:01 UTC (rev 35136) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.jboss.tools.esb.project.core;singleton:=true -Bundle-Version: 1.4.0.qualifier +Bundle-Version: 1.4.1.qualifier Bundle-Localization: plugin Bundle-Activator: org.jboss.tools.esb.core.ESBProjectCorePlugin Require-Bundle: org.eclipse.ui, Modified: branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml =================================================================== --- branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml 2011-09-28 20:09:29 UTC (rev 35135) +++ branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml 2011-09-28 20:36:01 UTC (rev 35136) @@ -9,6 +9,9 @@ <label> JBoss ESB </label> + <version-comparator + class="org.jboss.tools.esb.project.core.comparator.ESBRuntimeVersionComparator"> + </version-comparator> </project-facet> <project-facet-version facet="jst.jboss.esb" @@ -136,6 +139,24 @@ </and> </constraint> </project-facet-version> + <project-facet-version + facet="jst.jboss.esb" + version="4.10"> + <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" @@ -165,7 +186,7 @@ <supported> <facet id="jst.jboss.esb" - version="4.2,4.3,4.4,4.5,4.6,4.7,4.9"> + version="4.2,4.3,4.4,4.5,4.6,4.7,4.9,4.10"> </facet> <runtime-component id="org.jboss.ide.eclipse.as.runtime.component" @@ -175,7 +196,7 @@ <supported> <facet id="jst.jboss.esb" - version="4.2,4.3,4.4,4.5,4.6,4.7,4.9"> + version="4.2,4.3,4.4,4.5,4.6,4.7,4.9,4.10"> </facet> <runtime-component id="org.jboss.ide.eclipse.eap.runtime.component" @@ -218,7 +239,7 @@ projects="true"> <moduleType types="jst.jboss.esb" - versions="4.2,4.3,4.4,4.5,4.6,4.7,4.9"> + versions="4.2,4.3,4.4,4.5,4.6,4.7,4.9,4.10"> </moduleType> </moduleFactory> </extension> @@ -317,6 +338,23 @@ id="org.jboss.ide.eclipse.as.runtime.60"> </supportedRuntimeType> </Resolver> + <Resolver + class="org.jboss.tools.esb.core.runtime.ESBRuntimeResolver_410" + esbVersion="4.10" + 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> Modified: branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/pom.xml =================================================================== --- branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/pom.xml 2011-09-28 20:09:29 UTC (rev 35135) +++ branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/pom.xml 2011-09-28 20:36:01 UTC (rev 35136) @@ -8,6 +8,6 @@ </parent> <groupId>org.jboss.tools.esb.plugins</groupId> <artifactId>org.jboss.tools.esb.project.core</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> Added: branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_410.java =================================================================== --- branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_410.java (rev 0) +++ branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_410.java 2011-09-28 20:36:01 UTC (rev 35136) @@ -0,0 +1,58 @@ +/******************************************************************************* + * Copyright (c) 2011 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_410 extends AbstractESBRuntimeResolver implements + IESBRuntimeResolver { + + private final static String JUDDI_CLIENT_JAR_31 = "juddi-client-3.1.0.jar"; + private final static String JUDDI_CLIENT_JAR_311 = "juddi-client-3.1.1.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(JUDDI_CLIENT_JAR_31) || jarNames.contains(JUDDI_CLIENT_JAR_311)); + } + + + 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.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_410.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_49.java =================================================================== --- branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_49.java 2011-09-28 20:09:29 UTC (rev 35135) +++ branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_49.java 2011-09-28 20:36:01 UTC (rev 35136) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Red Hat, Inc. + * Copyright (c) 2009, 2011 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, @@ -23,6 +23,8 @@ 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"; + private final static String JUDDI_CLIENT_JAR_303 = "juddi-client-3.0.3.jar"; + private final static String JUDDI_CLIENT_JAR_304 = "juddi-client-3.0.4.jar"; public boolean isValidESBRuntime(String location, String version, String configuration){ @@ -34,7 +36,8 @@ return jarNames.contains(ROSETTA_JAR) && jarNames.contains(CONFIG_MODEL_JAR_12) - && jarNames.contains(CONFIG_MODEL_JAR_13); + && jarNames.contains(CONFIG_MODEL_JAR_13) + && (jarNames.contains(JUDDI_CLIENT_JAR_303) || jarNames.contains(JUDDI_CLIENT_JAR_304)); } Added: branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/project/core/comparator/ESBRuntimeVersionComparator.java =================================================================== --- branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/project/core/comparator/ESBRuntimeVersionComparator.java (rev 0) +++ branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/project/core/comparator/ESBRuntimeVersionComparator.java 2011-09-28 20:36:01 UTC (rev 35136) @@ -0,0 +1,50 @@ +/******************************************************************************* + * Copyright (c) 2011 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.project.core.comparator; + +import java.util.Comparator; + +/** + * @author bfitzpat + * + */ +public class ESBRuntimeVersionComparator implements Comparator<String> { + + public int compare(String arg0, String arg1) { + Integer[] versions1 = parse(arg0, '.'); + Integer[] versions2 = parse(arg1, '.'); + if (versions1 != null && versions2 != null) { + int compareMajor = versions1[0].compareTo(versions2[0]); + int compareMinor = versions1[1].compareTo(versions2[1]); + if (compareMajor == 0) { + return compareMinor; + } else { + return compareMajor; + } + } + return 0; + } + + private Integer[] parse ( String input, char separator) { + if (input == null) + return null; + int pos = input.indexOf(separator); + String out1 = input.substring(0, pos); + String out2 = input.substring(pos + 1, input.length()); + if (out1 != null && out2 != null) { + Integer intOut1 = Integer.parseInt(out1); + Integer intOut2 = Integer.parseInt(out2); + return new Integer[]{intOut1, intOut2}; + } + return null; + } + +} Property changes on: branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/project/core/comparator/ESBRuntimeVersionComparator.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF 2011-09-28 20:09:29 UTC (rev 35135) +++ branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF 2011-09-28 20:36:01 UTC (rev 35136) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.tools.esb.project.ui;singleton:=true -Bundle-Version: 1.4.0.qualifier +Bundle-Version: 1.4.1.qualifier Bundle-Activator: org.jboss.tools.esb.project.ui.ESBProjectPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, Modified: branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.ui/pom.xml =================================================================== --- branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.ui/pom.xml 2011-09-28 20:09:29 UTC (rev 35135) +++ branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.ui/pom.xml 2011-09-28 20:36:01 UTC (rev 35136) @@ -8,6 +8,6 @@ </parent> <groupId>org.jboss.tools.esb.plugins</groupId> <artifactId>org.jboss.tools.esb.project.ui</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> Modified: branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java =================================================================== --- branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2011-09-28 20:09:29 UTC (rev 35135) +++ branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2011-09-28 20:36:01 UTC (rev 35136) @@ -636,7 +636,7 @@ if(versionNumber >= 4.7){ cmVersions.add("1.2.0"); //$NON-NLS-1$ } - if(versionNumber >= 4.9){ + if(versionNumber >= 4.9 || versionNumber == 4.10){ cmVersions.add("1.3.0"); //$NON-NLS-1$ } int index = cmVersions.getItemCount() - 1;