JBoss Tools SVN: r44668 - tags.
by jbosstools-commits＠lists.jboss.org
Author: dpalmer
Date: 2013-01-28 09:50:38 -0500 (Mon, 28 Jan 2013)
New Revision: 44668
Added:
tags/soatools-3.3.3.Final/
Log:
Tagging for SOA tools 3.3.3.Final release
11 years, 11 months
- 1
- 0
JBoss Tools SVN: r44667 - in branches/jbosstools-3.3.x/build/aggregate/soa-site: plugins/org.jboss.tools.central.discovery.soa-tooling and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dpalmer
Date: 2013-01-28 09:05:30 -0500 (Mon, 28 Jan 2013)
New Revision: 44667
Modified:
branches/jbosstools-3.3.x/build/aggregate/soa-site/features/org.jboss.tools.central.discovery.soa-tooling.feature/feature.xml
branches/jbosstools-3.3.x/build/aggregate/soa-site/features/org.jboss.tools.central.discovery.soa-tooling.feature/pom.xml
branches/jbosstools-3.3.x/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/pom.xml
Log:
Updated central version numbers
Modified: branches/jbosstools-3.3.x/build/aggregate/soa-site/features/org.jboss.tools.central.discovery.soa-tooling.feature/feature.xml
===================================================================
--- branches/jbosstools-3.3.x/build/aggregate/soa-site/features/org.jboss.tools.central.discovery.soa-tooling.feature/feature.xml 2013-01-25 22:10:23 UTC (rev 44666)
+++ branches/jbosstools-3.3.x/build/aggregate/soa-site/features/org.jboss.tools.central.discovery.soa-tooling.feature/feature.xml 2013-01-28 14:05:30 UTC (rev 44667)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.central.discovery.soa-tooling.feature" label="%featureName" version="1.0.0.qualifier" provider-name="%featureName">
+<feature id="org.jboss.tools.central.discovery.soa-tooling.feature" label="%featureName" version="1.0.3.qualifier" provider-name="%featureName">
<description>
%description
</description>
Modified: branches/jbosstools-3.3.x/build/aggregate/soa-site/features/org.jboss.tools.central.discovery.soa-tooling.feature/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/build/aggregate/soa-site/features/org.jboss.tools.central.discovery.soa-tooling.feature/pom.xml 2013-01-25 22:10:23 UTC (rev 44666)
+++ branches/jbosstools-3.3.x/build/aggregate/soa-site/features/org.jboss.tools.central.discovery.soa-tooling.feature/pom.xml 2013-01-28 14:05:30 UTC (rev 44667)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.central.discovery.soa-tooling.feature</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.3-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
Modified: branches/jbosstools-3.3.x/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/META-INF/MANIFEST.MF 2013-01-25 22:10:23 UTC (rev 44666)
+++ branches/jbosstools-3.3.x/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/META-INF/MANIFEST.MF 2013-01-28 14:05:30 UTC (rev 44667)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %BundleVendor
Bundle-SymbolicName: org.jboss.tools.central.discovery.soa-tooling;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.3.qualifier
Require-Bundle: org.jboss.tools.central,
org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.core.runtime,
Modified: branches/jbosstools-3.3.x/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/pom.xml 2013-01-25 22:10:23 UTC (rev 44666)
+++ branches/jbosstools-3.3.x/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/pom.xml 2013-01-28 14:05:30 UTC (rev 44667)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.central.discovery.soa-tooling</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.3-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
11 years, 11 months
- 1
- 0
JBoss Tools SVN: r44666 - tags.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2013-01-25 17:10:23 -0500 (Fri, 25 Jan 2013)
New Revision: 44666
Added:
tags/jbosstools-3.3.2.Final/
Log:
tag for 3.3.2.Final
11 years, 11 months
- 1
- 0
JBoss Tools SVN: r44665 - in branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui: wizards/pages and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2013-01-25 11:46:15 -0500 (Fri, 25 Jan 2013)
New Revision: 44665
Modified:
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java
Log:
JBIDE-11774 - Fixing grammar error and resetting message on facet install page (3.3.x)
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties 2013-01-24 23:13:20 UTC (rev 44664)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties 2013-01-25 16:46:15 UTC (rev 44665)
@@ -62,7 +62,7 @@
ESBFacetInstallationPage_Error_Message_Invalid_ESB_Runtime=The specified target runtime does not contain a valid ESB {0} runtime .
ESBFacetInstallationPage_Error_Message_No_Target_Runtime=No target runtime was specified.
ESBFacetInstallationPage_Error_Message_Specify_Content_Folder=Please specify a valid content folder.
-ESBFacetInstallationPage_Error_Message_Specify_ESB_Runtime=Please specify a ESB runtime
+ESBFacetInstallationPage_Error_Message_Specify_ESB_Runtime=Please specify an ESB runtime
ESBFacetInstallationPage_Error_Message_Specify_Source_Folder=Please specify a valid source folder.
ESBFacetInstallationPage_Group_Runtime_Text=JBoss ESB Runtime
ESBFacetInstallationPage_Group_Text_Folder=Project Folders
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2013-01-24 23:13:20 UTC (rev 44664)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2013-01-25 16:46:15 UTC (rev 44665)
@@ -524,6 +524,7 @@
setErrorMessage(JBossESBUIMessages.ESBFacetInstallationPage_Error_Message_Specify_ESB_Runtime);
setPageComplete(isPageComplete());
}else if(btnServerSupplied.getSelection() && !checkServerSuppliedESBRuntime()){
+ setErrorMessage(null);
return;
}else{
setErrorMessage(null);
11 years, 11 months
- 1
- 0
JBoss Tools SVN: r44664 - in branches/jbosstools-3.3.x/esb/plugins: org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2013-01-24 18:13:20 -0500 (Thu, 24 Jan 2013)
New Revision: 44664
Modified:
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/messages/JBossFacetCore.properties
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/messages/JBossFacetCoreMessages.java
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_47.java
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java
Log:
JBDS-2448 - Updating 3.3.x stream with additional ESB version warning/error messages
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/messages/JBossFacetCore.properties
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/messages/JBossFacetCore.properties 2013-01-24 17:56:15 UTC (rev 44663)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/messages/JBossFacetCore.properties 2013-01-24 23:13:20 UTC (rev 44664)
@@ -1,5 +1,6 @@
Error_Copy=Exception while copying runtime jars: {0}
-Warning_No_Exact_ESB_Runtime_Match=No exact match found for ESB runtime version {0}. Assuming compatible with latest version\: {1}.
+Warning_No_Exact_ESB_Runtime_Match=Selected runtime supports ESB version {0}. Assuming compatible with version\: {1}.
+Error_Version_Not_Supported=ESB version {0} is not supported on the specified runtime.
# START NON-TRANSLATABLE
ESB_Location=jbossesbruntimelocation
# END NON-TRANSLATABLE
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/messages/JBossFacetCoreMessages.java
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/messages/JBossFacetCoreMessages.java 2013-01-24 17:56:15 UTC (rev 44663)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/messages/JBossFacetCoreMessages.java 2013-01-24 23:13:20 UTC (rev 44664)
@@ -30,6 +30,7 @@
public static String Error_Add_Facet_JBossESB;
public static String Error_Remove_Facet_JBossESB;
public static String Warning_No_Exact_ESB_Runtime_Match;
+ public static String Error_Version_Not_Supported;
static {
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_47.java
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_47.java 2013-01-24 17:56:15 UTC (rev 44663)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_47.java 2013-01-24 23:13:20 UTC (rev 44664)
@@ -23,6 +23,7 @@
private final static String CONFIG_MODEL_JAR_11 = "jbossesb-config-model-1.1.0.jar";
private final static String CONFIG_MODEL_JAR_12 = "jbossesb-config-model-1.2.0.jar";
+ private final static String JUDDI_CLIENT_JAR_301 = "juddi-client-3.0.1.jar";
public boolean isValidESBRuntime(String location, String version, String configuration){
@@ -33,6 +34,7 @@
}
return jarNames.contains(ROSETTA_JAR)
+ && jarNames.contains(JUDDI_CLIENT_JAR_301)
&& jarNames.contains(CONFIG_MODEL_JAR_11)
&& jarNames.contains(CONFIG_MODEL_JAR_12);
}
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java 2013-01-24 17:56:15 UTC (rev 44663)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java 2013-01-24 23:13:20 UTC (rev 44664)
@@ -562,21 +562,7 @@
}
JBossESBRuntime jarJbws = (JBossESBRuntime) jars.getValue();
- if (current != null
- && current.getName().equals(name.getValueAsString())
- && current.getHomeDir().equals(homeDir.getValueAsString())
- && current.getVersion().equals(version.getValueAsString())
- && current.isUserConfigClasspath() == jarJbws
- .isUserConfigClasspath()
- && current.getConfiguration().equals(configuration.getText())
- && (!jarJbws.isUserConfigClasspath() || hasSameLibraies(
- current.getLibraries(), jarJbws.getLibraries()))) {
- setErrorMessage(null);
- setPageComplete(false);
- return;
- }
-
if (jarJbws.isUserConfigClasspath()
&& jarJbws.getLibraries().size() == 0) {
setErrorMessage(JBossESBUIMessages.JBossRuntimeListFieldEditor_ErrorMessageAtLeastOneJar);
@@ -592,28 +578,16 @@
}
if (!runtimeExist(homeDir.getValueAsString(), (String)version.getValue(), configuration.getText())) {
- final Combo vCombo = (Combo)this.version.getEditorControls()[1];
- String[] vStrings = vCombo.getItems();
- for( int i = 0; i < vStrings.length; i++ ) {
- boolean works = runtimeExist(homeDir.getValueAsString(), vStrings[i], configuration.getText());
- if( works ) {
- final String newVersion = vStrings[i];
- final int i2 = i;
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- vCombo.select(i2);
- version.setValue(newVersion);
- }
- });
- return;
- }
- }
- setErrorMessage(NLS.bind(JBossESBUIMessages.Label_JBoss_Runtime_Load_Error, version.getValue()));
+ String[] boundStrings = new String[]{version.getValueAsString()};
+ String message = NLS.bind(
+ JBossFacetCoreMessages.Error_Version_Not_Supported, boundStrings);
+ setErrorMessage(message);
setPageComplete(false);
return;
}
setErrorMessage(null);
+ setMessage(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Create_A_Runtime);
// validate version matches what's in the runtime zip or show warning
String homeLocation = homeDir.getValueAsString();
11 years, 11 months
- 1
- 0
JBoss Tools SVN: r44663 - in branches/jbosstools-3.3.x/esb: tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.3 and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2013-01-24 12:56:15 -0500 (Thu, 24 Jan 2013)
New Revision: 44663
Added:
branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.3/jboss-esb-client.xml
Modified:
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java
Log:
JBIDE-13381 ESB Editor removes "http-client-property" property
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2013-01-21 13:32:52 UTC (rev 44662)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2013-01-24 17:56:15 UTC (rev 44663)
@@ -1953,6 +1953,7 @@
XMLSUBPATH="action" name="ESBPreActionSOAPClient120">
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
+ <XChildEntity name="ESBPreClientProp"/>
</XChildrenEntities>
<XEntityRenderer>
<ICONS>
@@ -1986,9 +1987,16 @@
name="params location" xmlname="paramsLocation"/>
<XModelAttribute PROPERTIES="pre=true;category=advanced"
name="response location" xmlname="responseLocation"/>
+ <XModelAttribute PROPERTIES="category=advanced" name="endpoint url" xmlname="endpointUrl"/>
+ <XModelAttribute PROPERTIES="category=general" name="file" xmlname="file">
+ <Constraint loader="Tree">
+ <value name="ESBResourceTree"/>
+ <value name="extensions=properties"/>
+ <value name="linkAction=OpenConfig"/>
+ </Constraint>
+ <Editor name="TreeChooser"/>
+ </XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced;pre=true"
- name="endpoint url" xmlname="endpointUrl"/>
- <XModelAttribute PROPERTIES="category=advanced;pre=true"
name="response as ognl map" xmlname="responseAsOgnlMap">
<Constraint loader="ListString">
<value/>
@@ -2019,6 +2027,14 @@
<AttributeData AttributeName="value" Mandatory="no"/>
</EntityData>
</XActionItem>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Add HTTP Client Property..." kind="action" name="AddClientProp">
+ <EntityData EntityName="ESBPreClientProp">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="value" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
</XActionItem>
<XActionItemReference entity="ESBProperty" name="CopyActions"/>
<XActionItemReference entity="ESBProperty" name="DeleteActions"/>
Added: branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.3/jboss-esb-client.xml
===================================================================
--- branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.3/jboss-esb-client.xml (rev 0)
+++ branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.3/jboss-esb-client.xml 2013-01-24 17:56:15 UTC (rev 44663)
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<jbossesb parameterReloadSecs="5"
+ xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml..."
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml... http://anonsvn.jboss.org/repos/labs/labs/jbossesb/trunk/product/etc/schem...">
+ <services>
+ <service category="c1" description="d1" name="s1">
+ <actions>
+ <action class="org.jboss.soa.esb.actions.soap.SOAPClient" name="client">
+ <property name="wsdl" value="someWsdl"/>
+ <property name="SOAPAction" value="noAction"/>
+ <property name="endpointUrl" value="http://host/servername">
+ <http-client-property name="file" value="httpclient.properties"/>
+ </property>
+ </action>
+ </actions>
+ </service>
+ </services>
+</jbossesb>
Property changes on: branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.3/jboss-esb-client.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java
===================================================================
--- branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java 2013-01-21 13:32:52 UTC (rev 44662)
+++ branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java 2013-01-24 17:56:15 UTC (rev 44663)
@@ -516,6 +516,22 @@
assertTrue(errorList.toString(), errorList.length() == 0);
}
+ public void testSoapClient() {
+ XModelObject object = getFileObject("esb-1.3", "jboss-esb-client.xml", ESBConstants.ENT_ESB_FILE_131);
+
+ StringBuffer errorList = new StringBuffer();
+
+ String cbrWiretapPath = "Services/s1/Actions/client";
+
+ String[][] clientAttrValues = {
+ {"endpoint url", "http://host/servername"},
+ {"file", "httpclient.properties"},
+ };
+ checkAttributes(object, cbrWiretapPath, clientAttrValues, errorList);
+
+ assertTrue(errorList.toString(), errorList.length() == 0);
+ }
+
XModelObject getFileObject(String parentPath, String xmlname) {
return getFileObject(parentPath, xmlname, ESBConstants.ENT_ESB_FILE_101);
}
11 years, 11 months
- 1
- 0
JBoss Tools SVN: r44662 - branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: mmalina
Date: 2013-01-21 08:32:52 -0500 (Mon, 21 Jan 2013)
New Revision: 44662
Modified:
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml
Log:
AS module got bumped, so fixing the dependency in as bot test
Modified: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml 2013-01-18 22:52:17 UTC (rev 44661)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml 2013-01-21 13:32:52 UTC (rev 44662)
@@ -5,10 +5,11 @@
<parent>
<groupId>org.jboss.tools.as</groupId>
<artifactId>tests</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.as.tests</groupId>
<artifactId>org.jboss.ide.eclipse.as.ui.bot.test</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
11 years, 11 months
- 1
- 0
JBoss Tools SVN: r44661 - branches/jbosstools-3.3.x/build/aggregate/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2013-01-18 17:52:17 -0500 (Fri, 18 Jan 2013)
New Revision: 44661
Modified:
branches/jbosstools-3.3.x/build/aggregate/site/associate.properties
Log:
use latest indigo comp req mirror, not specifically SR2 version (so that we can move up to SR2a automatically)
Modified: branches/jbosstools-3.3.x/build/aggregate/site/associate.properties
===================================================================
--- branches/jbosstools-3.3.x/build/aggregate/site/associate.properties 2013-01-18 21:46:32 UTC (rev 44660)
+++ branches/jbosstools-3.3.x/build/aggregate/site/associate.properties 2013-01-18 22:52:17 UTC (rev 44661)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR2/
+associate.sites=http://download.jboss.org/jbosstools/updates/indigo/
11 years, 11 months
- 1
- 0
JBoss Tools SVN: r44660 - in branches/jbosstools-3.3.x/openshift: features and 19 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2013-01-18 16:46:32 -0500 (Fri, 18 Jan 2013)
New Revision: 44660
Modified:
branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.egit.integration.feature/feature.xml
branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.egit.integration.feature/pom.xml
branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.egit.integration.test.feature/feature.xml
branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.egit.integration.test.feature/pom.xml
branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.express.feature/feature.xml
branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.express.feature/pom.xml
branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.express.test.feature/feature.xml
branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.express.test.feature/pom.xml
branches/jbosstools-3.3.x/openshift/features/pom.xml
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.core/pom.xml
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.ui/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.ui/pom.xml
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.client/pom.xml
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/pom.xml
branches/jbosstools-3.3.x/openshift/plugins/pom.xml
branches/jbosstools-3.3.x/openshift/pom.xml
branches/jbosstools-3.3.x/openshift/site/pom.xml
branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.egit.test/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.egit.test/pom.xml
branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.express.test/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.express.test/pom.xml
branches/jbosstools-3.3.x/openshift/tests/pom.xml
Log:
JBIDE-13392 bump feature/plugin versions to 2.3.2
Modified: branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.egit.integration.feature/feature.xml
===================================================================
--- branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.egit.integration.feature/feature.xml 2013-01-17 20:09:42 UTC (rev 44659)
+++ branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.egit.integration.feature/feature.xml 2013-01-18 21:46:32 UTC (rev 44660)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.openshift.egit.integration.feature" label="%featureName" version="2.3.1.qualifier" provider-name="%providerName">
+<feature id="org.jboss.tools.openshift.egit.integration.feature" label="%featureName" version="2.3.2.qualifier" provider-name="%providerName">
<description url="http://www.jboss.org/tools">
%description
Modified: branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.egit.integration.feature/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.egit.integration.feature/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
+++ branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.egit.integration.feature/pom.xml 2013-01-18 21:46:32 UTC (rev 44660)
@@ -4,11 +4,11 @@
<parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>features</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift.features</groupId>
<artifactId>org.jboss.tools.openshift.egit.integration.feature</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
Modified: branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.egit.integration.test.feature/feature.xml
===================================================================
--- branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.egit.integration.test.feature/feature.xml 2013-01-17 20:09:42 UTC (rev 44659)
+++ branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.egit.integration.test.feature/feature.xml 2013-01-18 21:46:32 UTC (rev 44660)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.openshift.egit.integration.test.feature" label="%featureName" version="2.3.1.qualifier" provider-name="%providerName">
+<feature id="org.jboss.tools.openshift.egit.integration.test.feature" label="%featureName" version="2.3.2.qualifier" provider-name="%providerName">
<description url="%descriptionURL">
%description
Modified: branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.egit.integration.test.feature/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.egit.integration.test.feature/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
+++ branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.egit.integration.test.feature/pom.xml 2013-01-18 21:46:32 UTC (rev 44660)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>features</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift.features</groupId>
<artifactId>org.jboss.tools.openshift.egit.integration.test.feature</artifactId>
Modified: branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.express.feature/feature.xml
===================================================================
--- branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.express.feature/feature.xml 2013-01-17 20:09:42 UTC (rev 44659)
+++ branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.express.feature/feature.xml 2013-01-18 21:46:32 UTC (rev 44660)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.openshift.express.feature" label="%featureName" version="2.3.1.qualifier" provider-name="%providerName" plugin="org.jboss.tools.openshift.express.ui">
+<feature id="org.jboss.tools.openshift.express.feature" label="%featureName" version="2.3.2.qualifier" provider-name="%providerName" plugin="org.jboss.tools.openshift.express.ui">
<description url="http://www.jboss.org/tools">
%description
Modified: branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.express.feature/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.express.feature/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
+++ branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.express.feature/pom.xml 2013-01-18 21:46:32 UTC (rev 44660)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>features</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift.features</groupId>
<artifactId>org.jboss.tools.openshift.express.feature</artifactId>
Modified: branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.express.test.feature/feature.xml
===================================================================
--- branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.express.test.feature/feature.xml 2013-01-17 20:09:42 UTC (rev 44659)
+++ branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.express.test.feature/feature.xml 2013-01-18 21:46:32 UTC (rev 44660)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.openshift.express.test.feature" label="%featureName" version="2.3.1.qualifier" provider-name="%providerName">
+<feature id="org.jboss.tools.openshift.express.test.feature" label="%featureName" version="2.3.2.qualifier" provider-name="%providerName">
<description url="%descriptionURL">
%description
Modified: branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.express.test.feature/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.express.test.feature/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
+++ branches/jbosstools-3.3.x/openshift/features/org.jboss.tools.openshift.express.test.feature/pom.xml 2013-01-18 21:46:32 UTC (rev 44660)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>features</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift.features</groupId>
<artifactId>org.jboss.tools.openshift.express.test.feature</artifactId>
Modified: branches/jbosstools-3.3.x/openshift/features/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/openshift/features/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
+++ branches/jbosstools-3.3.x/openshift/features/pom.xml 2013-01-18 21:46:32 UTC (rev 44660)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>openshift</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>features</artifactId>
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF 2013-01-17 20:09:42 UTC (rev 44659)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF 2013-01-18 21:46:32 UTC (rev 44660)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: EGit Core
Bundle-SymbolicName: org.jboss.tools.openshift.egit.core;singleton:=true
-Bundle-Version: 2.3.1.qualifier
+Bundle-Version: 2.3.2.qualifier
Bundle-Activator: org.jboss.tools.openshift.egit.core.internal.EGitCoreActivator
Require-Bundle: org.jboss.ide.eclipse.as.core;bundle-version="2.3.0",
org.eclipse.jgit;bundle-version="1.1.0",
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.core/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.core/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.core/pom.xml 2013-01-18 21:46:32 UTC (rev 44660)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>plugins</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift.plugins</groupId>
<artifactId>org.jboss.tools.openshift.egit.core</artifactId>
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.ui/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.ui/META-INF/MANIFEST.MF 2013-01-17 20:09:42 UTC (rev 44659)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.ui/META-INF/MANIFEST.MF 2013-01-18 21:46:32 UTC (rev 44660)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: EGit integration UI
Bundle-SymbolicName: org.jboss.tools.openshift.egit.ui;singleton:=true
-Bundle-Version: 2.3.1.qualifier
+Bundle-Version: 2.3.2.qualifier
Bundle-Activator: org.jboss.tools.openshift.egit.ui.EGitUIActivator
Require-Bundle: org.jboss.tools.openshift.egit.core;bundle-version="[2.3.0,3.0.0)",
org.eclipse.egit.core;bundle-version="1.0.0",
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.ui/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.ui/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.ui/pom.xml 2013-01-18 21:46:32 UTC (rev 44660)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>plugins</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift.plugins</groupId>
<artifactId>org.jboss.tools.openshift.egit.ui</artifactId>
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF 2013-01-17 20:09:42 UTC (rev 44659)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF 2013-01-18 21:46:32 UTC (rev 44660)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Client
Bundle-SymbolicName: org.jboss.tools.openshift.express.client
-Bundle-Version: 2.3.1.qualifier
+Bundle-Version: 2.3.2.qualifier
Bundle-Vendor: JBoss by Red Hat
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .,
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.client/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.client/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.client/pom.xml 2013-01-18 21:46:32 UTC (rev 44660)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>plugins</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift.plugins</groupId>
<artifactId>org.jboss.tools.openshift.express.client</artifactId>
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2013-01-17 20:09:42 UTC (rev 44659)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2013-01-18 21:46:32 UTC (rev 44660)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: OpenShift UI
Bundle-SymbolicName: org.jboss.tools.openshift.express.ui;singleton:=true
-Bundle-Version: 2.3.1.qualifier
+Bundle-Version: 2.3.2.qualifier
Bundle-Localization: plugin
Bundle-Activator: org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator
Require-Bundle: org.jboss.tools.openshift.express.client;bundle-version="2.3.0",
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/pom.xml 2013-01-18 21:46:32 UTC (rev 44660)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>plugins</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift.plugins</groupId>
<artifactId>org.jboss.tools.openshift.express.ui</artifactId>
Modified: branches/jbosstools-3.3.x/openshift/plugins/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
+++ branches/jbosstools-3.3.x/openshift/plugins/pom.xml 2013-01-18 21:46:32 UTC (rev 44660)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>openshift</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>plugins</artifactId>
Modified: branches/jbosstools-3.3.x/openshift/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/openshift/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
+++ branches/jbosstools-3.3.x/openshift/pom.xml 2013-01-18 21:46:32 UTC (rev 44660)
@@ -10,7 +10,7 @@
<groupId>org.jboss.tools</groupId>
<artifactId>openshift</artifactId>
<name>openshift.all</name>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>plugins</module>
Modified: branches/jbosstools-3.3.x/openshift/site/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/openshift/site/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
+++ branches/jbosstools-3.3.x/openshift/site/pom.xml 2013-01-18 21:46:32 UTC (rev 44660)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>openshift</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>openshift.site</artifactId>
Modified: branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.egit.test/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.egit.test/META-INF/MANIFEST.MF 2013-01-17 20:09:42 UTC (rev 44659)
+++ branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.egit.test/META-INF/MANIFEST.MF 2013-01-18 21:46:32 UTC (rev 44660)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: EGit Tests
Bundle-SymbolicName: org.jboss.tools.openshift.egit.test
-Bundle-Version: 2.3.1.qualifier
+Bundle-Version: 2.3.2.qualifier
Bundle-Activator: org.jboss.tools.openshift.egit.internal.test.EGitTestActivator
Bundle-Vendor: JBoss by Red Hat
Require-Bundle: org.eclipse.egit.core;bundle-version="1.0.0",
Modified: branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.egit.test/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.egit.test/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
+++ branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.egit.test/pom.xml 2013-01-18 21:46:32 UTC (rev 44660)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>tests</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift.tests</groupId>
<artifactId>org.jboss.tools.openshift.egit.test</artifactId>
Modified: branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.express.test/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.express.test/META-INF/MANIFEST.MF 2013-01-17 20:09:42 UTC (rev 44659)
+++ branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.express.test/META-INF/MANIFEST.MF 2013-01-18 21:46:32 UTC (rev 44660)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: OpenShift Test
Bundle-SymbolicName: org.jboss.tools.openshift.express.test
-Bundle-Version: 2.3.1.qualifier
+Bundle-Version: 2.3.2.qualifier
Bundle-Vendor: JBoss by Red Hat
Require-Bundle: org.jboss.tools.openshift.express.ui;bundle-version="2.3.0",
org.jboss.tools.openshift.express.client;bundle-version="2.3.0",
Modified: branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.express.test/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.express.test/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
+++ branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.express.test/pom.xml 2013-01-18 21:46:32 UTC (rev 44660)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>tests</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift.tests</groupId>
<artifactId>org.jboss.tools.openshift.express.test</artifactId>
Modified: branches/jbosstools-3.3.x/openshift/tests/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/openshift/tests/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
+++ branches/jbosstools-3.3.x/openshift/tests/pom.xml 2013-01-18 21:46:32 UTC (rev 44660)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>openshift</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>tests</artifactId>
11 years, 11 months
- 1
- 0
JBoss Tools SVN: r44659 - in branches/jbosstools-3.3.x/esb: features and 27 other directories.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2013-01-17 15:09:42 -0500 (Thu, 17 Jan 2013)
New Revision: 44659
Added:
branches/jbosstools-3.3.x/esb/.project
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_412.java
Modified:
branches/jbosstools-3.3.x/esb/features/org.jboss.tools.esb.feature/feature.xml
branches/jbosstools-3.3.x/esb/features/org.jboss.tools.esb.feature/pom.xml
branches/jbosstools-3.3.x/esb/features/org.jboss.tools.esb.test.feature/feature.xml
branches/jbosstools-3.3.x/esb/features/org.jboss.tools.esb.test.feature/pom.xml
branches/jbosstools-3.3.x/esb/features/pom.xml
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/pom.xml
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/pom.xml
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/messages/JBossFacetCore.properties
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/messages/JBossFacetCoreMessages.java
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_411.java
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeManager.java
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/pom.xml
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.ui/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.ui/pom.xml
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.validator/pom.xml
branches/jbosstools-3.3.x/esb/plugins/pom.xml
branches/jbosstools-3.3.x/esb/pom.xml
branches/jbosstools-3.3.x/esb/site/pom.xml
branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/pom.xml
branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.project.core.test/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml
branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.ui.bot.test/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml
branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.validator.test/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.validator.test/pom.xml
branches/jbosstools-3.3.x/esb/tests/pom.xml
Log:
JBIDE-13209 - Updating 3.3.x ESB stream to include fixes done in 4.0.x and 4.1.x streams as well as updating version #s
Added: branches/jbosstools-3.3.x/esb/.project
===================================================================
--- branches/jbosstools-3.3.x/esb/.project (rev 0)
+++ branches/jbosstools-3.3.x/esb/.project 2013-01-17 20:09:42 UTC (rev 44659)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>esb</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Property changes on: branches/jbosstools-3.3.x/esb/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: branches/jbosstools-3.3.x/esb/features/org.jboss.tools.esb.feature/feature.xml
===================================================================
--- branches/jbosstools-3.3.x/esb/features/org.jboss.tools.esb.feature/feature.xml 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/features/org.jboss.tools.esb.feature/feature.xml 2013-01-17 20:09:42 UTC (rev 44659)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.esb.feature"
label="%featureName"
- version="1.5.0.qualifier"
+ version="1.5.100.qualifier"
provider-name="%providerName"
plugin="org.jboss.tools.esb.ui">
Modified: branches/jbosstools-3.3.x/esb/features/org.jboss.tools.esb.feature/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/esb/features/org.jboss.tools.esb.feature/pom.xml 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/features/org.jboss.tools.esb.feature/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.esb</groupId>
<artifactId>features</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.esb.features</groupId>
<artifactId>org.jboss.tools.esb.feature</artifactId>
Modified: branches/jbosstools-3.3.x/esb/features/org.jboss.tools.esb.test.feature/feature.xml
===================================================================
--- branches/jbosstools-3.3.x/esb/features/org.jboss.tools.esb.test.feature/feature.xml 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/features/org.jboss.tools.esb.test.feature/feature.xml 2013-01-17 20:09:42 UTC (rev 44659)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.esb.test.feature" label="JBoss Tools - Tests - ESB" version="1.5.0.qualifier" provider-name="JBoss by RedHat">
+<feature id="org.jboss.tools.esb.test.feature" label="JBoss Tools - Tests - ESB" version="1.5.100.qualifier" provider-name="JBoss by RedHat">
<description url="http://www.jboss.org/tools">
%description
Modified: branches/jbosstools-3.3.x/esb/features/org.jboss.tools.esb.test.feature/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/esb/features/org.jboss.tools.esb.test.feature/pom.xml 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/features/org.jboss.tools.esb.test.feature/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.esb</groupId>
<artifactId>features</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.esb.features</groupId>
<artifactId>org.jboss.tools.esb.test.feature</artifactId>
Modified: branches/jbosstools-3.3.x/esb/features/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/esb/features/pom.xml 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/features/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>esb</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.esb</groupId>
<artifactId>features</artifactId>
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/META-INF/MANIFEST.MF 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/META-INF/MANIFEST.MF 2013-01-17 20:09:42 UTC (rev 44659)
@@ -1,23 +1,23 @@
-Manifest-Version: 1.0
-Bundle-ActivationPolicy: lazy
-Bundle-Name: %pluginName
-Bundle-Activator: org.jboss.tools.esb.core.ESBCorePlugin
-Bundle-ManifestVersion: 2
-Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.jboss.tools.esb.core;singleton:=true
-Bundle-Localization: plugin
-Export-Package: org.jboss.tools.esb.core,
- org.jboss.tools.esb.core.model,
- org.jboss.tools.esb.core.model.converters,
- org.jboss.tools.esb.core.model.handlers,
- org.jboss.tools.esb.core.model.impl
-Require-Bundle: org.eclipse.core.resources;visibility:=reexport,
- org.jboss.tools.common.model;visibility:=reexport,
- org.eclipse.ui,
- org.jboss.tools.esb.project.core,
- org.eclipse.wst.common.core,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.wst.common.modulecore,
- org.eclipse.jst.j2ee
-Bundle-Version: 1.5.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0
+Bundle-ActivationPolicy: lazy
+Bundle-Name: %pluginName
+Bundle-Activator: org.jboss.tools.esb.core.ESBCorePlugin
+Bundle-ManifestVersion: 2
+Bundle-Vendor: %providerName
+Bundle-SymbolicName: org.jboss.tools.esb.core;singleton:=true
+Bundle-Localization: plugin
+Export-Package: org.jboss.tools.esb.core,
+ org.jboss.tools.esb.core.model,
+ org.jboss.tools.esb.core.model.converters,
+ org.jboss.tools.esb.core.model.handlers,
+ org.jboss.tools.esb.core.model.impl
+Require-Bundle: org.eclipse.core.resources;visibility:=reexport,
+ org.jboss.tools.common.model;visibility:=reexport,
+ org.eclipse.ui,
+ org.jboss.tools.esb.project.core,
+ org.eclipse.wst.common.core,
+ org.eclipse.wst.common.project.facet.core,
+ org.eclipse.wst.common.modulecore,
+ org.eclipse.jst.j2ee
+Bundle-Version: 1.5.100.qualifier
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/pom.xml 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.esb</groupId>
<artifactId>plugins</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.esb.plugins</groupId>
<artifactId>org.jboss.tools.esb.core</artifactId>
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF 2013-01-17 20:09:42 UTC (rev 44659)
@@ -1,43 +1,43 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.jboss.tools.esb.project.core;singleton:=true
-Bundle-Version: 1.5.1.qualifier
-Bundle-Localization: plugin
-Bundle-Activator: org.jboss.tools.esb.core.ESBProjectCorePlugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.wst.common.frameworks,
- org.eclipse.core.resources,
- org.eclipse.jst.ws,
- org.eclipse.jdt.core,
- org.eclipse.jdt.launching,
- org.eclipse.jst.jsf.core,
- org.eclipse.jst.jsf.ui,
- org.eclipse.wst.common.modulecore,
- org.eclipse.jdt.launching,
- org.eclipse.jst.jsf.core,
- org.eclipse.jst.jsf.ui,
- org.eclipse.jdt.launching,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.ws.consumption.ui,
- org.eclipse.jst.common.frameworks,
- org.eclipse.wst.server.core,
- org.eclipse.jst.common.project.facet.core,
- org.eclipse.wst.web,
- org.eclipse.jem.util,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.emf.ecore,
- org.jboss.ide.eclipse.as.classpath.core,
- org.jboss.ide.eclipse.as.wtp.core;bundle-version="1.0.0",
- org.jboss.ide.eclipse.as.core;bundle-version="1.0.0";visibility:=reexport
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %providerName
-Export-Package: org.jboss.tools.esb.core,
- org.jboss.tools.esb.core.facet,
- org.jboss.tools.esb.core.messages,
- org.jboss.tools.esb.core.module,
- org.jboss.tools.esb.core.runtime,
- org.jboss.tools.esb.core.utils
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.jboss.tools.esb.project.core;singleton:=true
+Bundle-Version: 1.5.100.qualifier
+Bundle-Localization: plugin
+Bundle-Activator: org.jboss.tools.esb.core.ESBProjectCorePlugin
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.wst.common.project.facet.core,
+ org.eclipse.wst.common.frameworks,
+ org.eclipse.core.resources,
+ org.eclipse.jst.ws,
+ org.eclipse.jdt.core,
+ org.eclipse.jdt.launching,
+ org.eclipse.jst.jsf.core,
+ org.eclipse.jst.jsf.ui,
+ org.eclipse.wst.common.modulecore,
+ org.eclipse.jdt.launching,
+ org.eclipse.jst.jsf.core,
+ org.eclipse.jst.jsf.ui,
+ org.eclipse.jdt.launching,
+ org.eclipse.jst.j2ee,
+ org.eclipse.jst.ws.consumption.ui,
+ org.eclipse.jst.common.frameworks,
+ org.eclipse.wst.server.core,
+ org.eclipse.jst.common.project.facet.core,
+ org.eclipse.wst.web,
+ org.eclipse.jem.util,
+ org.eclipse.wst.common.emfworkbench.integration,
+ org.eclipse.emf.ecore,
+ org.jboss.ide.eclipse.as.classpath.core,
+ org.jboss.ide.eclipse.as.wtp.core;bundle-version="1.0.0",
+ org.jboss.ide.eclipse.as.core;bundle-version="1.0.0";visibility:=reexport
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %providerName
+Export-Package: org.jboss.tools.esb.core,
+ org.jboss.tools.esb.core.facet,
+ org.jboss.tools.esb.core.messages,
+ org.jboss.tools.esb.core.module,
+ org.jboss.tools.esb.core.runtime,
+ org.jboss.tools.esb.core.utils
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml 2013-01-17 20:09:42 UTC (rev 44659)
@@ -175,8 +175,26 @@
</and>
</constraint>
</project-facet-version>
- <action
+ <project-facet-version
facet="jst.jboss.esb"
+ version="4.12">
+ <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"
type="install">
<delegate
@@ -204,7 +222,7 @@
<supported>
<facet
id="jst.jboss.esb"
- version="4.2,4.3,4.4,4.5,4.6,4.7,4.9,4.10,4.11">
+ version="4.2,4.3,4.4,4.5,4.6,4.7,4.9,4.10,4.11,4.12">
</facet>
<runtime-component
id="org.jboss.ide.eclipse.as.runtime.component"
@@ -214,7 +232,7 @@
<supported>
<facet
id="jst.jboss.esb"
- version="4.2,4.3,4.4,4.5,4.6,4.7,4.9,4.10,4.11">
+ version="4.2,4.3,4.4,4.5,4.6,4.7,4.9,4.10,4.11,4.12">
</facet>
<runtime-component
id="org.jboss.ide.eclipse.eap.runtime.component"
@@ -257,7 +275,7 @@
projects="true">
<moduleType
types="jst.jboss.esb"
- versions="4.2,4.3,4.4,4.5,4.6,4.7,4.9,4.10,4.11">
+ versions="4.2,4.3,4.4,4.5,4.6,4.7,4.9,4.10,4.11,4.12">
</moduleType>
</moduleFactory>
</extension>
@@ -390,6 +408,23 @@
id="org.jboss.ide.eclipse.as.runtime.60">
</supportedRuntimeType>
</Resolver>
+ <Resolver
+ class="org.jboss.tools.esb.core.runtime.ESBRuntimeResolver_412"
+ esbVersion="4.12"
+ 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>
<extension
point="org.eclipse.wst.server.core.runtimeModuleType">
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/pom.xml 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
@@ -5,11 +5,11 @@
<parent>
<groupId>org.jboss.tools.esb</groupId>
<artifactId>plugins</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.esb.plugins</groupId>
<artifactId>org.jboss.tools.esb.project.core</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/messages/JBossFacetCore.properties
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/messages/JBossFacetCore.properties 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/messages/JBossFacetCore.properties 2013-01-17 20:09:42 UTC (rev 44659)
@@ -1,8 +1,9 @@
-Error_Copy=Exception while copying runtime jars: {0}
-# START NON-TRANSLATABLE
-ESB_Location=jbossesbruntimelocation
-# END NON-TRANSLATABLE
-JBoss_Runtime=JBoss ESB Runtime
-
-Error_Add_Facet_JBossESB=Exception while install JBoss ESB facet
-Error_Remove_Facet_JBossESB=Exception while uninstall JBoss ESB facet
+Error_Copy=Exception while copying runtime jars: {0}
+Warning_No_Exact_ESB_Runtime_Match=No exact match found for ESB runtime version {0}. Assuming compatible with latest version\: {1}.
+# START NON-TRANSLATABLE
+ESB_Location=jbossesbruntimelocation
+# END NON-TRANSLATABLE
+JBoss_Runtime=JBoss ESB Runtime
+
+Error_Add_Facet_JBossESB=Exception while install JBoss ESB facet
+Error_Remove_Facet_JBossESB=Exception while uninstall JBoss ESB facet
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/messages/JBossFacetCoreMessages.java
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/messages/JBossFacetCoreMessages.java 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/messages/JBossFacetCoreMessages.java 2013-01-17 20:09:42 UTC (rev 44659)
@@ -1,37 +1,38 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author Grid Qian
- */
-public class JBossFacetCoreMessages {
-
- private static final String BUNDLE_NAME = "org.jboss.tools.esb.core.messages.JBossFacetCore"; //$NON-NLS-1$
-
- private JBossFacetCoreMessages() {
- // Do not instantiate
- }
-
- public static String Error_Copy;
- public static String ESB_Location;
- public static String JBoss_Runtime;
- public static String Error_Add_Facet_JBossESB;
- public static String Error_Remove_Facet_JBossESB;
-
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, JBossFacetCoreMessages.class);
- }
+/*******************************************************************************
+ * Copyright (c) 2008 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.messages;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * @author Grid Qian
+ */
+public class JBossFacetCoreMessages {
+
+ private static final String BUNDLE_NAME = "org.jboss.tools.esb.core.messages.JBossFacetCore"; //$NON-NLS-1$
+
+ private JBossFacetCoreMessages() {
+ // Do not instantiate
+ }
+
+ public static String Error_Copy;
+ public static String ESB_Location;
+ public static String JBoss_Runtime;
+ public static String Error_Add_Facet_JBossESB;
+ public static String Error_Remove_Facet_JBossESB;
+ public static String Warning_No_Exact_ESB_Runtime_Match;
+
+
+ static {
+ NLS.initializeMessages(BUNDLE_NAME, JBossFacetCoreMessages.class);
+ }
}
\ No newline at end of file
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_411.java
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_411.java 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_411.java 2013-01-17 20:09:42 UTC (rev 44659)
@@ -1,57 +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_411 extends AbstractESBRuntimeResolver implements
- IESBRuntimeResolver {
-
- private final static String JUDDI_CLIENT_JAR_313 = "juddi-client-3.1.3.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_313));
- }
-
-
- 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;
- }
-
-
-}
+/*******************************************************************************
+ * 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_411 extends AbstractESBRuntimeResolver implements
+ IESBRuntimeResolver {
+
+ private final static String JUDDI_CLIENT_JAR_313 = "juddi-client-3.1.3.jar";
+ private final static String JUDDI_CLIENT_JAR_314 = "juddi-client-3.1.4.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_313) || jarNames.contains(JUDDI_CLIENT_JAR_314));
+ }
+
+
+ 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;
+ }
+
+
+}
Added: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_412.java
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_412.java (rev 0)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_412.java 2013-01-17 20:09:42 UTC (rev 44659)
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2013 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_412 extends AbstractESBRuntimeResolver implements
+ IESBRuntimeResolver {
+
+ 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());
+ }
+
+// if("4.12".equals(version)){
+ return jarNames.contains(ROSETTA_JAR);
+// }
+ }
+
+
+ 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.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_412.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeManager.java
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeManager.java 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeManager.java 2013-01-17 20:09:42 UTC (rev 44659)
@@ -1,514 +1,632 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.preference.IPersistentPreferenceStore;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
-import org.jboss.tools.esb.core.ESBProjectCorePlugin;
-import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties;
-import org.jboss.tools.esb.core.messages.JBossFacetCoreMessages;
-
-/**
- * @author Denny Xu
- */
-public class JBossRuntimeManager {
-
- private static JBossRuntimeListConverter converter = new JBossRuntimeListConverter();
-
- private Map<String, JBossESBRuntime> runtimes = new HashMap<String, JBossESBRuntime>();
-
-
- static final String PLUGIN_ID = "org.jboss.tools.esb.project.core"; //$NON-NLS-1$
- static String ATT_CLASS = "class"; //$NON-NLS-1$
- static String ATT_VERSION = "esbVersion"; //$NON-NLS-1$
- static String ATT_ID = "id";
- static String VERSION_SEPARATOR = ",";
- static String VERSION_FILE_NAME = "VERSION";
- static String VERSION_PROPERTIES_KEY = "Version";
- static String VERSION_PROPERTIES_SEPERATOR = "_";
-
-
-
- static Map<String, IESBRuntimeResolver> parserMap = new HashMap<String, IESBRuntimeResolver>();
-
-
- /**
- * Private constructor
- */
- private JBossRuntimeManager() {
- load();
- }
-
- /**
- * This class make Java Runtime responsible for solving synchronization
- * problems during initialization if there is any
- *
- */
- static class JBossRuntimeManagerHolder {
- private static final JBossRuntimeManager INSTANCE = new JBossRuntimeManager();
- }
-
- /**
- * Return JBossWSRuntimeManaher instance
- *
- * @return JBossWSRuntimeManager instance
- */
- public static JBossRuntimeManager getInstance() {
- return JBossRuntimeManagerHolder.INSTANCE;
- }
-
- /**
- * Return Array of configured JBossWSRuntimes
- *
- * @return JBossWSRuntime[]
- */
- public JBossESBRuntime[] getRuntimes() {
- Collection<JBossESBRuntime> c = runtimes.values();
- return c.toArray(new JBossESBRuntime[runtimes.size()]);
- }
-
- /**
- * Add new JBossWSRuntime
- *
- * @param runtime
- * JBossWSRuntime
- */
- public void addRuntime(JBossESBRuntime runtime) {
- if (runtimes.size() == 0) {
- runtime.setDefault(true);
- }
-
- JBossESBRuntime oldDefaultRuntime = getDefaultRuntime();
- if (oldDefaultRuntime != null && runtime.isDefault()) {
- oldDefaultRuntime.setDefault(false);
- }
- runtimes.put(runtime.getName(), runtime);
- save();
- }
-
- /**
- * Add new JBossWSRuntime with given parameters
- *
- * @param name
- * String - runtime name
- * @param path
- * String - runtime home folder
- * @param version
- * String - string representation of version number
- * @param defaultRt
- * boolean - default flag
- */
- public void addRuntime(String name, String path, String version,
- boolean defaultRt) {
- JBossESBRuntime jbossWSRt = new JBossESBRuntime();
- jbossWSRt.setHomeDir(path);
- jbossWSRt.setName(name);
- jbossWSRt.setVersion(version);
- jbossWSRt.setDefault(defaultRt);
- addRuntime(jbossWSRt);
- }
-
- /**
- * Return JBossWSRuntime by given name
- *
- * @param name
- * String - JBossWSRuntime name
- * @return JBossWSRuntime - found JBossWSRuntime instance or null
- */
- public JBossESBRuntime findRuntimeByName(String name) {
- for (JBossESBRuntime jbossWSRuntime : runtimes.values()) {
- if (jbossWSRuntime.getName().equals(name)) {
- return jbossWSRuntime;
- }
- }
- return null;
- }
-
- public JBossESBRuntime[] findRuntimeByVersion(String version) {
- if(version == null || "".equals(version)){
- return getRuntimes();
- }
- List<JBossESBRuntime> rts = new ArrayList<JBossESBRuntime>();
- for (JBossESBRuntime jbossWSRuntime : runtimes.values()) {
- if (jbossWSRuntime.getVersion().equals(version)) {
- rts.add(jbossWSRuntime);
- }
- }
- return rts.toArray(new JBossESBRuntime[]{});
- }
-
- public List<String> getAllRuntimeJars(JBossESBRuntime rt, String esbVersion){
- List<String> jarList = new ArrayList<String>();
- if (rt != null) {
- if (rt.isUserConfigClasspath()) {
- jarList.addAll(rt.getLibraries());
-
- } else {
-
- jarList = getAllRuntimeJars(rt.getHomeDir(), esbVersion, rt.getConfiguration());
- }
-
- }
- return jarList;
- }
-
- public List<String> getAllRuntimeJars(String runtimeLocation, String esbVersion, String configuration) {
- List<String> jarList = new ArrayList<String>();
- IESBRuntimeResolver resolver = null;
- if(parserMap.get(esbVersion) != null){
- resolver = (IESBRuntimeResolver)parserMap.get(esbVersion);
- }
-
- if( resolver != null){
- List<File> jars = resolver.getAllRuntimeJars(runtimeLocation, configuration);
- for(File file : jars){
- jarList.add(file.getAbsolutePath());
- }
- }
- else{
- ESBProjectCorePlugin.log("No ESB runtime resolver defined for ESB "+ esbVersion, null, Status.WARNING);
- }
-
- return jarList;
- }
-
- /**
- * Remove given JBossWSRuntime from manager
- *
- * @param rt
- * JBossWSRuntime
- */
- public void removeRuntime(JBossESBRuntime rt) {
- runtimes.remove(rt.getName());
- }
-
- /**
- * Save preference value and force save changes to disk
- */
- public void save() {
- ESBProjectCorePlugin.getDefault().getPreferenceStore().setValue(
- JBossFacetCoreMessages.ESB_Location, converter.getString(runtimes));
- IPreferenceStore store = ESBProjectCorePlugin.getDefault()
- .getPreferenceStore();
- if (store instanceof IPersistentPreferenceStore) {
- try {
- ((IPersistentPreferenceStore) store).save();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
-
- /**
- * Marks this runtime as default. Marks other runtimes with the same version
- * as not default.
- *
- * @param runtime
- */
- public void setDefaultRuntime(JBossESBRuntime runtime) {
- JBossESBRuntime[] runtimes = getRuntimes();
- for (int i = 0; i < runtimes.length; i++) {
- runtimes[i].setDefault(false);
- }
- runtime.setDefault(true);
- }
-
- /**
- * Return first default JBossWSRuntime
- *
- * @return JBossWSRuntime
- */
- public JBossESBRuntime getDefaultRuntime() {
- for (JBossESBRuntime rt : runtimes.values()) {
- if (rt.isDefault()) {
- return rt;
- }
- }
- return null;
- }
-
- /**
- * Return list of available JBossWSRuntime names
- *
- * @return List<String>
- */
- public List<String> getRuntimeNames() {
- JBossESBRuntime[] rts = getRuntimes();
- List<String> result = new ArrayList<String>();
- for (JBossESBRuntime jbossWSRuntime : rts) {
- result.add(jbossWSRuntime.getName());
- }
- return result;
- }
-
- /**
- * Return a list of all runtime names
- *
- * @return List of all runtime names
- */
- public List<String> getAllRuntimeNames() {
- JBossESBRuntime[] rts = getRuntimes();
- List<String> result = new ArrayList<String>();
- for (JBossESBRuntime jbossWSRuntime : rts) {
- result.add(jbossWSRuntime.getName());
- }
- return result;
- }
-
- /**
- * TBD
- *
- * @param oldName
- * old runtime name
- * @param newName
- * new runtime name
- */
- public void changeRuntimeName(String oldName, String newName) {
- JBossESBRuntime o = findRuntimeByName(oldName);
- if (o == null) {
- return;
- }
- o.setName(newName);
- onRuntimeNameChanged(oldName, newName);
- }
-
- private void onRuntimeNameChanged(String oldName, String newName) {
- IProjectFacet facet = ProjectFacetsManager
- .getProjectFacet(IJBossESBFacetDataModelProperties.JBOSS_ESB_FACET_ID);
- Set<IFacetedProject> facetedProjects = null;
- try {
- facetedProjects = ProjectFacetsManager.getFacetedProjects(facet);
- } catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- for (IFacetedProject facetedProject : facetedProjects) {
- QualifiedName qRuntimeName = IJBossESBFacetDataModelProperties.PERSISTENCE_PROPERTY_QNAME_RUNTIME_NAME;
- String name = null;
- try {
- name = facetedProject.getProject().getPersistentProperty(
- qRuntimeName);
- if (name != null && name.equals(oldName)) {
- facetedProject.getProject().setPersistentProperty(
- qRuntimeName, newName);
- }
- } catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- }
- }
-
- public static boolean isRuntimeUsed(String name) {
- IProjectFacet facet = ProjectFacetsManager
- .getProjectFacet(IJBossESBFacetDataModelProperties.JBOSS_ESB_FACET_ID);
- Set<IFacetedProject> facetedProjects = null;
- try {
- facetedProjects = ProjectFacetsManager.getFacetedProjects(facet);
- } catch (CoreException e) {
- return false;
- }
- for (IFacetedProject facetedProject : facetedProjects) {
- QualifiedName qRuntimeName = IJBossESBFacetDataModelProperties.PERSISTENCE_PROPERTY_QNAME_RUNTIME_NAME;
- try {
- if (name.equals(facetedProject.getProject()
- .getPersistentProperty(qRuntimeName))) {
- return true;
- }
- } catch (CoreException e) {
- e.printStackTrace();
- }
- }
- return false;
- }
-
- public void load() {
- IPreferenceStore ps = ESBProjectCorePlugin.getDefault()
- .getPreferenceStore();
-
- String runtimeListString = ps
- .getString(JBossFacetCoreMessages.ESB_Location);
-
- runtimes = converter.getMap(runtimeListString);
- }
-
- public static boolean isValidESBServer(String path, String version, String configuration){
-
- return isValidESBStandaloneRuntimeDir(path, version, configuration);
- }
-
-
-
-
- public static boolean isValidESBStandaloneRuntimeDir(String path, String version, String configuration) {
- IESBRuntimeResolver resolver = null;
- if( parserMap.get(version) != null){
- resolver = (IESBRuntimeResolver)parserMap.get(version);
- }
-
- if(resolver != null){
- return resolver.isValidESBRuntime(path, version, configuration);
- }
- else{
- ESBProjectCorePlugin.log("No ESB runtime resolver defined for ESB "+ version, null, Status.WARNING);
- }
-
- return false;
-
-// IPath location = new Path(path);
-// IPath esblocation = location.append("lib").append("jbossesb.esb");
-// IPath sarLocation = location.append("lib").append("jbossesb.sar");
-// if (!esblocation.toFile().isDirectory()) {
-// return false;
-// }
-// if (!sarLocation.toFile().isDirectory()) {
-// return false;
-// }
-//
-// try{
-// double versionNumber = Double.valueOf(version);
-// if(versionNumber >= 4.5){
-// return isVersion45(sarLocation);
-// }
-// }catch(NumberFormatException e){
-// }
-//
-// return true;
- }
-
-
- public String getESBVersionNumber(File rosettaJar){
-
- return "";
-
- }
-
- public static void loadParsers() {
- IExtensionPoint extensionPoint = Platform.getExtensionRegistry()
- .getExtensionPoint(PLUGIN_ID, "esbRuntimeResolver");
- for (IConfigurationElement element : extensionPoint
- .getConfigurationElements()) {
- String clazz = element.getAttribute(ATT_CLASS);
- String esbVersion = element.getAttribute(ATT_VERSION);
-
- IConfigurationElement[] supportedRTs = element.getChildren("supportedRuntimeType");
- List<String> runtimeTypeIds = new ArrayList<String>();
- for(IConfigurationElement supportedRT : supportedRTs){
- runtimeTypeIds.add(supportedRT.getAttribute(ATT_ID));
- }
-
- if (clazz == null || (esbVersion == null && runtimeTypeIds.size() == 0)) {
- continue;
- }
-
-
- IESBRuntimeResolver parser = null;
- try {
- parser = (IESBRuntimeResolver) element
- .createExecutableExtension(ATT_CLASS);
-
- if (esbVersion != null && !"".equals(esbVersion.trim())) {
- String[] versions = esbVersion.split(VERSION_SEPARATOR);
- for (String version : versions) {
- parserMap.put(version, parser);
- }
- }
-
- for(String typeId : runtimeTypeIds){
- parserMap.put(typeId, parser);
- }
-
- } catch (CoreException e) {
- ESBProjectCorePlugin.log(e.getLocalizedMessage(), e);
- }
- }
- }
-
-
- public String getVersion(String location, String configuration){
- String version = "";
- File rosettaJar = null;
- Collection<IESBRuntimeResolver> resolvers = parserMap.values();
- for(IESBRuntimeResolver resolver : resolvers){
- rosettaJar = resolver.getRosettaJar(location, configuration);
- if(rosettaJar != null && rosettaJar.exists()){
- break;
- }
- }
-
- if(rosettaJar == null || !rosettaJar.exists()){
- return "";
- }
-
- try {
- ZipFile zfile = new ZipFile(rosettaJar);
- ZipEntry entry = zfile.getEntry(VERSION_FILE_NAME);
-
- if(entry == null) return "";
-
- InputStream input = zfile.getInputStream(entry);
- Properties properties = new Properties();
- properties.load(input);
- version = properties.getProperty(VERSION_PROPERTIES_KEY);
-
-
- if(version == null){
- return "";
- }
- // soa-p5.0 and higher
- else if(version.indexOf(VERSION_PROPERTIES_SEPERATOR) > 0){
- version = version.substring(0, version.indexOf(VERSION_PROPERTIES_SEPERATOR));
- }
- //soa-p 4.3
- else if(version.equals("4.3.0")) {
- version = "4.4";
- }
- else if(version.length() > 3 && ! (version.charAt(version.length()-1) >= '0' && version.charAt(version.length()-1) < '9') ){
- version = version.substring(0,3);
- }
-
- } catch (ZipException e) {
- ESBProjectCorePlugin.log(e.getLocalizedMessage(), e);
- } catch (IOException e) {
- ESBProjectCorePlugin.log(e.getLocalizedMessage(), e);
- }
-
- return version;
- }
-
-
+/*******************************************************************************
+ * Copyright (c) 2008 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.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
+import java.util.zip.ZipFile;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.preference.IPersistentPreferenceStore;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
+import org.jboss.tools.esb.core.ESBProjectConstant;
+import org.jboss.tools.esb.core.ESBProjectCorePlugin;
+import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties;
+import org.jboss.tools.esb.core.messages.JBossFacetCoreMessages;
+
+/**
+ * @author Denny Xu
+ */
+public class JBossRuntimeManager {
+
+ private static JBossRuntimeListConverter converter = new JBossRuntimeListConverter();
+
+ private Map<String, JBossESBRuntime> runtimes = new HashMap<String, JBossESBRuntime>();
+
+
+ static final String PLUGIN_ID = "org.jboss.tools.esb.project.core"; //$NON-NLS-1$
+ static String ATT_CLASS = "class"; //$NON-NLS-1$
+ static String ATT_VERSION = "esbVersion"; //$NON-NLS-1$
+ static String ATT_ID = "id";
+ static String VERSION_SEPARATOR = ",";
+ static String VERSION_FILE_NAME = "VERSION";
+ static String VERSION_PROPERTIES_KEY = "Version";
+ static String VERSION_PROPERTIES_SEPERATOR = "_";
+
+
+
+ static Map<String, IESBRuntimeResolver> parserMap = new HashMap<String, IESBRuntimeResolver>();
+
+
+ /**
+ * Private constructor
+ */
+ private JBossRuntimeManager() {
+ load();
+ }
+
+ /**
+ * This class make Java Runtime responsible for solving synchronization
+ * problems during initialization if there is any
+ *
+ */
+ static class JBossRuntimeManagerHolder {
+ private static final JBossRuntimeManager INSTANCE = new JBossRuntimeManager();
+ }
+
+ /**
+ * Return JBossWSRuntimeManaher instance
+ *
+ * @return JBossWSRuntimeManager instance
+ */
+ public static JBossRuntimeManager getInstance() {
+ return JBossRuntimeManagerHolder.INSTANCE;
+ }
+
+ /**
+ * Return Array of configured JBossWSRuntimes
+ *
+ * @return JBossWSRuntime[]
+ */
+ public JBossESBRuntime[] getRuntimes() {
+ Collection<JBossESBRuntime> c = runtimes.values();
+ return c.toArray(new JBossESBRuntime[runtimes.size()]);
+ }
+
+ /**
+ * Add new JBossWSRuntime
+ *
+ * @param runtime
+ * JBossWSRuntime
+ */
+ public void addRuntime(JBossESBRuntime runtime) {
+ if (runtimes.size() == 0) {
+ runtime.setDefault(true);
+ }
+
+ JBossESBRuntime oldDefaultRuntime = getDefaultRuntime();
+ if (oldDefaultRuntime != null && runtime.isDefault()) {
+ oldDefaultRuntime.setDefault(false);
+ }
+ runtimes.put(runtime.getName(), runtime);
+ save();
+ }
+
+ /**
+ * Add new JBossWSRuntime with given parameters
+ *
+ * @param name
+ * String - runtime name
+ * @param path
+ * String - runtime home folder
+ * @param version
+ * String - string representation of version number
+ * @param defaultRt
+ * boolean - default flag
+ */
+ public void addRuntime(String name, String path, String version,
+ boolean defaultRt) {
+ JBossESBRuntime jbossWSRt = new JBossESBRuntime();
+ jbossWSRt.setHomeDir(path);
+ jbossWSRt.setName(name);
+ jbossWSRt.setVersion(version);
+ jbossWSRt.setDefault(defaultRt);
+ addRuntime(jbossWSRt);
+ }
+
+ /**
+ * Return JBossWSRuntime by given name
+ *
+ * @param name
+ * String - JBossWSRuntime name
+ * @return JBossWSRuntime - found JBossWSRuntime instance or null
+ */
+ public JBossESBRuntime findRuntimeByName(String name) {
+ for (JBossESBRuntime jbossWSRuntime : runtimes.values()) {
+ if (jbossWSRuntime.getName().equals(name)) {
+ return jbossWSRuntime;
+ }
+ }
+ return null;
+ }
+
+ public JBossESBRuntime[] findRuntimeByVersion(String version) {
+ if(version == null || "".equals(version)){
+ return getRuntimes();
+ }
+ List<JBossESBRuntime> rts = new ArrayList<JBossESBRuntime>();
+ for (JBossESBRuntime jbossWSRuntime : runtimes.values()) {
+ if (jbossWSRuntime.getVersion().equals(version)) {
+ rts.add(jbossWSRuntime);
+ }
+ }
+ return rts.toArray(new JBossESBRuntime[]{});
+ }
+
+ public List<String> getAllRuntimeJars(JBossESBRuntime rt, String esbVersion){
+ List<String> jarList = new ArrayList<String>();
+ if (rt != null) {
+ if (rt.isUserConfigClasspath()) {
+ jarList.addAll(rt.getLibraries());
+
+ } else {
+
+ jarList = getAllRuntimeJars(rt.getHomeDir(), esbVersion, rt.getConfiguration());
+ }
+
+ }
+ return jarList;
+ }
+
+ public List<String> getAllRuntimeJars(String runtimeLocation, String esbVersion, String configuration) {
+ List<String> jarList = new ArrayList<String>();
+ IESBRuntimeResolver resolver = null;
+ if(parserMap.get(esbVersion) != null){
+ resolver = (IESBRuntimeResolver)parserMap.get(esbVersion);
+ }
+
+ if( resolver != null){
+ List<File> jars = resolver.getAllRuntimeJars(runtimeLocation, configuration);
+ for(File file : jars){
+ jarList.add(file.getAbsolutePath());
+ }
+ }
+ else{
+ ESBProjectCorePlugin.log("No ESB runtime resolver defined for ESB "+ esbVersion, null, Status.WARNING);
+ }
+
+ return jarList;
+ }
+
+ /**
+ * Remove given JBossWSRuntime from manager
+ *
+ * @param rt
+ * JBossWSRuntime
+ */
+ public void removeRuntime(JBossESBRuntime rt) {
+ runtimes.remove(rt.getName());
+ }
+
+ /**
+ * Save preference value and force save changes to disk
+ */
+ public void save() {
+ ESBProjectCorePlugin.getDefault().getPreferenceStore().setValue(
+ JBossFacetCoreMessages.ESB_Location, converter.getString(runtimes));
+ IPreferenceStore store = ESBProjectCorePlugin.getDefault()
+ .getPreferenceStore();
+ if (store instanceof IPersistentPreferenceStore) {
+ try {
+ ((IPersistentPreferenceStore) store).save();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ /**
+ * Marks this runtime as default. Marks other runtimes with the same version
+ * as not default.
+ *
+ * @param runtime
+ */
+ public void setDefaultRuntime(JBossESBRuntime runtime) {
+ JBossESBRuntime[] runtimes = getRuntimes();
+ for (int i = 0; i < runtimes.length; i++) {
+ runtimes[i].setDefault(false);
+ }
+ runtime.setDefault(true);
+ }
+
+ /**
+ * Return first default JBossWSRuntime
+ *
+ * @return JBossWSRuntime
+ */
+ public JBossESBRuntime getDefaultRuntime() {
+ for (JBossESBRuntime rt : runtimes.values()) {
+ if (rt.isDefault()) {
+ return rt;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Return list of available JBossWSRuntime names
+ *
+ * @return List<String>
+ */
+ public List<String> getRuntimeNames() {
+ JBossESBRuntime[] rts = getRuntimes();
+ List<String> result = new ArrayList<String>();
+ for (JBossESBRuntime jbossWSRuntime : rts) {
+ result.add(jbossWSRuntime.getName());
+ }
+ return result;
+ }
+
+ /**
+ * Return a list of all runtime names
+ *
+ * @return List of all runtime names
+ */
+ public List<String> getAllRuntimeNames() {
+ JBossESBRuntime[] rts = getRuntimes();
+ List<String> result = new ArrayList<String>();
+ for (JBossESBRuntime jbossWSRuntime : rts) {
+ result.add(jbossWSRuntime.getName());
+ }
+ return result;
+ }
+
+ /**
+ * TBD
+ *
+ * @param oldName
+ * old runtime name
+ * @param newName
+ * new runtime name
+ */
+ public void changeRuntimeName(String oldName, String newName) {
+ JBossESBRuntime o = findRuntimeByName(oldName);
+ if (o == null) {
+ return;
+ }
+ o.setName(newName);
+ onRuntimeNameChanged(oldName, newName);
+ }
+
+ private void onRuntimeNameChanged(String oldName, String newName) {
+ IProjectFacet facet = ProjectFacetsManager
+ .getProjectFacet(IJBossESBFacetDataModelProperties.JBOSS_ESB_FACET_ID);
+ Set<IFacetedProject> facetedProjects = null;
+ try {
+ facetedProjects = ProjectFacetsManager.getFacetedProjects(facet);
+ } catch (CoreException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ for (IFacetedProject facetedProject : facetedProjects) {
+ QualifiedName qRuntimeName = IJBossESBFacetDataModelProperties.PERSISTENCE_PROPERTY_QNAME_RUNTIME_NAME;
+ String name = null;
+ try {
+ name = facetedProject.getProject().getPersistentProperty(
+ qRuntimeName);
+ if (name != null && name.equals(oldName)) {
+ facetedProject.getProject().setPersistentProperty(
+ qRuntimeName, newName);
+ }
+ } catch (CoreException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ }
+ }
+
+ public static boolean isRuntimeUsed(String name) {
+ IProjectFacet facet = ProjectFacetsManager
+ .getProjectFacet(IJBossESBFacetDataModelProperties.JBOSS_ESB_FACET_ID);
+ Set<IFacetedProject> facetedProjects = null;
+ try {
+ facetedProjects = ProjectFacetsManager.getFacetedProjects(facet);
+ } catch (CoreException e) {
+ return false;
+ }
+ for (IFacetedProject facetedProject : facetedProjects) {
+ QualifiedName qRuntimeName = IJBossESBFacetDataModelProperties.PERSISTENCE_PROPERTY_QNAME_RUNTIME_NAME;
+ try {
+ if (name.equals(facetedProject.getProject()
+ .getPersistentProperty(qRuntimeName))) {
+ return true;
+ }
+ } catch (CoreException e) {
+ e.printStackTrace();
+ }
+ }
+ return false;
+ }
+
+ public void load() {
+ IPreferenceStore ps = ESBProjectCorePlugin.getDefault()
+ .getPreferenceStore();
+
+ String runtimeListString = ps
+ .getString(JBossFacetCoreMessages.ESB_Location);
+
+ runtimes = converter.getMap(runtimeListString);
+ }
+
+ public static boolean isValidESBServer(String path, String version, String configuration){
+
+ return isValidESBStandaloneRuntimeDir(path, version, configuration);
+ }
+
+
+
+
+ public static boolean isValidESBStandaloneRuntimeDir(String path, String version, String configuration) {
+ IESBRuntimeResolver resolver = null;
+ if( parserMap.get(version) != null){
+ resolver = (IESBRuntimeResolver)parserMap.get(version);
+ }
+
+ if(resolver != null){
+ return resolver.isValidESBRuntime(path, version, configuration);
+ }
+ else{
+ ESBProjectCorePlugin.log("No ESB runtime resolver defined for ESB "+ version, null, Status.WARNING);
+ }
+
+ return false;
+
+// IPath location = new Path(path);
+// IPath esblocation = location.append("lib").append("jbossesb.esb");
+// IPath sarLocation = location.append("lib").append("jbossesb.sar");
+// if (!esblocation.toFile().isDirectory()) {
+// return false;
+// }
+// if (!sarLocation.toFile().isDirectory()) {
+// return false;
+// }
+//
+// try{
+// double versionNumber = Double.valueOf(version);
+// if(versionNumber >= 4.5){
+// return isVersion45(sarLocation);
+// }
+// }catch(NumberFormatException e){
+// }
+//
+// return true;
+ }
+
+
+ public String getESBVersionNumber(File rosettaJar){
+
+ return "";
+
+ }
+
+ public static void loadParsers() {
+ IExtensionPoint extensionPoint = Platform.getExtensionRegistry()
+ .getExtensionPoint(PLUGIN_ID, "esbRuntimeResolver");
+ for (IConfigurationElement element : extensionPoint
+ .getConfigurationElements()) {
+ String clazz = element.getAttribute(ATT_CLASS);
+ String esbVersion = element.getAttribute(ATT_VERSION);
+
+ IConfigurationElement[] supportedRTs = element.getChildren("supportedRuntimeType");
+ List<String> runtimeTypeIds = new ArrayList<String>();
+ for(IConfigurationElement supportedRT : supportedRTs){
+ runtimeTypeIds.add(supportedRT.getAttribute(ATT_ID));
+ }
+
+ if (clazz == null || (esbVersion == null && runtimeTypeIds.size() == 0)) {
+ continue;
+ }
+
+
+ IESBRuntimeResolver parser = null;
+ try {
+ parser = (IESBRuntimeResolver) element
+ .createExecutableExtension(ATT_CLASS);
+
+ if (esbVersion != null && !"".equals(esbVersion.trim())) {
+ String[] versions = esbVersion.split(VERSION_SEPARATOR);
+ for (String version : versions) {
+ parserMap.put(version, parser);
+ }
+ }
+
+ for(String typeId : runtimeTypeIds){
+ parserMap.put(typeId, parser);
+ }
+
+ } catch (CoreException e) {
+ ESBProjectCorePlugin.log(e.getLocalizedMessage(), e);
+ }
+ }
+ }
+
+ public List<String> getESBFacetVersions(){
+ List<String> versions = new ArrayList<String>();
+ IProjectFacet esbfacet = ProjectFacetsManager.getProjectFacet(ESBProjectConstant.ESB_PROJECT_FACET);
+ for(IProjectFacetVersion version: esbfacet.getVersions()){
+ versions.add(version.getVersionString());
+ }
+ //versions.add("");
+ Comparator<String> comparator = new Comparator<String>() {
+
+ public int compare(String o1, String o2) {
+ if (o1 == null || o2 == null) {
+ return 0;
+ }
+ String[] split1 = o1.split("\\.");
+ String[] split2 = o2.split("\\.");
+ if (split1.length != 2 || split2.length != 2) {
+ return o1.compareTo(o2);
+ }
+ int o11;
+ int o12;
+ int o21;
+ int o22;
+ try {
+ o11 = new Integer(split1[0]);
+ o12 = new Integer(split1[1]);
+ o21 = new Integer(split2[0]);
+ o22 = new Integer(split2[1]);
+ } catch (NumberFormatException e) {
+ return o1.compareTo(o2);
+ }
+
+ if (o11 > o21) {
+ return 1;
+ }
+ if (o11 < o21) {
+ return -1;
+ }
+ if (o12 > o22) {
+ return 1;
+ }
+ if (o12 < o22) {
+ return -1;
+ }
+ return 0;
+ }
+
+ };
+ Collections.sort(versions, comparator);
+ versions.add("");
+ //Collections.reverse(versions);
+ return versions;
+ }
+
+ public String getVersion(String location, String configuration){
+ String version = "";
+ File rosettaJar = null;
+ Collection<IESBRuntimeResolver> resolvers = parserMap.values();
+ for(IESBRuntimeResolver resolver : resolvers){
+ rosettaJar = resolver.getRosettaJar(location, configuration);
+ if(rosettaJar != null && rosettaJar.exists()){
+ break;
+ }
+ }
+
+ if(rosettaJar == null || !rosettaJar.exists()){
+ return "";
+ }
+
+ try {
+ ZipFile zfile = new ZipFile(rosettaJar);
+ ZipEntry entry = zfile.getEntry(VERSION_FILE_NAME);
+
+ if(entry == null) return "";
+
+ InputStream input = zfile.getInputStream(entry);
+ Properties properties = new Properties();
+ properties.load(input);
+ version = properties.getProperty(VERSION_PROPERTIES_KEY);
+
+
+ if(version == null){
+ return "";
+ }
+ // soa-p5.0 and higher
+ else if(version.indexOf(VERSION_PROPERTIES_SEPERATOR) > 0){
+ version = version.substring(0, version.indexOf(VERSION_PROPERTIES_SEPERATOR));
+ }
+ //soa-p 4.3
+ else if(version.equals("4.3.0")) {
+ version = "4.4";
+ }
+ else if(version.length() > 3 && ! (version.charAt(version.length()-1) >= '0' && version.charAt(version.length()-1) < '9') ){
+ version = version.substring(0,3);
+ }
+
+ // if we hit a version with a three part version, reduce it to two
+ int pos1 = version.indexOf('.');
+ int pos2 = version.indexOf('.', pos1 + 1);
+ if (pos2 > -1) {
+ version = version.substring(0, pos2);
+ }
+// if (version.equals("4.11.1")) {
+// version = "4.11";
+// }
+ // if we can't find the version in the facets list, default to the highest facet
+ List<String> facets = getESBFacetVersions();
+ if (!facets.isEmpty() && !facets.contains(version)) {
+ int i = facets.size() - 1;
+ String tempFacetVersion = facets.get(i--);
+ while (tempFacetVersion.trim().length() < 1) {
+ tempFacetVersion = facets.get(i--);
+ }
+ version = tempFacetVersion;
+ }
+
+ } catch (ZipException e) {
+ ESBProjectCorePlugin.log(e.getLocalizedMessage(), e);
+ } catch (IOException e) {
+ ESBProjectCorePlugin.log(e.getLocalizedMessage(), e);
+ }
+
+ return version;
+ }
+
+ public String getRuntimeESBVersion(String location, String configuration){
+ String version = "";
+ File rosettaJar = null;
+ Collection<IESBRuntimeResolver> resolvers = parserMap.values();
+ for(IESBRuntimeResolver resolver : resolvers){
+ rosettaJar = resolver.getRosettaJar(location, configuration);
+ if(rosettaJar != null && rosettaJar.exists()){
+ break;
+ }
+ }
+
+ if(rosettaJar == null || !rosettaJar.exists()){
+ return "";
+ }
+
+ try {
+ ZipFile zfile = new ZipFile(rosettaJar);
+ ZipEntry entry = zfile.getEntry(VERSION_FILE_NAME);
+
+ if(entry == null) return "";
+
+ InputStream input = zfile.getInputStream(entry);
+ Properties properties = new Properties();
+ properties.load(input);
+ version = properties.getProperty(VERSION_PROPERTIES_KEY);
+
+
+ if(version == null){
+ return "";
+ }
+ // soa-p5.0 and higher
+ else if(version.indexOf(VERSION_PROPERTIES_SEPERATOR) > 0){
+ version = version.substring(0, version.indexOf(VERSION_PROPERTIES_SEPERATOR));
+ }
+ } catch (ZipException e) {
+ ESBProjectCorePlugin.log(e.getLocalizedMessage(), e);
+ } catch (IOException e) {
+ ESBProjectCorePlugin.log(e.getLocalizedMessage(), e);
+ }
+
+ return version;
+ }
+
}
\ No newline at end of file
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF 2013-01-17 20:09:42 UTC (rev 44659)
@@ -1,50 +1,50 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.jboss.tools.esb.project.ui;singleton:=true
-Bundle-Version: 1.5.2.qualifier
-Bundle-Activator: org.jboss.tools.esb.project.ui.ESBProjectPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.pde.ui,
- org.eclipse.pde.ui.templates,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.core.resources,
- org.eclipse.ui.ide,
- org.eclipse.wst.web.ui,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.frameworks.ui,
- org.eclipse.wst.common.core,
- org.eclipse.wst.common.project.facet.ui,
- org.eclipse.wst.server.ui,
- org.eclipse.wst.web,
- org.eclipse.wst.common.modulecore,
- org.eclipse.wst.server.core,
- org.eclipse.jst.server.core,
- org.eclipse.jst.ws.annotations.core,
- org.eclipse.jst.servlet.ui;bundle-version="1.1.200",
- org.eclipse.jst.common.frameworks;bundle-version="1.1.200",
- org.eclipse.jst.common.project.facet.core;bundle-version="1.3.0",
- org.eclipse.jst.j2ee;bundle-version="1.1.200",
- org.eclipse.jst.j2ee.web;bundle-version="1.1.200",
- org.eclipse.jst.j2ee.core;bundle-version="1.1.200",
- org.eclipse.jst.j2ee.ui;bundle-version="1.1.200",
- org.eclipse.jdt.core;bundle-version="3.4.0",
- org.jboss.tools.esb.project.core;bundle-version="1.0.0",
- org.eclipse.jdt.ui;bundle-version="3.4.1",
- org.jboss.ide.eclipse.as.ui;bundle-version="1.0.0",
- org.jboss.ide.eclipse.as.wtp.core;bundle-version="1.0.0",
- org.jboss.ide.eclipse.as.core;bundle-version="1.0.0",
- org.jboss.tools.common.ui;bundle-version="3.1.0",
- org.eclipse.zest.core,
- org.eclipse.zest.layouts
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %Bundle-Vendor.0
-Eclipse-RegisterBuddy: org.eclipse.jst.ws.annotations.core
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ClassPath: .,
- lib/jbossesb-rosetta.jar
-Export-Package: org.jboss.soa.esb.actions.annotation,
- org.jboss.soa.esb.configure,
- org.jboss.soa.esb.lifecycle.annotation
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name.0
+Bundle-SymbolicName: org.jboss.tools.esb.project.ui;singleton:=true
+Bundle-Version: 1.5.100.qualifier
+Bundle-Activator: org.jboss.tools.esb.project.ui.ESBProjectPlugin
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.pde.ui,
+ org.eclipse.pde.ui.templates,
+ org.eclipse.wst.common.project.facet.core,
+ org.eclipse.core.resources,
+ org.eclipse.ui.ide,
+ org.eclipse.wst.web.ui,
+ org.eclipse.wst.common.frameworks,
+ org.eclipse.wst.common.frameworks.ui,
+ org.eclipse.wst.common.core,
+ org.eclipse.wst.common.project.facet.ui,
+ org.eclipse.wst.server.ui,
+ org.eclipse.wst.web,
+ org.eclipse.wst.common.modulecore,
+ org.eclipse.wst.server.core,
+ org.eclipse.jst.server.core,
+ org.eclipse.jst.ws.annotations.core,
+ org.eclipse.jst.servlet.ui;bundle-version="1.1.200",
+ org.eclipse.jst.common.frameworks;bundle-version="1.1.200",
+ org.eclipse.jst.common.project.facet.core;bundle-version="1.3.0",
+ org.eclipse.jst.j2ee;bundle-version="1.1.200",
+ org.eclipse.jst.j2ee.web;bundle-version="1.1.200",
+ org.eclipse.jst.j2ee.core;bundle-version="1.1.200",
+ org.eclipse.jst.j2ee.ui;bundle-version="1.1.200",
+ org.eclipse.jdt.core;bundle-version="3.4.0",
+ org.jboss.tools.esb.project.core;bundle-version="1.0.0",
+ org.eclipse.jdt.ui;bundle-version="3.4.1",
+ org.jboss.ide.eclipse.as.ui;bundle-version="1.0.0",
+ org.jboss.ide.eclipse.as.wtp.core;bundle-version="1.0.0",
+ org.jboss.ide.eclipse.as.core;bundle-version="1.0.0",
+ org.jboss.tools.common.ui;bundle-version="3.1.0",
+ org.eclipse.zest.core,
+ org.eclipse.zest.layouts
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %Bundle-Vendor.0
+Eclipse-RegisterBuddy: org.eclipse.jst.ws.annotations.core
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ClassPath: .,
+ lib/jbossesb-rosetta.jar
+Export-Package: org.jboss.soa.esb.actions.annotation,
+ org.jboss.soa.esb.configure,
+ org.jboss.soa.esb.lifecycle.annotation
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/pom.xml 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
@@ -5,11 +5,11 @@
<parent>
<groupId>org.jboss.tools.esb</groupId>
<artifactId>plugins</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.esb.plugins</groupId>
<artifactId>org.jboss.tools.esb.project.ui</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java 2013-01-17 20:09:42 UTC (rev 44659)
@@ -1,1290 +1,1312 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.ui.preference.controls;
-
-import java.beans.PropertyChangeListener;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.layout.FormLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.jboss.tools.common.ui.widget.editor.BaseFieldEditor;
-import org.jboss.tools.common.ui.widget.editor.ButtonFieldEditor;
-import org.jboss.tools.common.ui.widget.editor.ComboFieldEditor;
-import org.jboss.tools.common.ui.widget.editor.CompositeEditor;
-import org.jboss.tools.common.ui.widget.editor.IFieldEditor;
-import org.jboss.tools.common.ui.widget.editor.LabelFieldEditor;
-import org.jboss.tools.common.ui.widget.editor.TextFieldEditor;
-import org.jboss.tools.esb.core.ESBProjectConstant;
-import org.jboss.tools.esb.core.runtime.JBossESBRuntime;
-import org.jboss.tools.esb.core.runtime.JBossRuntimeManager;
-import org.jboss.tools.esb.project.ui.messages.JBossESBUIMessages;
-
-/**
- * @author Grid Qian
- */
-public class JBossRuntimeListFieldEditor extends BaseFieldEditor {
-
- // ------------------------------------------------------------------------
- // Layout parameters
- // ------------------------------------------------------------------------
-
- static final int GL_COLUMNS = 2;
- static final int GL_HINT_HEIGHT = 200;
- static final int TC_DEFAULT_WIDTH = 21;
- static final int TC_NAME_WIDTH = 100;
- static final int TC_VERSION_WIDTH = 50;
- static final int TC_PATH_WIDTH = 100;
-
- // ------------------------------------------------------------------------
- // Field declarations
- // ------------------------------------------------------------------------
-
- private CheckboxTableViewer tableView = null;
-
- private Composite root = null;
-
- private ActionPanel actionPanel;
-
- private Map<JBossESBRuntime, JBossESBRuntime> changed = new HashMap<JBossESBRuntime, JBossESBRuntime>();
-
- private JBossESBRuntime checkedElement = new JBossESBRuntime();
-
- private List<JBossESBRuntime> added = new ArrayList<JBossESBRuntime>();
-
- private List<JBossESBRuntime> removed = new ArrayList<JBossESBRuntime>();
-
- // ------------------------------------------------------------------------
- // Constructors
- // ------------------------------------------------------------------------
-
- /**
- * Control for editing JBossRuntime list
- *
- * @param name
- * String
- * @param label
- * String
- * @param defaultValue
- * Object
- */
- public JBossRuntimeListFieldEditor(String name, String label,
- Object defaultValue) {
- super(name, label, defaultValue);
- }
-
- /**
- * TBD
- *
- * @return JBossRuntime;
- */
- public JBossESBRuntime getDefaultJBossRuntime() {
- return checkedElement;
- }
-
- public void setDefaultJBossRuntime(JBossESBRuntime rt) {
- checkedElement = rt;
- }
-
- /**
- * TBD
- *
- * @return List<JBossRuntime>
- */
- public List<JBossESBRuntime> getAddedJBossRuntimes() {
- return added;
- }
-
- /**
- * TBD
- *
- * @return List<JBossRuntime>
- */
- public Map<JBossESBRuntime, JBossESBRuntime> getChangedJBossRuntimes() {
- return changed;
- }
-
- /**
- * TBD
- *
- * @return List<JBossRuntime>
- */
- public List<JBossESBRuntime> getRemoved() {
- return removed;
- }
-
- /**
- * TBD
- *
- * @param composite
- * Object - instance of Composite
- * @return Object[]
- */
- @Override
- public Object[] getEditorControls(Object composite) {
-
- root = new Composite((Composite) composite, SWT.NONE);
- GridData gd = new GridData();
- gd.horizontalAlignment = GridData.FILL;
- gd.grabExcessHorizontalSpace = true;
- root.setLayoutData(gd);
-
- root.setLayout(new FormLayout());
- createTableView();
- createActionBar();
-
- FormData tableData = new FormData();
- tableData.left = new FormAttachment(0, 5);
- tableData.right = new FormAttachment(actionPanel, -5);
- tableData.top = new FormAttachment(0, 5);
- tableData.bottom = new FormAttachment(100, -5);
- tableView.getControl().setLayoutData(tableData);
-
- FormData actionsData = new FormData();
- actionsData.top = new FormAttachment(0, 5);
- actionsData.bottom = new FormAttachment(100, -5);
- actionsData.right = new FormAttachment(100, -5);
- actionPanel.setLayoutData(actionsData);
- return new Control[] { root };
- }
-
- @SuppressWarnings("unchecked")
- protected void createTableView() {
- tableView = CheckboxTableViewer.newCheckList(root, SWT.V_SCROLL
- | SWT.BORDER | SWT.FULL_SELECTION | SWT.SINGLE);
-
- TableColumn tc1 = new TableColumn(tableView.getTable(), SWT.CENTER);
- tc1.setWidth(TC_DEFAULT_WIDTH);
- tc1.setResizable(false);
-
- TableColumn tc2 = new TableColumn(tableView.getTable(), SWT.LEFT);
- tc2.setWidth(TC_NAME_WIDTH);
- tc2.setText(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Name);
-
- TableColumn tc3 = new TableColumn(tableView.getTable(), SWT.LEFT);
- tc3.setWidth(TC_VERSION_WIDTH);
- tc3
- .setText(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Version);
-
- TableColumn tc4 = new TableColumn(tableView.getTable(), SWT.LEFT);
- tc4.setWidth(TC_PATH_WIDTH);
- tc4.setText(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Path);
-
- tableView.setContentProvider(new IStructuredContentProvider() {
-
- public Object[] getElements(Object inputElement) {
- if (inputElement instanceof List) {
- return ((List<JBossESBRuntime>) inputElement).toArray();
- } else {
- throw new IllegalArgumentException(
- JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Inputelement_Must_Be_List);
- }
- }
-
- public void dispose() {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput,
- Object newInput) {
- viewer.refresh();
- }
- });
-
- tableView.setLabelProvider(new ITableLabelProvider() {
-
- private static final int TC_DEFAULT_NUMBER = 0;
- private static final int TC_NAME_NUMBER = 1;
- private static final int TC_VERSION_NUMBER = 2;
- private static final int TC_PATH_NUMBER = 3;
-
- public void addListener(ILabelProviderListener listener) {
- }
-
- public void dispose() {
- }
-
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- public void removeListener(ILabelProviderListener listener) {
- }
-
- public Image getColumnImage(Object element, int columnIndex) {
- return null;
- }
-
- public String getColumnText(Object element, int columnIndex) {
- JBossESBRuntime rt = (JBossESBRuntime) element;
- if (columnIndex == TC_DEFAULT_NUMBER) {
- return ""; //$NON-NLS-1$
- }
- if (columnIndex == TC_NAME_NUMBER) {
- return rt.getName();
- }
- if (columnIndex == TC_VERSION_NUMBER) {
- return rt.getVersion().toString();
- }
- if (columnIndex == TC_PATH_NUMBER) {
- return rt.getHomeDir();
- }
- return ""; //$NON-NLS-1$
- }
- });
-
- tableView.setInput(getValue());
- tableView.getTable().setLinesVisible(true);
- tableView.getTable().setHeaderVisible(true);
- tableView.addCheckStateListener(new ICheckStateListener() {
- public void checkStateChanged(CheckStateChangedEvent event) {
- JBossESBRuntime selRt = (JBossESBRuntime) event.getElement();
- if (event.getChecked()) {
- JBossESBRuntime deselRt = null;
- Object[] selRts = tableView.getCheckedElements();
-
- for (int i = 0; i < selRts.length; i++) {
- JBossESBRuntime rt = (JBossESBRuntime) selRts[i];
- if (rt != selRt) {
- deselRt = rt;
- break;
- }
- }
-
- if (deselRt != null) {
- Object[] newChecked = new Object[selRts.length - 1];
- checkedElement = null;
- int i = 0;
- for (Object object : selRts) {
- JBossESBRuntime rt = (JBossESBRuntime) object;
- if (rt == selRt) {
- newChecked[i] = rt;
- checkedElement = rt;
- i++;
- }
- }
- tableView.setCheckedElements(newChecked);
- } else {
- checkedElement = (JBossESBRuntime) event.getElement();
- }
- } else {
- if (checkedElement == selRt) {
- checkedElement = null;
- }
- }
- pcs.firePropertyChange(getName(), null, getValue());
- }
- });
-
- for (JBossESBRuntime rt : (List<JBossESBRuntime>) getValue()) {
- if (rt.isDefault()) {
- tableView.setChecked(rt, true);
- checkedElement = rt;
- }
- }
- }
-
- protected void createActionBar() {
- actionPanel = new ActionPanel(root, new BaseAction[] { new AddAction(),
- new EditAction(), new RemoveAction() });
- tableView.addSelectionChangedListener(actionPanel);
- }
-
- /**
- * Checks all runtimes and set default one if user did not do it.
- */
- @SuppressWarnings("unchecked")
- private void setDefaultRuntime() {
- List<JBossESBRuntime> runtimes = (List<JBossESBRuntime>) getValue();
- boolean checked = false;
- for (JBossESBRuntime jbossRuntime : runtimes) {
-
- if (checkedElement == jbossRuntime) {
- checked = true;
- tableView.setChecked(checkedElement, true);
- break;
- }
- }
- if (!checked && runtimes.size() > 0) {
- if (tableView.getCheckedElements() == null
- || tableView.getCheckedElements().length == 0) {
- tableView.setChecked(runtimes.get(0), true);
- checkedElement = runtimes.get(0);
- }
- }
-
- }
-
- /**
- * Return array of Controls that forms and editor
- *
- * @return Control[]
- */
- @Override
- public Object[] getEditorControls() {
- return new Control[] { root };
- }
-
- /**
- * Return number of controls in editor
- *
- * @return int
- */
- @Override
- public int getNumberOfControls() {
- return 1;
- }
-
- /**
- * Fill wizard page with editors
- *
- * @param parent
- * Composite - parent composite
- */
- @Override
- public void doFillIntoGrid(Object parent) {
- Assert.isTrue(parent instanceof Composite,
- JBossESBUIMessages.Error_JBoss_Basic_Editor_Composite);
- Assert.isTrue(((Composite) parent).getLayout() instanceof GridLayout,
- JBossESBUIMessages.Error_JBoss_Basic_Editor_Support);
- Composite aComposite = (Composite) parent;
- getEditorControls(aComposite);
- GridLayout gl = (GridLayout) ((Composite) parent).getLayout();
-
- GridData gd = new GridData();
- gd.horizontalSpan = gl.numColumns;
- gd.grabExcessHorizontalSpace = true;
- gd.horizontalAlignment = GridData.FILL;
-
- ((Control) getEditorControls()[0]).setLayoutData(gd);
- }
-
- /**
- * Wizard page for editing JBoss ESB Runtime parameters
- *
- */
- public static class JBossESBRuntimeWizardPage extends WizardPage implements
- PropertyChangeListener {
-
- private static final String SRT_NAME = "name"; //$NON-NLS-1$
- private static final String SRT_VERSION = "version"; //$NON-NLS-1$
- private static final String SRT_HOMEDIR = "homeDir"; //$NON-NLS-1$
-
- private static final int GL_PARENT_COLUMNS = 1;
- private static final int GL_CONTENT_COLUMNS = 3;
-
- List<JBossESBRuntime> value = null;
-
- IFieldEditor name = createTextEditor(SRT_NAME,
- JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Name2, ""); //$NON-NLS-1$
-
- IFieldEditor version = createComboEditor(SRT_VERSION,
- JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Version2, getESBFacetVersions(), ""); //$NON-NLS-1$
-
-// IFieldEditor configuration = createComboEditor(SRT_CONFIGURATION,
-// JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Configuration, getESBFacetVersions(), ""); //$NON-NLS-1$
- Combo configuration;
-
- IFieldEditor homeDir = createBrowseFolderEditor(
- SRT_HOMEDIR,
- JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Home_Folder,
- ""); //$NON-NLS-1$
-
- JBossESBRuntime current = null;
- JBossESBRuntime source = null;
- IFieldEditor jars = null;
-
- public JBossESBRuntimeWizardPage(List<JBossESBRuntime> editedList, JBossESBRuntime source) {
- super(
- JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_New_Runtime);
-
- setMessage(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Create_A_Runtime);
- setTitle(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Runtime);
- value = editedList;
- this.source = source;
- }
-
- /**
- * Create Wizard page content
- *
- * @param parent
- * Composite - parent composite
- */
- public void createControl(Composite parent) {
- parent.setLayout(new GridLayout(GL_PARENT_COLUMNS, false));
- GridData dg = new GridData();
- dg.horizontalAlignment = GridData.FILL;
- dg.grabExcessHorizontalSpace = true;
- Composite root = new Composite(parent, SWT.NONE);
- root.setLayoutData(dg);
- GridLayout gl = new GridLayout(GL_CONTENT_COLUMNS, false);
- root.setLayout(gl);
- name.doFillIntoGrid(root);
- name.addPropertyChangeListener(this);
- version.doFillIntoGrid(root);
- version.addPropertyChangeListener(this);
- homeDir.doFillIntoGrid(root);
- homeDir.addPropertyChangeListener(this);
-
- new Label(root, SWT.NONE).setText(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Configuration);
- Composite cfgComposite = new Composite(root, SWT.NONE);
- cfgComposite.setLayout(new GridLayout(2, false));
- cfgComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- configuration = new Combo(cfgComposite, SWT.READ_ONLY);
- GridData gd = new GridData();
- gd.widthHint = 150;
- configuration.setLayoutData(gd);
- new Label(cfgComposite, SWT.NONE).setText(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Configuration_Description);
- configuration.addModifyListener(new ModifyListener() {
-
- public void modifyText(ModifyEvent e) {
- checkPageComplete();
- }
- });
-
-
-
- jars = new JBossLibraryListFieldEditor("", "", current); //$NON-NLS-1$ //$NON-NLS-2$
- jars.doFillIntoGrid(root);
- jars.addPropertyChangeListener(this);
- setPageComplete(false);
- setControl(root);
-
- updateConfigrations(homeDir.getValueAsString());
- }
-
- /**
- * Process evt: setup default values based on JBossWS Home folder and
- * validate user input
- *
- * @param evt
- * PropertyChangeEvent describes changes in wizard
- */
- public void propertyChange(java.beans.PropertyChangeEvent evt) {
- if ("homeDir".equals(evt.getPropertyName())) { //$NON-NLS-1$
- updateConfigrations(homeDir.getValueAsString());
- }
-
- checkPageComplete();
- }
-
- private void checkPageComplete(){
-
- if (name.getValueAsString() == null || "".equals(//$NON-NLS-1$
- name.getValueAsString().toString().trim())) {
- setErrorMessage(JBossESBUIMessages.Error_JBoss_Runtime_List_Field_Editor_Name_Cannot_Be_Empty);
- setPageComplete(false);
- return;
- }
-
- if(version.getValueAsString() == null || "".equals(version.getValueAsString())){ //$NON-NLS-1$
- setErrorMessage(JBossESBUIMessages.Error_JBoss_Runtime_List_Field_Editor_Version_Cannot_Be_Empty);
- setPageComplete(false);
- return;
- }
-
- if (!name.getValueAsString().matches(
- "[a-zA-Z_][a-zA-Z0-9_\\-\\. ]*")) { //$NON-NLS-1$
- setErrorMessage(JBossESBUIMessages.Error_JBoss_Runtime_List_Field_Editor_Runtime_Name_Is_Not_Correct);
- setPageComplete(false);
- return;
- }
- for (JBossESBRuntime rt : value) {
- if (current != null && current.getName().equals(rt.getName())) {
- continue;
- }
- if (rt.getName().equals(name.getValueAsString())) {
- setErrorMessage(NLS.bind(
- JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Runtime_Already_Exists,
- name.getValueAsString()));
- setPageComplete(false);
- return;
- }
- }
-
- JBossESBRuntime jarJbws = (JBossESBRuntime) jars.getValue();
- if (current != null
- && current.getName().equals(name.getValueAsString())
- && current.getHomeDir().equals(homeDir.getValueAsString())
- && current.getVersion().equals(version.getValueAsString())
- && current.isUserConfigClasspath() == jarJbws
- .isUserConfigClasspath()
- && current.getConfiguration().equals(configuration.getText())
- && (!jarJbws.isUserConfigClasspath() || hasSameLibraies(
- current.getLibraries(), jarJbws.getLibraries()))) {
-
- setErrorMessage(null);
- setPageComplete(false);
- return;
- }
-
- if (jarJbws.isUserConfigClasspath()
- && jarJbws.getLibraries().size() == 0) {
- setErrorMessage(JBossESBUIMessages.JBossRuntimeListFieldEditor_ErrorMessageAtLeastOneJar);
- setPageComplete(false);
- return;
- }
-
- if (homeDir.getValueAsString() == null
- || "".equals(homeDir.getValueAsString().trim())) { //$NON-NLS-1$
- setErrorMessage(JBossESBUIMessages.Error_JBoss_Runtime_List_Field_Editor_Path_To_Home_Diretory_Cannot_Be_Empty);
- setPageComplete(false);
- return;
- }
-
- if (!runtimeExist(homeDir.getValueAsString(), (String)version.getValue(), configuration.getText())) {
- final Combo vCombo = (Combo)this.version.getEditorControls()[1];
- String[] vStrings = vCombo.getItems();
- for( int i = 0; i < vStrings.length; i++ ) {
- boolean works = runtimeExist(homeDir.getValueAsString(), vStrings[i], configuration.getText());
- if( works ) {
- final String newVersion = vStrings[i];
- final int i2 = i;
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- vCombo.select(i2);
- version.setValue(newVersion);
- }
- });
- return;
- }
- }
- setErrorMessage(NLS.bind(JBossESBUIMessages.Label_JBoss_Runtime_Load_Error, version.getValue()));
- setPageComplete(false);
- return;
- }
-
- setErrorMessage(null);
- setPageComplete(true);
- }
-
- private boolean hasSameLibraies(List<String> lib1, List<String> lib2) {
- if (lib1.size() != lib2.size())
- return false;
- for (String jar : lib1) {
- if (!lib2.contains(jar))
- return false;
- }
-
- return true;
- }
-
- private List<String> getESBFacetVersions(){
- List<String> versions = new ArrayList<String>();
- IProjectFacet esbfacet = ProjectFacetsManager.getProjectFacet(ESBProjectConstant.ESB_PROJECT_FACET);
- for(IProjectFacetVersion version: esbfacet.getVersions()){
- versions.add(version.getVersionString());
- }
- //versions.add("");
- Comparator<String> comparator = new Comparator<String>() {
-
- public int compare(String o1, String o2) {
- if (o1 == null || o2 == null) {
- return 0;
- }
- String[] split1 = o1.split("\\.");
- String[] split2 = o2.split("\\.");
- if (split1.length != 2 || split2.length != 2) {
- return o1.compareTo(o2);
- }
- int o11;
- int o12;
- int o21;
- int o22;
- try {
- o11 = new Integer(split1[0]);
- o12 = new Integer(split1[1]);
- o21 = new Integer(split2[0]);
- o22 = new Integer(split2[1]);
- } catch (NumberFormatException e) {
- return o1.compareTo(o2);
- }
-
- if (o11 > o21) {
- return 1;
- }
- if (o11 < o21) {
- return -1;
- }
- if (o12 > o22) {
- return 1;
- }
- if (o12 < o22) {
- return -1;
- }
- return 0;
- }
-
- };
- Collections.sort(versions, comparator);
- versions.add("");
- //Collections.reverse(versions);
- return versions;
- }
-
-
- private List<String> updateConfigrations(String location){
-
- ArrayList<String> configList = new ArrayList<String>();
- IPath locationPath = new Path(location);
- IPath asPath = locationPath.append("jboss-as").append("server");
- if(!asPath.toFile().exists()){
- asPath = locationPath.append("server");
- }
-
-// IPath asPath = locationPath.append("server");
- File serverDirectory = asPath.toFile();
-
- if (serverDirectory.exists()) {
-
- File types[] = serverDirectory.listFiles();
- for (int i = 0; i < types.length; i++) {
- File serviceDescriptor = new File(types[i]
- .getAbsolutePath()
- + File.separator
- + "conf" //$NON-NLS-1$
- + File.separator
- + "jboss-service.xml"); //$NON-NLS-1$
-
- if (types[i].isDirectory() && serviceDescriptor.exists()) {
- String configuration = types[i].getName();
- configList.add(configuration);
- }
- }
-
- if (configList.size() > 0) {
- getControl().setEnabled(true);
- }
- }
-
- if(configuration != null && !configuration.isDisposed()){
- configuration.removeAll();
-
- for(String config : configList){
- configuration.add(config);
- if("default".equals(config)){
- configuration.select(configList.indexOf(config));
- }
- }
- if(source != null && source.getConfiguration() != null){
- configuration.setText(source.getConfiguration());
- }
- }
-
- // set version automatically according esb home location and configuration
- updateDefaultVersion();
-
- return configList;
-
- }
-
- private void updateDefaultVersion(){
- String homeLocation = homeDir.getValueAsString();
- String config = configuration.getText();
- String defaultVersion = JBossRuntimeManager.getInstance().getVersion(homeLocation, config);
- version.setValue(defaultVersion);
-
- }
- /**
- * Return JBossWS Runtime instance initialized by user input
- *
- * @return JBossRuntime instance
- */
- public JBossESBRuntime getRuntime() {
- JBossESBRuntime newRt = new JBossESBRuntime();
- newRt.setName(name.getValueAsString());
- newRt.setVersion(version.getValueAsString());
- newRt.setHomeDir(homeDir.getValueAsString());
- newRt.setConfiguration(configuration.getText());
- JBossESBRuntime rt = (JBossESBRuntime) jars.getValue();
- newRt.setLibraries(rt.getLibraries());
- newRt.setUserConfigClasspath(rt.isUserConfigClasspath());
- return newRt;
- }
-
- public IFieldEditor createTextEditor(String name, String label,
- String defaultValue) {
- CompositeEditor editor = new CompositeEditor(name, label,
- defaultValue);
- editor.addFieldEditors(new IFieldEditor[] {
- new LabelFieldEditor(name, label),
- new TextFieldEditor(name, label, defaultValue) });
- return editor;
- }
-
- public IFieldEditor createComboEditor(String name, String label,
- List<String> values, String defaultValue) {
- CompositeEditor editor = new CompositeEditor(name, label,
- defaultValue);
- editor.addFieldEditors(new IFieldEditor[] {
- new LabelFieldEditor(name, label),
- new ComboFieldEditor(name, label, values, defaultValue, false) });
- return editor;
- }
-
- public IFieldEditor createBrowseFolderEditor(String name, String label,
- String defaultValue) {
- CompositeEditor editor = new CompositeEditor(name, label,
- defaultValue);
- editor
- .addFieldEditors(new IFieldEditor[] {
- new LabelFieldEditor(name, label),
- new TextFieldEditor(name, label, defaultValue),
- new ButtonFieldEditor(
- name,
- createSelectFolderAction(JBossESBUIMessages.JBoss_SWT_Field_Editor_Factory_Browse),
- defaultValue) });
- return editor;
- }
-
- public ButtonFieldEditor.ButtonPressedAction createSelectFolderAction(
- String buttonName) {
- return new ButtonFieldEditor.ButtonPressedAction(buttonName) {
- @Override
- public void run() {
- DirectoryDialog dialog = new DirectoryDialog(Display
- .getCurrent().getActiveShell());
- dialog.setFilterPath(getFieldEditor().getValueAsString());
- dialog
- .setMessage(JBossESBUIMessages.JBoss_SWT_Field_Editor_Factory_Select_Home_Folder);
- dialog.setFilterPath(getFieldEditor().getValueAsString());
- String directory = dialog.open();
- if (directory != null) {
- getFieldEditor().setValue(directory);
- }
- }
- };
- }
-
- private boolean runtimeExist(String path, String version, String configuration) {
-
- File jbosswsHomeDir = new File(path);
- if (!jbosswsHomeDir.isDirectory())
- return false;
-
- if(!JBossRuntimeManager.isValidESBStandaloneRuntimeDir(path, version, configuration)
- && !JBossRuntimeManager.isValidESBServer(path, version, configuration)){
- return false;
- }
-
-
- return true;
- }
-
-
-
- }
-
-
-
- /**
- * Wizard collect information and creates new JBossRuntime instances.
- *
- */
- public static class JBossRuntimeNewWizard extends Wizard {
-
- JBossESBRuntimeWizardPage page1 = null;
- List<JBossESBRuntime> added = null;
- List<JBossESBRuntime> value = null;
-
- public JBossRuntimeNewWizard(List<JBossESBRuntime> exist,
- List<JBossESBRuntime> added) {
- super();
- setWindowTitle(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_New_Runtime);
- page1 = new JBossESBRuntimeWizardPage(exist, null);
- addPage(page1);
- this.value = exist;
- this.added = added;
- }
-
- /**
- * Do finish steps
- *
- * @return boolean
- */
- @Override
- public boolean performFinish() {
- JBossESBRuntime rt = page1.getRuntime();
- added.add(rt);
- value.add(rt);
-
- return true;
- }
-
- protected JBossESBRuntime getRuntime() {
- return page1.getRuntime();
- }
-
- }
-
- /**
- * Wizard for editing JBossWS Runtime parameters: name and path to home
- * folder
- *
- */
- public static class JBossWSRuntimeEditWizard extends Wizard {
- JBossESBRuntimeWizardPage page1 = null;
- List<JBossESBRuntime> added = null;
- Map<JBossESBRuntime, JBossESBRuntime> changed = null;
- List<JBossESBRuntime> value = null;
- JBossESBRuntime source = null;
-
- /**
- * Constructor with almost all initialization parameters
- *
- * @param existing
- * List<JBossRuntime> - edited list of JBossWS
- * Runtimes
- * @param source
- * JBossRuntime - edited JBossWS Runtime
- * @param added
- * List<JBossRuntime> - TBD
- * @param changed
- * List<JBossRuntime> - TBD
- */
- public JBossWSRuntimeEditWizard(List<JBossESBRuntime> existing,
- JBossESBRuntime source, List<JBossESBRuntime> added,
- Map<JBossESBRuntime, JBossESBRuntime> changed) {
- super();
- setWindowTitle(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Edit_Runtime);
- page1 = new JBossESBRuntimeWizardPage(existing, source);
- page1
- .setMessage(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Modify_Runtime);
- page1
- .setTitle(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Edit_Runtime);
- addPage(page1);
- this.value = existing;
- this.added = added;
- this.changed = changed;
- this.source = source;
- page1.name.setValue(source.getName());
- page1.version.setValue(source.getVersion());
- page1.homeDir.setValue(source.getHomeDir());
- page1.current = source;
- }
-
- /**
- * Perform operations to finish editing JBossWS Runtime parameters
- *
- * @return boolean - always true
- */
- @Override
- public boolean performFinish() {
- JBossESBRuntime rt = page1.getRuntime();
-
- if (added.contains(source) || changed.containsKey(source)) {
- source.setName(rt.getName());
- source.setHomeDir(rt.getHomeDir());
- source.setVersion(rt.getVersion());
- source.setConfiguration(rt.getConfiguration());
- source.setUserConfigClasspath(rt.isUserConfigClasspath());
- source.setLibraries(rt.getLibraries());
- } else {
- changed.put(rt, source);
- if (source.isDefault()) {
- rt.setDefault(true);
- }
- int i = value.indexOf(source);
- if (i >= 0) {
- value.set(i, rt);
-
- } else {
- value.remove(source);
- value.add(rt);
- }
- }
- return true;
- }
- }
-
- /**
- * Composite that holds list of BaseActions and presents them as column of
- * buttons
- *
- */
- public static class ActionPanel extends Composite implements
- ISelectionChangedListener {
-
- private BaseAction[] actions = null;
-
- /**
- * Constructor creates panel with style, grid layout and buttons
- * represented the actions
- *
- * @param parent
- * Composite
- * @param style
- * int
- * @param actions
- * BaseAction[]
- */
- public ActionPanel(Composite parent, int style, BaseAction[] actions) {
- super(parent, style);
- this.actions = actions;
- setLayout(new GridLayout(1, false));
- for (BaseAction action : this.actions) {
- new ActionButton(this, SWT.PUSH, action);
- }
- }
-
- /**
- * Constructor creates panel with default style, grid layout and buttons
- * represented the actions
- *
- * @param parent
- * Composite
- * @param actions
- * BaseAction[]
- */
- public ActionPanel(Composite parent, BaseAction[] actions) {
- this(parent, SWT.NONE, actions);
- }
-
- /**
- * Listen to the selection changes and update actions state
- * (enable/disable)
- *
- * @param event
- * SelectionChangeEvent
- * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
- */
- public void selectionChanged(SelectionChangedEvent event) {
- for (BaseAction action : actions) {
- action.setSelection(event.getSelection());
- }
- }
- }
-
- /**
- * Class represents an BaseAction as SWT button control and runs action when
- * button is prtessed
- *
- */
- public static class ActionButton implements IPropertyChangeListener {
-
- private Button button;
- private BaseAction action;
-
- /**
- * Create Button control with parent control and style that represents
- * action
- *
- * @param parent
- * Composite
- * @param style
- * int
- * @param action
- * BaseAction
- */
- public ActionButton(Composite parent, int style, BaseAction action) {
- this.button = new Button(parent, style);
- this.action = action;
-
- GridData gd = new GridData(GridData.FILL_HORIZONTAL,
- GridData.CENTER, false, false);
-
- gd.horizontalAlignment = GridData.FILL;
- gd.verticalAlignment = GridData.VERTICAL_ALIGN_BEGINNING;
- this.button.setLayoutData(gd);
- this.action.addPropertyChangeListener(this);
- this.button.setText(action.getText());
- this.button.setEnabled(action.isEnabled());
- this.button.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- ActionButton.this.action.run();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- });
-
- }
-
- /**
- * Return SWT button control that calls provided action
- *
- * @return Control - button swt control
- */
- public Control getControl() {
- return button;
- }
-
- /**
- * Update enabled/disabled button state
- *
- * @param event
- * PropertyChangeEvent
- * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
- */
- public void propertyChange(PropertyChangeEvent event) {
- if (event.getProperty().equals(IAction.ENABLED)) {
- button.setEnabled(((Boolean) event.getNewValue())
- .booleanValue());
- }
- }
- }
-
- /**
- * Action that changes state enable/disable based on current table selection
- *
- */
- public abstract class BaseAction extends Action {
-
- JBossESBRuntime[] runtimes = new JBossESBRuntime[0];
-
- /**
- * Constructor creates action with provided name
- *
- * @param name
- * String - action name
- */
- public BaseAction(String name) {
- super(name);
- updateEnablement();
- }
-
- /**
- * Set current selection
- *
- * @param selection
- * ISelection - selected items
- */
- public void setSelection(ISelection selection) {
- if (selection instanceof IStructuredSelection) {
- List<JBossESBRuntime> rts = new ArrayList<JBossESBRuntime>();
- for (Object rt : ((IStructuredSelection) selection).toArray()) {
- rts.add((JBossESBRuntime) rt);
- }
- runtimes = rts.toArray(new JBossESBRuntime[] {});
- } else {
- runtimes = new JBossESBRuntime[0];
- }
- updateEnablement();
- }
-
- protected abstract void updateEnablement();
- }
-
- /**
- * Action that invokes New JBossWS Runtime Dialog
- *
- */
- public class AddAction extends BaseAction {
-
- /**
- * Constructor create Add action with default name
- */
- public AddAction() {
- super(JBossESBUIMessages.JBossRuntimeListFieldEditor_ActionAdd);
- // This action is always available
- setEnabled(true);
- }
-
- /**
- * Do nothing, because Add action should be always available
- */
- @Override
- protected void updateEnablement() {
- // Add button is always available
- }
-
- /**
- * Invoke New JBossWS Runtime Dialog
- *
- * @see org.eclipse.jface.action.Action#run()
- */
- @SuppressWarnings("unchecked")
- @Override
- public void run() {
- Wizard wiz = new JBossRuntimeNewWizard(
- (List<JBossESBRuntime>) getValue(), added);
- WizardDialog dialog = new WizardDialog(Display.getCurrent()
- .getActiveShell(), wiz);
- dialog.open();
- tableView.refresh();
- setDefaultRuntime();
- }
- }
-
- /**
- * Action starts an editing selected JBossWS Runtime in Edit JBossWS Runtime
- * dialog
- *
- */
- public class EditAction extends BaseAction {
-
- /**
- * Create EditAction with default name
- *
- * @param text
- */
- public EditAction() {
- super(JBossESBUIMessages.JBossRuntimeListFieldEditor_ActionEdit);
- }
-
- /**
- * Edit action is enabled when the only JBossWS Runtime is selected
- */
- @Override
- protected void updateEnablement() {
- // available when the only JBossRuntime is selected
- setEnabled(runtimes.length == 1);
- }
-
- /**
- * Start editing selected JBossWS Runtime in Edit JBossWS Runtime Wizard
- * Dialog
- *
- * @see org.eclipse.jface.action.Action#run()
- */
- @SuppressWarnings("unchecked")
- @Override
- public void run() {
- JBossESBRuntime selected = runtimes[0];
- Wizard wiz = new JBossWSRuntimeEditWizard(
- (List<JBossESBRuntime>) getValue(), runtimes[0], added,
- changed);
- WizardDialog dialog = new WizardDialog(Display.getCurrent()
- .getActiveShell(), wiz);
- dialog.open();
- tableView.refresh();
- JBossESBRuntime c = null;
- if (changed.containsValue(selected)) {
- c = findChangedRuntime(selected);
- if (c != null) {
- tableView.setSelection(new StructuredSelection(c));
- }
- }
- if (c != null && c.isDefault()) {
- checkedElement = c;
- }
- setDefaultRuntime();
- }
-
- private JBossESBRuntime findChangedRuntime(JBossESBRuntime source) {
- for (JBossESBRuntime r : changed.keySet()) {
- if (source == changed.get(r)) {
- return r;
- }
- }
- return null;
- }
- }
-
- /**
- * Action deletes all selected JBossWS Runtimes. A warning message is shown
- * for used JBossWS Runtimes
- *
- */
- public class RemoveAction extends BaseAction {
-
- /**
- * Create DeleteAction action with default name
- */
- public RemoveAction() {
- super(JBossESBUIMessages.JBossRuntimeListFieldEditor_ActionRemove);
- }
-
- @Override
- protected void updateEnablement() {
- setEnabled(runtimes.length > 0);
- }
-
- /**
- * Remove all selected JBossWS Runtimes one by one
- *
- * @see org.eclipse.jface.action.Action#run()
- */
- @Override
- public void run() {
- for (JBossESBRuntime rt : runtimes) {
- removeRuntime(rt);
- }
- tableView.refresh();
- setDefaultRuntime();
- }
-
- @SuppressWarnings("unchecked")
- private void removeRuntime(JBossESBRuntime r) {
- boolean used = JBossRuntimeManager.isRuntimeUsed(r.getName());
- String title = JBossESBUIMessages.JBoss_Runtime_Delete_Confirm_Title;
- String message = (used) ? NLS.bind(
- JBossESBUIMessages.JBoss_Runtime_Delete_Used_Confirm, r
- .getName()) : NLS.bind(
- JBossESBUIMessages.JBoss_Runtime_Delete_Not_Used_Confirm,
- r.getName());
- boolean b = MessageDialog.openConfirm(tableView.getControl()
- .getShell(), title, message);
- if (b) {
- if (changed.containsKey(r)) {
- r = changed.remove(r);
- }
- removed.add(r);
- if (added.contains(r)) {
- added.remove(r);
- }
- ((List) getValue()).remove(r);
- }
- if (checkedElement == r) {
- checkedElement = null;
- }
- }
- }
+/*******************************************************************************
+ * Copyright (c) 2008 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.ui.preference.controls;
+
+import java.beans.PropertyChangeListener;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.jface.viewers.CheckStateChangedEvent;
+import org.eclipse.jface.viewers.CheckboxTableViewer;
+import org.eclipse.jface.viewers.ICheckStateListener;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.jboss.tools.common.ui.widget.editor.BaseFieldEditor;
+import org.jboss.tools.common.ui.widget.editor.ButtonFieldEditor;
+import org.jboss.tools.common.ui.widget.editor.ComboFieldEditor;
+import org.jboss.tools.common.ui.widget.editor.CompositeEditor;
+import org.jboss.tools.common.ui.widget.editor.IFieldEditor;
+import org.jboss.tools.common.ui.widget.editor.LabelFieldEditor;
+import org.jboss.tools.common.ui.widget.editor.TextFieldEditor;
+import org.jboss.tools.esb.core.ESBProjectConstant;
+import org.jboss.tools.esb.core.messages.JBossFacetCoreMessages;
+import org.jboss.tools.esb.core.runtime.JBossESBRuntime;
+import org.jboss.tools.esb.core.runtime.JBossRuntimeManager;
+import org.jboss.tools.esb.project.ui.messages.JBossESBUIMessages;
+
+/**
+ * @author Grid Qian
+ */
+public class JBossRuntimeListFieldEditor extends BaseFieldEditor {
+
+ // ------------------------------------------------------------------------
+ // Layout parameters
+ // ------------------------------------------------------------------------
+
+ static final int GL_COLUMNS = 2;
+ static final int GL_HINT_HEIGHT = 200;
+ static final int TC_DEFAULT_WIDTH = 21;
+ static final int TC_NAME_WIDTH = 100;
+ static final int TC_VERSION_WIDTH = 50;
+ static final int TC_PATH_WIDTH = 100;
+
+ // ------------------------------------------------------------------------
+ // Field declarations
+ // ------------------------------------------------------------------------
+
+ private CheckboxTableViewer tableView = null;
+
+ private Composite root = null;
+
+ private ActionPanel actionPanel;
+
+ private Map<JBossESBRuntime, JBossESBRuntime> changed = new HashMap<JBossESBRuntime, JBossESBRuntime>();
+
+ private JBossESBRuntime checkedElement = new JBossESBRuntime();
+
+ private List<JBossESBRuntime> added = new ArrayList<JBossESBRuntime>();
+
+ private List<JBossESBRuntime> removed = new ArrayList<JBossESBRuntime>();
+
+ // ------------------------------------------------------------------------
+ // Constructors
+ // ------------------------------------------------------------------------
+
+ /**
+ * Control for editing JBossRuntime list
+ *
+ * @param name
+ * String
+ * @param label
+ * String
+ * @param defaultValue
+ * Object
+ */
+ public JBossRuntimeListFieldEditor(String name, String label,
+ Object defaultValue) {
+ super(name, label, defaultValue);
+ }
+
+ /**
+ * TBD
+ *
+ * @return JBossRuntime;
+ */
+ public JBossESBRuntime getDefaultJBossRuntime() {
+ return checkedElement;
+ }
+
+ public void setDefaultJBossRuntime(JBossESBRuntime rt) {
+ checkedElement = rt;
+ }
+
+ /**
+ * TBD
+ *
+ * @return List<JBossRuntime>
+ */
+ public List<JBossESBRuntime> getAddedJBossRuntimes() {
+ return added;
+ }
+
+ /**
+ * TBD
+ *
+ * @return List<JBossRuntime>
+ */
+ public Map<JBossESBRuntime, JBossESBRuntime> getChangedJBossRuntimes() {
+ return changed;
+ }
+
+ /**
+ * TBD
+ *
+ * @return List<JBossRuntime>
+ */
+ public List<JBossESBRuntime> getRemoved() {
+ return removed;
+ }
+
+ /**
+ * TBD
+ *
+ * @param composite
+ * Object - instance of Composite
+ * @return Object[]
+ */
+ @Override
+ public Object[] getEditorControls(Object composite) {
+
+ root = new Composite((Composite) composite, SWT.NONE);
+ GridData gd = new GridData();
+ gd.horizontalAlignment = GridData.FILL;
+ gd.grabExcessHorizontalSpace = true;
+ root.setLayoutData(gd);
+
+ root.setLayout(new FormLayout());
+ createTableView();
+ createActionBar();
+
+ FormData tableData = new FormData();
+ tableData.left = new FormAttachment(0, 5);
+ tableData.right = new FormAttachment(actionPanel, -5);
+ tableData.top = new FormAttachment(0, 5);
+ tableData.bottom = new FormAttachment(100, -5);
+ tableView.getControl().setLayoutData(tableData);
+
+ FormData actionsData = new FormData();
+ actionsData.top = new FormAttachment(0, 5);
+ actionsData.bottom = new FormAttachment(100, -5);
+ actionsData.right = new FormAttachment(100, -5);
+ actionPanel.setLayoutData(actionsData);
+ return new Control[] { root };
+ }
+
+ @SuppressWarnings("unchecked")
+ protected void createTableView() {
+ tableView = CheckboxTableViewer.newCheckList(root, SWT.V_SCROLL
+ | SWT.BORDER | SWT.FULL_SELECTION | SWT.SINGLE);
+
+ TableColumn tc1 = new TableColumn(tableView.getTable(), SWT.CENTER);
+ tc1.setWidth(TC_DEFAULT_WIDTH);
+ tc1.setResizable(false);
+
+ TableColumn tc2 = new TableColumn(tableView.getTable(), SWT.LEFT);
+ tc2.setWidth(TC_NAME_WIDTH);
+ tc2.setText(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Name);
+
+ TableColumn tc3 = new TableColumn(tableView.getTable(), SWT.LEFT);
+ tc3.setWidth(TC_VERSION_WIDTH);
+ tc3
+ .setText(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Version);
+
+ TableColumn tc4 = new TableColumn(tableView.getTable(), SWT.LEFT);
+ tc4.setWidth(TC_PATH_WIDTH);
+ tc4.setText(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Path);
+
+ tableView.setContentProvider(new IStructuredContentProvider() {
+
+ public Object[] getElements(Object inputElement) {
+ if (inputElement instanceof List) {
+ return ((List<JBossESBRuntime>) inputElement).toArray();
+ } else {
+ throw new IllegalArgumentException(
+ JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Inputelement_Must_Be_List);
+ }
+ }
+
+ public void dispose() {
+ }
+
+ public void inputChanged(Viewer viewer, Object oldInput,
+ Object newInput) {
+ viewer.refresh();
+ }
+ });
+
+ tableView.setLabelProvider(new ITableLabelProvider() {
+
+ private static final int TC_DEFAULT_NUMBER = 0;
+ private static final int TC_NAME_NUMBER = 1;
+ private static final int TC_VERSION_NUMBER = 2;
+ private static final int TC_PATH_NUMBER = 3;
+
+ public void addListener(ILabelProviderListener listener) {
+ }
+
+ public void dispose() {
+ }
+
+ public boolean isLabelProperty(Object element, String property) {
+ return false;
+ }
+
+ public void removeListener(ILabelProviderListener listener) {
+ }
+
+ public Image getColumnImage(Object element, int columnIndex) {
+ return null;
+ }
+
+ public String getColumnText(Object element, int columnIndex) {
+ JBossESBRuntime rt = (JBossESBRuntime) element;
+ if (columnIndex == TC_DEFAULT_NUMBER) {
+ return ""; //$NON-NLS-1$
+ }
+ if (columnIndex == TC_NAME_NUMBER) {
+ return rt.getName();
+ }
+ if (columnIndex == TC_VERSION_NUMBER) {
+ return rt.getVersion().toString();
+ }
+ if (columnIndex == TC_PATH_NUMBER) {
+ return rt.getHomeDir();
+ }
+ return ""; //$NON-NLS-1$
+ }
+ });
+
+ tableView.setInput(getValue());
+ tableView.getTable().setLinesVisible(true);
+ tableView.getTable().setHeaderVisible(true);
+ tableView.addCheckStateListener(new ICheckStateListener() {
+ public void checkStateChanged(CheckStateChangedEvent event) {
+ JBossESBRuntime selRt = (JBossESBRuntime) event.getElement();
+ if (event.getChecked()) {
+ JBossESBRuntime deselRt = null;
+ Object[] selRts = tableView.getCheckedElements();
+
+ for (int i = 0; i < selRts.length; i++) {
+ JBossESBRuntime rt = (JBossESBRuntime) selRts[i];
+ if (rt != selRt) {
+ deselRt = rt;
+ break;
+ }
+ }
+
+ if (deselRt != null) {
+ Object[] newChecked = new Object[selRts.length - 1];
+ checkedElement = null;
+ int i = 0;
+ for (Object object : selRts) {
+ JBossESBRuntime rt = (JBossESBRuntime) object;
+ if (rt == selRt) {
+ newChecked[i] = rt;
+ checkedElement = rt;
+ i++;
+ }
+ }
+ tableView.setCheckedElements(newChecked);
+ } else {
+ checkedElement = (JBossESBRuntime) event.getElement();
+ }
+ } else {
+ if (checkedElement == selRt) {
+ checkedElement = null;
+ }
+ }
+ pcs.firePropertyChange(getName(), null, getValue());
+ }
+ });
+
+ for (JBossESBRuntime rt : (List<JBossESBRuntime>) getValue()) {
+ if (rt.isDefault()) {
+ tableView.setChecked(rt, true);
+ checkedElement = rt;
+ }
+ }
+ }
+
+ protected void createActionBar() {
+ actionPanel = new ActionPanel(root, new BaseAction[] { new AddAction(),
+ new EditAction(), new RemoveAction() });
+ tableView.addSelectionChangedListener(actionPanel);
+ }
+
+ /**
+ * Checks all runtimes and set default one if user did not do it.
+ */
+ @SuppressWarnings("unchecked")
+ private void setDefaultRuntime() {
+ List<JBossESBRuntime> runtimes = (List<JBossESBRuntime>) getValue();
+ boolean checked = false;
+ for (JBossESBRuntime jbossRuntime : runtimes) {
+
+ if (checkedElement == jbossRuntime) {
+ checked = true;
+ tableView.setChecked(checkedElement, true);
+ break;
+ }
+ }
+ if (!checked && runtimes.size() > 0) {
+ if (tableView.getCheckedElements() == null
+ || tableView.getCheckedElements().length == 0) {
+ tableView.setChecked(runtimes.get(0), true);
+ checkedElement = runtimes.get(0);
+ }
+ }
+
+ }
+
+ /**
+ * Return array of Controls that forms and editor
+ *
+ * @return Control[]
+ */
+ @Override
+ public Object[] getEditorControls() {
+ return new Control[] { root };
+ }
+
+ /**
+ * Return number of controls in editor
+ *
+ * @return int
+ */
+ @Override
+ public int getNumberOfControls() {
+ return 1;
+ }
+
+ /**
+ * Fill wizard page with editors
+ *
+ * @param parent
+ * Composite - parent composite
+ */
+ @Override
+ public void doFillIntoGrid(Object parent) {
+ Assert.isTrue(parent instanceof Composite,
+ JBossESBUIMessages.Error_JBoss_Basic_Editor_Composite);
+ Assert.isTrue(((Composite) parent).getLayout() instanceof GridLayout,
+ JBossESBUIMessages.Error_JBoss_Basic_Editor_Support);
+ Composite aComposite = (Composite) parent;
+ getEditorControls(aComposite);
+ GridLayout gl = (GridLayout) ((Composite) parent).getLayout();
+
+ GridData gd = new GridData();
+ gd.horizontalSpan = gl.numColumns;
+ gd.grabExcessHorizontalSpace = true;
+ gd.horizontalAlignment = GridData.FILL;
+
+ ((Control) getEditorControls()[0]).setLayoutData(gd);
+ }
+
+ /**
+ * Wizard page for editing JBoss ESB Runtime parameters
+ *
+ */
+ public static class JBossESBRuntimeWizardPage extends WizardPage implements
+ PropertyChangeListener {
+
+ private static final String SRT_NAME = "name"; //$NON-NLS-1$
+ private static final String SRT_VERSION = "version"; //$NON-NLS-1$
+ private static final String SRT_HOMEDIR = "homeDir"; //$NON-NLS-1$
+
+ private static final int GL_PARENT_COLUMNS = 1;
+ private static final int GL_CONTENT_COLUMNS = 3;
+
+ List<JBossESBRuntime> value = null;
+
+ IFieldEditor name = createTextEditor(SRT_NAME,
+ JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Name2, ""); //$NON-NLS-1$
+
+ IFieldEditor version = createComboEditor(SRT_VERSION,
+ JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Version2, getESBFacetVersions(), ""); //$NON-NLS-1$
+
+// IFieldEditor configuration = createComboEditor(SRT_CONFIGURATION,
+// JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Configuration, getESBFacetVersions(), ""); //$NON-NLS-1$
+ Combo configuration;
+
+ IFieldEditor homeDir = createBrowseFolderEditor(
+ SRT_HOMEDIR,
+ JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Home_Folder,
+ ""); //$NON-NLS-1$
+
+ JBossESBRuntime current = null;
+ JBossESBRuntime source = null;
+ IFieldEditor jars = null;
+
+ public JBossESBRuntimeWizardPage(List<JBossESBRuntime> editedList, JBossESBRuntime source) {
+ super(
+ JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_New_Runtime);
+
+ setMessage(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Create_A_Runtime);
+ setTitle(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Runtime);
+ value = editedList;
+ this.source = source;
+ }
+
+ /**
+ * Create Wizard page content
+ *
+ * @param parent
+ * Composite - parent composite
+ */
+ public void createControl(Composite parent) {
+ parent.setLayout(new GridLayout(GL_PARENT_COLUMNS, false));
+ GridData dg = new GridData();
+ dg.horizontalAlignment = GridData.FILL;
+ dg.grabExcessHorizontalSpace = true;
+ Composite root = new Composite(parent, SWT.NONE);
+ root.setLayoutData(dg);
+ GridLayout gl = new GridLayout(GL_CONTENT_COLUMNS, false);
+ root.setLayout(gl);
+ name.doFillIntoGrid(root);
+ name.addPropertyChangeListener(this);
+ version.doFillIntoGrid(root);
+ version.addPropertyChangeListener(this);
+ homeDir.doFillIntoGrid(root);
+ homeDir.addPropertyChangeListener(this);
+
+ new Label(root, SWT.NONE).setText(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Configuration);
+ Composite cfgComposite = new Composite(root, SWT.NONE);
+ cfgComposite.setLayout(new GridLayout(2, false));
+ cfgComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ configuration = new Combo(cfgComposite, SWT.READ_ONLY);
+ GridData gd = new GridData();
+ gd.widthHint = 150;
+ configuration.setLayoutData(gd);
+ new Label(cfgComposite, SWT.NONE).setText(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Configuration_Description);
+ configuration.addModifyListener(new ModifyListener() {
+
+ public void modifyText(ModifyEvent e) {
+ checkPageComplete();
+ }
+ });
+
+
+
+ jars = new JBossLibraryListFieldEditor("", "", current); //$NON-NLS-1$ //$NON-NLS-2$
+ jars.doFillIntoGrid(root);
+ jars.addPropertyChangeListener(this);
+ setPageComplete(false);
+ setControl(root);
+
+ updateConfigrations(homeDir.getValueAsString());
+ }
+
+ /**
+ * Process evt: setup default values based on JBossWS Home folder and
+ * validate user input
+ *
+ * @param evt
+ * PropertyChangeEvent describes changes in wizard
+ */
+ public void propertyChange(java.beans.PropertyChangeEvent evt) {
+ if ("homeDir".equals(evt.getPropertyName())) { //$NON-NLS-1$
+ updateConfigrations(homeDir.getValueAsString());
+ }
+
+ checkPageComplete();
+ }
+
+ private void checkPageComplete(){
+
+ if (name.getValueAsString() == null || "".equals(//$NON-NLS-1$
+ name.getValueAsString().toString().trim())) {
+ setErrorMessage(JBossESBUIMessages.Error_JBoss_Runtime_List_Field_Editor_Name_Cannot_Be_Empty);
+ setPageComplete(false);
+ return;
+ }
+
+ if(version.getValueAsString() == null || "".equals(version.getValueAsString())){ //$NON-NLS-1$
+ setErrorMessage(JBossESBUIMessages.Error_JBoss_Runtime_List_Field_Editor_Version_Cannot_Be_Empty);
+ setPageComplete(false);
+ return;
+ }
+
+ if (!name.getValueAsString().matches(
+ "[a-zA-Z_][a-zA-Z0-9_\\-\\. ]*")) { //$NON-NLS-1$
+ setErrorMessage(JBossESBUIMessages.Error_JBoss_Runtime_List_Field_Editor_Runtime_Name_Is_Not_Correct);
+ setPageComplete(false);
+ return;
+ }
+ for (JBossESBRuntime rt : value) {
+ if (current != null && current.getName().equals(rt.getName())) {
+ continue;
+ }
+ if (rt.getName().equals(name.getValueAsString())) {
+ setErrorMessage(NLS.bind(
+ JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Runtime_Already_Exists,
+ name.getValueAsString()));
+ setPageComplete(false);
+ return;
+ }
+ }
+
+ JBossESBRuntime jarJbws = (JBossESBRuntime) jars.getValue();
+ if (current != null
+ && current.getName().equals(name.getValueAsString())
+ && current.getHomeDir().equals(homeDir.getValueAsString())
+ && current.getVersion().equals(version.getValueAsString())
+ && current.isUserConfigClasspath() == jarJbws
+ .isUserConfigClasspath()
+ && current.getConfiguration().equals(configuration.getText())
+ && (!jarJbws.isUserConfigClasspath() || hasSameLibraies(
+ current.getLibraries(), jarJbws.getLibraries()))) {
+
+ setErrorMessage(null);
+ setPageComplete(false);
+ return;
+ }
+
+ if (jarJbws.isUserConfigClasspath()
+ && jarJbws.getLibraries().size() == 0) {
+ setErrorMessage(JBossESBUIMessages.JBossRuntimeListFieldEditor_ErrorMessageAtLeastOneJar);
+ setPageComplete(false);
+ return;
+ }
+
+ if (homeDir.getValueAsString() == null
+ || "".equals(homeDir.getValueAsString().trim())) { //$NON-NLS-1$
+ setErrorMessage(JBossESBUIMessages.Error_JBoss_Runtime_List_Field_Editor_Path_To_Home_Diretory_Cannot_Be_Empty);
+ setPageComplete(false);
+ return;
+ }
+
+ if (!runtimeExist(homeDir.getValueAsString(), (String)version.getValue(), configuration.getText())) {
+ final Combo vCombo = (Combo)this.version.getEditorControls()[1];
+ String[] vStrings = vCombo.getItems();
+ for( int i = 0; i < vStrings.length; i++ ) {
+ boolean works = runtimeExist(homeDir.getValueAsString(), vStrings[i], configuration.getText());
+ if( works ) {
+ final String newVersion = vStrings[i];
+ final int i2 = i;
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ vCombo.select(i2);
+ version.setValue(newVersion);
+ }
+ });
+ return;
+ }
+ }
+ setErrorMessage(NLS.bind(JBossESBUIMessages.Label_JBoss_Runtime_Load_Error, version.getValue()));
+ setPageComplete(false);
+ return;
+ }
+
+ setErrorMessage(null);
+
+ // validate version matches what's in the runtime zip or show warning
+ String homeLocation = homeDir.getValueAsString();
+ String config = configuration.getText();
+ String runtimeESBVersion = JBossRuntimeManager.getInstance().getRuntimeESBVersion(homeLocation, config);
+
+ // if we hit a version with a three part version, reduce it to two
+ int pos1 = runtimeESBVersion.indexOf('.');
+ int pos2 = runtimeESBVersion.indexOf('.', pos1 + 1);
+ if (pos2 > -1) {
+ runtimeESBVersion = runtimeESBVersion.substring(0, pos2);
+ }
+
+ if (!runtimeESBVersion.contentEquals(version.getValueAsString())) {
+ String[] boundStrings = new String[]{runtimeESBVersion, version.getValueAsString()};
+ String message = NLS.bind(
+ JBossFacetCoreMessages.Warning_No_Exact_ESB_Runtime_Match, boundStrings);
+ setMessage(message, IMessageProvider.WARNING);
+ }
+
+ setPageComplete(true);
+ }
+
+ private boolean hasSameLibraies(List<String> lib1, List<String> lib2) {
+ if (lib1.size() != lib2.size())
+ return false;
+ for (String jar : lib1) {
+ if (!lib2.contains(jar))
+ return false;
+ }
+
+ return true;
+ }
+
+ private List<String> getESBFacetVersions(){
+ List<String> versions = new ArrayList<String>();
+ IProjectFacet esbfacet = ProjectFacetsManager.getProjectFacet(ESBProjectConstant.ESB_PROJECT_FACET);
+ for(IProjectFacetVersion version: esbfacet.getVersions()){
+ versions.add(version.getVersionString());
+ }
+ //versions.add("");
+ Comparator<String> comparator = new Comparator<String>() {
+
+ public int compare(String o1, String o2) {
+ if (o1 == null || o2 == null) {
+ return 0;
+ }
+ String[] split1 = o1.split("\\.");
+ String[] split2 = o2.split("\\.");
+ if (split1.length != 2 || split2.length != 2) {
+ return o1.compareTo(o2);
+ }
+ int o11;
+ int o12;
+ int o21;
+ int o22;
+ try {
+ o11 = new Integer(split1[0]);
+ o12 = new Integer(split1[1]);
+ o21 = new Integer(split2[0]);
+ o22 = new Integer(split2[1]);
+ } catch (NumberFormatException e) {
+ return o1.compareTo(o2);
+ }
+
+ if (o11 > o21) {
+ return 1;
+ }
+ if (o11 < o21) {
+ return -1;
+ }
+ if (o12 > o22) {
+ return 1;
+ }
+ if (o12 < o22) {
+ return -1;
+ }
+ return 0;
+ }
+
+ };
+ Collections.sort(versions, comparator);
+ versions.add("");
+ //Collections.reverse(versions);
+ return versions;
+ }
+
+
+ private List<String> updateConfigrations(String location){
+
+ ArrayList<String> configList = new ArrayList<String>();
+ IPath locationPath = new Path(location);
+ IPath asPath = locationPath.append("jboss-as").append("server");
+ if(!asPath.toFile().exists()){
+ asPath = locationPath.append("server");
+ }
+
+// IPath asPath = locationPath.append("server");
+ File serverDirectory = asPath.toFile();
+
+ if (serverDirectory.exists()) {
+
+ File types[] = serverDirectory.listFiles();
+ for (int i = 0; i < types.length; i++) {
+ File serviceDescriptor = new File(types[i]
+ .getAbsolutePath()
+ + File.separator
+ + "conf" //$NON-NLS-1$
+ + File.separator
+ + "jboss-service.xml"); //$NON-NLS-1$
+
+ if (types[i].isDirectory() && serviceDescriptor.exists()) {
+ String configuration = types[i].getName();
+ configList.add(configuration);
+ }
+ }
+
+ if (configList.size() > 0) {
+ getControl().setEnabled(true);
+ }
+ }
+
+ if(configuration != null && !configuration.isDisposed()){
+ configuration.removeAll();
+
+ for(String config : configList){
+ configuration.add(config);
+ if("default".equals(config)){
+ configuration.select(configList.indexOf(config));
+ }
+ }
+ if(source != null && source.getConfiguration() != null){
+ configuration.setText(source.getConfiguration());
+ }
+ }
+
+ // set version automatically according esb home location and configuration
+ updateDefaultVersion();
+
+ return configList;
+
+ }
+
+ private void updateDefaultVersion(){
+ String homeLocation = homeDir.getValueAsString();
+ String config = configuration.getText();
+ String defaultVersion = JBossRuntimeManager.getInstance().getVersion(homeLocation, config);
+ version.setValue(defaultVersion);
+
+ }
+ /**
+ * Return JBossWS Runtime instance initialized by user input
+ *
+ * @return JBossRuntime instance
+ */
+ public JBossESBRuntime getRuntime() {
+ JBossESBRuntime newRt = new JBossESBRuntime();
+ newRt.setName(name.getValueAsString());
+ newRt.setVersion(version.getValueAsString());
+ newRt.setHomeDir(homeDir.getValueAsString());
+ newRt.setConfiguration(configuration.getText());
+ JBossESBRuntime rt = (JBossESBRuntime) jars.getValue();
+ newRt.setLibraries(rt.getLibraries());
+ newRt.setUserConfigClasspath(rt.isUserConfigClasspath());
+ return newRt;
+ }
+
+ public IFieldEditor createTextEditor(String name, String label,
+ String defaultValue) {
+ CompositeEditor editor = new CompositeEditor(name, label,
+ defaultValue);
+ editor.addFieldEditors(new IFieldEditor[] {
+ new LabelFieldEditor(name, label),
+ new TextFieldEditor(name, label, defaultValue) });
+ return editor;
+ }
+
+ public IFieldEditor createComboEditor(String name, String label,
+ List<String> values, String defaultValue) {
+ CompositeEditor editor = new CompositeEditor(name, label,
+ defaultValue);
+ editor.addFieldEditors(new IFieldEditor[] {
+ new LabelFieldEditor(name, label),
+ new ComboFieldEditor(name, label, values, defaultValue, false) });
+ return editor;
+ }
+
+ public IFieldEditor createBrowseFolderEditor(String name, String label,
+ String defaultValue) {
+ CompositeEditor editor = new CompositeEditor(name, label,
+ defaultValue);
+ editor
+ .addFieldEditors(new IFieldEditor[] {
+ new LabelFieldEditor(name, label),
+ new TextFieldEditor(name, label, defaultValue),
+ new ButtonFieldEditor(
+ name,
+ createSelectFolderAction(JBossESBUIMessages.JBoss_SWT_Field_Editor_Factory_Browse),
+ defaultValue) });
+ return editor;
+ }
+
+ public ButtonFieldEditor.ButtonPressedAction createSelectFolderAction(
+ String buttonName) {
+ return new ButtonFieldEditor.ButtonPressedAction(buttonName) {
+ @Override
+ public void run() {
+ DirectoryDialog dialog = new DirectoryDialog(Display
+ .getCurrent().getActiveShell());
+ dialog.setFilterPath(getFieldEditor().getValueAsString());
+ dialog
+ .setMessage(JBossESBUIMessages.JBoss_SWT_Field_Editor_Factory_Select_Home_Folder);
+ dialog.setFilterPath(getFieldEditor().getValueAsString());
+ String directory = dialog.open();
+ if (directory != null) {
+ getFieldEditor().setValue(directory);
+ }
+ }
+ };
+ }
+
+ private boolean runtimeExist(String path, String version, String configuration) {
+
+ File jbosswsHomeDir = new File(path);
+ if (!jbosswsHomeDir.isDirectory())
+ return false;
+
+ if(!JBossRuntimeManager.isValidESBStandaloneRuntimeDir(path, version, configuration)
+ && !JBossRuntimeManager.isValidESBServer(path, version, configuration)){
+ return false;
+ }
+
+
+ return true;
+ }
+
+
+
+ }
+
+
+
+ /**
+ * Wizard collect information and creates new JBossRuntime instances.
+ *
+ */
+ public static class JBossRuntimeNewWizard extends Wizard {
+
+ JBossESBRuntimeWizardPage page1 = null;
+ List<JBossESBRuntime> added = null;
+ List<JBossESBRuntime> value = null;
+
+ public JBossRuntimeNewWizard(List<JBossESBRuntime> exist,
+ List<JBossESBRuntime> added) {
+ super();
+ setWindowTitle(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_New_Runtime);
+ page1 = new JBossESBRuntimeWizardPage(exist, null);
+ addPage(page1);
+ this.value = exist;
+ this.added = added;
+ }
+
+ /**
+ * Do finish steps
+ *
+ * @return boolean
+ */
+ @Override
+ public boolean performFinish() {
+ JBossESBRuntime rt = page1.getRuntime();
+ added.add(rt);
+ value.add(rt);
+
+ return true;
+ }
+
+ protected JBossESBRuntime getRuntime() {
+ return page1.getRuntime();
+ }
+
+ }
+
+ /**
+ * Wizard for editing JBossWS Runtime parameters: name and path to home
+ * folder
+ *
+ */
+ public static class JBossWSRuntimeEditWizard extends Wizard {
+ JBossESBRuntimeWizardPage page1 = null;
+ List<JBossESBRuntime> added = null;
+ Map<JBossESBRuntime, JBossESBRuntime> changed = null;
+ List<JBossESBRuntime> value = null;
+ JBossESBRuntime source = null;
+
+ /**
+ * Constructor with almost all initialization parameters
+ *
+ * @param existing
+ * List<JBossRuntime> - edited list of JBossWS
+ * Runtimes
+ * @param source
+ * JBossRuntime - edited JBossWS Runtime
+ * @param added
+ * List<JBossRuntime> - TBD
+ * @param changed
+ * List<JBossRuntime> - TBD
+ */
+ public JBossWSRuntimeEditWizard(List<JBossESBRuntime> existing,
+ JBossESBRuntime source, List<JBossESBRuntime> added,
+ Map<JBossESBRuntime, JBossESBRuntime> changed) {
+ super();
+ setWindowTitle(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Edit_Runtime);
+ page1 = new JBossESBRuntimeWizardPage(existing, source);
+ page1
+ .setMessage(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Modify_Runtime);
+ page1
+ .setTitle(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Edit_Runtime);
+ addPage(page1);
+ this.value = existing;
+ this.added = added;
+ this.changed = changed;
+ this.source = source;
+ page1.name.setValue(source.getName());
+ page1.version.setValue(source.getVersion());
+ page1.homeDir.setValue(source.getHomeDir());
+ page1.current = source;
+ }
+
+ /**
+ * Perform operations to finish editing JBossWS Runtime parameters
+ *
+ * @return boolean - always true
+ */
+ @Override
+ public boolean performFinish() {
+ JBossESBRuntime rt = page1.getRuntime();
+
+ if (added.contains(source) || changed.containsKey(source)) {
+ source.setName(rt.getName());
+ source.setHomeDir(rt.getHomeDir());
+ source.setVersion(rt.getVersion());
+ source.setConfiguration(rt.getConfiguration());
+ source.setUserConfigClasspath(rt.isUserConfigClasspath());
+ source.setLibraries(rt.getLibraries());
+ } else {
+ changed.put(rt, source);
+ if (source.isDefault()) {
+ rt.setDefault(true);
+ }
+ int i = value.indexOf(source);
+ if (i >= 0) {
+ value.set(i, rt);
+
+ } else {
+ value.remove(source);
+ value.add(rt);
+ }
+ }
+ return true;
+ }
+ }
+
+ /**
+ * Composite that holds list of BaseActions and presents them as column of
+ * buttons
+ *
+ */
+ public static class ActionPanel extends Composite implements
+ ISelectionChangedListener {
+
+ private BaseAction[] actions = null;
+
+ /**
+ * Constructor creates panel with style, grid layout and buttons
+ * represented the actions
+ *
+ * @param parent
+ * Composite
+ * @param style
+ * int
+ * @param actions
+ * BaseAction[]
+ */
+ public ActionPanel(Composite parent, int style, BaseAction[] actions) {
+ super(parent, style);
+ this.actions = actions;
+ setLayout(new GridLayout(1, false));
+ for (BaseAction action : this.actions) {
+ new ActionButton(this, SWT.PUSH, action);
+ }
+ }
+
+ /**
+ * Constructor creates panel with default style, grid layout and buttons
+ * represented the actions
+ *
+ * @param parent
+ * Composite
+ * @param actions
+ * BaseAction[]
+ */
+ public ActionPanel(Composite parent, BaseAction[] actions) {
+ this(parent, SWT.NONE, actions);
+ }
+
+ /**
+ * Listen to the selection changes and update actions state
+ * (enable/disable)
+ *
+ * @param event
+ * SelectionChangeEvent
+ * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
+ */
+ public void selectionChanged(SelectionChangedEvent event) {
+ for (BaseAction action : actions) {
+ action.setSelection(event.getSelection());
+ }
+ }
+ }
+
+ /**
+ * Class represents an BaseAction as SWT button control and runs action when
+ * button is prtessed
+ *
+ */
+ public static class ActionButton implements IPropertyChangeListener {
+
+ private Button button;
+ private BaseAction action;
+
+ /**
+ * Create Button control with parent control and style that represents
+ * action
+ *
+ * @param parent
+ * Composite
+ * @param style
+ * int
+ * @param action
+ * BaseAction
+ */
+ public ActionButton(Composite parent, int style, BaseAction action) {
+ this.button = new Button(parent, style);
+ this.action = action;
+
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL,
+ GridData.CENTER, false, false);
+
+ gd.horizontalAlignment = GridData.FILL;
+ gd.verticalAlignment = GridData.VERTICAL_ALIGN_BEGINNING;
+ this.button.setLayoutData(gd);
+ this.action.addPropertyChangeListener(this);
+ this.button.setText(action.getText());
+ this.button.setEnabled(action.isEnabled());
+ this.button.addSelectionListener(new SelectionListener() {
+ public void widgetSelected(SelectionEvent e) {
+ ActionButton.this.action.run();
+ }
+
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+ });
+
+ }
+
+ /**
+ * Return SWT button control that calls provided action
+ *
+ * @return Control - button swt control
+ */
+ public Control getControl() {
+ return button;
+ }
+
+ /**
+ * Update enabled/disabled button state
+ *
+ * @param event
+ * PropertyChangeEvent
+ * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
+ */
+ public void propertyChange(PropertyChangeEvent event) {
+ if (event.getProperty().equals(IAction.ENABLED)) {
+ button.setEnabled(((Boolean) event.getNewValue())
+ .booleanValue());
+ }
+ }
+ }
+
+ /**
+ * Action that changes state enable/disable based on current table selection
+ *
+ */
+ public abstract class BaseAction extends Action {
+
+ JBossESBRuntime[] runtimes = new JBossESBRuntime[0];
+
+ /**
+ * Constructor creates action with provided name
+ *
+ * @param name
+ * String - action name
+ */
+ public BaseAction(String name) {
+ super(name);
+ updateEnablement();
+ }
+
+ /**
+ * Set current selection
+ *
+ * @param selection
+ * ISelection - selected items
+ */
+ public void setSelection(ISelection selection) {
+ if (selection instanceof IStructuredSelection) {
+ List<JBossESBRuntime> rts = new ArrayList<JBossESBRuntime>();
+ for (Object rt : ((IStructuredSelection) selection).toArray()) {
+ rts.add((JBossESBRuntime) rt);
+ }
+ runtimes = rts.toArray(new JBossESBRuntime[] {});
+ } else {
+ runtimes = new JBossESBRuntime[0];
+ }
+ updateEnablement();
+ }
+
+ protected abstract void updateEnablement();
+ }
+
+ /**
+ * Action that invokes New JBossWS Runtime Dialog
+ *
+ */
+ public class AddAction extends BaseAction {
+
+ /**
+ * Constructor create Add action with default name
+ */
+ public AddAction() {
+ super(JBossESBUIMessages.JBossRuntimeListFieldEditor_ActionAdd);
+ // This action is always available
+ setEnabled(true);
+ }
+
+ /**
+ * Do nothing, because Add action should be always available
+ */
+ @Override
+ protected void updateEnablement() {
+ // Add button is always available
+ }
+
+ /**
+ * Invoke New JBossWS Runtime Dialog
+ *
+ * @see org.eclipse.jface.action.Action#run()
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void run() {
+ Wizard wiz = new JBossRuntimeNewWizard(
+ (List<JBossESBRuntime>) getValue(), added);
+ WizardDialog dialog = new WizardDialog(Display.getCurrent()
+ .getActiveShell(), wiz);
+ dialog.open();
+ tableView.refresh();
+ setDefaultRuntime();
+ }
+ }
+
+ /**
+ * Action starts an editing selected JBossWS Runtime in Edit JBossWS Runtime
+ * dialog
+ *
+ */
+ public class EditAction extends BaseAction {
+
+ /**
+ * Create EditAction with default name
+ *
+ * @param text
+ */
+ public EditAction() {
+ super(JBossESBUIMessages.JBossRuntimeListFieldEditor_ActionEdit);
+ }
+
+ /**
+ * Edit action is enabled when the only JBossWS Runtime is selected
+ */
+ @Override
+ protected void updateEnablement() {
+ // available when the only JBossRuntime is selected
+ setEnabled(runtimes.length == 1);
+ }
+
+ /**
+ * Start editing selected JBossWS Runtime in Edit JBossWS Runtime Wizard
+ * Dialog
+ *
+ * @see org.eclipse.jface.action.Action#run()
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void run() {
+ JBossESBRuntime selected = runtimes[0];
+ Wizard wiz = new JBossWSRuntimeEditWizard(
+ (List<JBossESBRuntime>) getValue(), runtimes[0], added,
+ changed);
+ WizardDialog dialog = new WizardDialog(Display.getCurrent()
+ .getActiveShell(), wiz);
+ dialog.open();
+ tableView.refresh();
+ JBossESBRuntime c = null;
+ if (changed.containsValue(selected)) {
+ c = findChangedRuntime(selected);
+ if (c != null) {
+ tableView.setSelection(new StructuredSelection(c));
+ }
+ }
+ if (c != null && c.isDefault()) {
+ checkedElement = c;
+ }
+ setDefaultRuntime();
+ }
+
+ private JBossESBRuntime findChangedRuntime(JBossESBRuntime source) {
+ for (JBossESBRuntime r : changed.keySet()) {
+ if (source == changed.get(r)) {
+ return r;
+ }
+ }
+ return null;
+ }
+ }
+
+ /**
+ * Action deletes all selected JBossWS Runtimes. A warning message is shown
+ * for used JBossWS Runtimes
+ *
+ */
+ public class RemoveAction extends BaseAction {
+
+ /**
+ * Create DeleteAction action with default name
+ */
+ public RemoveAction() {
+ super(JBossESBUIMessages.JBossRuntimeListFieldEditor_ActionRemove);
+ }
+
+ @Override
+ protected void updateEnablement() {
+ setEnabled(runtimes.length > 0);
+ }
+
+ /**
+ * Remove all selected JBossWS Runtimes one by one
+ *
+ * @see org.eclipse.jface.action.Action#run()
+ */
+ @Override
+ public void run() {
+ for (JBossESBRuntime rt : runtimes) {
+ removeRuntime(rt);
+ }
+ tableView.refresh();
+ setDefaultRuntime();
+ }
+
+ @SuppressWarnings("unchecked")
+ private void removeRuntime(JBossESBRuntime r) {
+ boolean used = JBossRuntimeManager.isRuntimeUsed(r.getName());
+ String title = JBossESBUIMessages.JBoss_Runtime_Delete_Confirm_Title;
+ String message = (used) ? NLS.bind(
+ JBossESBUIMessages.JBoss_Runtime_Delete_Used_Confirm, r
+ .getName()) : NLS.bind(
+ JBossESBUIMessages.JBoss_Runtime_Delete_Not_Used_Confirm,
+ r.getName());
+ boolean b = MessageDialog.openConfirm(tableView.getControl()
+ .getShell(), title, message);
+ if (b) {
+ if (changed.containsKey(r)) {
+ r = changed.remove(r);
+ }
+ removed.add(r);
+ if (added.contains(r)) {
+ added.remove(r);
+ }
+ ((List) getValue()).remove(r);
+ }
+ if (checkedElement == r) {
+ checkedElement = null;
+ }
+ }
+ }
}
\ No newline at end of file
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2013-01-17 20:09:42 UTC (rev 44659)
@@ -639,7 +639,7 @@
if(versionNumber >= 4.9 || versionNumber == 4.10){
cmVersions.add("1.3.0"); //$NON-NLS-1$
}
- if(versionNumber == 4.11){
+ if(versionNumber >= 4.11){
cmVersions.add("1.3.1"); //$NON-NLS-1$
}
int index = cmVersions.getItemCount() - 1;
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.ui/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.ui/META-INF/MANIFEST.MF 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.ui/META-INF/MANIFEST.MF 2013-01-17 20:09:42 UTC (rev 44659)
@@ -1,40 +1,40 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-ActivationPolicy: lazy
-Bundle-Name: %pluginName
-Bundle-ClassPath: esb-ui.jar
-Bundle-Activator: org.jboss.tools.esb.ui.ESBUiPlugin
-Bundle-Vendor: %providerName
-Export-Package: org.jboss.tools.esb.ui,
- org.jboss.tools.esb.ui.editor,
- org.jboss.tools.esb.ui.editor.form,
- org.jboss.tools.esb.ui.editor.attribute,
- org.jboss.tools.esb.ui.wizard,
- org.jboss.tools.esb.ui.wizard.newfile
-Bundle-SymbolicName: org.jboss.tools.esb.ui; singleton:=true
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jface.text,
- org.eclipse.jdt.ui,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.xml.ui,
- org.eclipse.wst.common.frameworks.ui,
- org.eclipse.wst.common.ui,
- org.eclipse.compare,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jface,
- org.eclipse.ui,
- org.eclipse.draw2d,
- org.eclipse.gef,
- org.eclipse.ui.ide,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.core.expressions,
- org.eclipse.ui.views,
- org.jboss.tools.common.ui,
- org.jboss.tools.common.model,
- org.jboss.tools.common.model.ui,
- org.jboss.tools.common.text.xml,
- org.jboss.tools.esb.core
-Bundle-Version: 1.5.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-ActivationPolicy: lazy
+Bundle-Name: %pluginName
+Bundle-ClassPath: esb-ui.jar
+Bundle-Activator: org.jboss.tools.esb.ui.ESBUiPlugin
+Bundle-Vendor: %providerName
+Export-Package: org.jboss.tools.esb.ui,
+ org.jboss.tools.esb.ui.editor,
+ org.jboss.tools.esb.ui.editor.form,
+ org.jboss.tools.esb.ui.editor.attribute,
+ org.jboss.tools.esb.ui.wizard,
+ org.jboss.tools.esb.ui.wizard.newfile
+Bundle-SymbolicName: org.jboss.tools.esb.ui; singleton:=true
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.jface.text,
+ org.eclipse.jdt.ui,
+ org.eclipse.wst.sse.ui,
+ org.eclipse.wst.xml.core,
+ org.eclipse.wst.xml.ui,
+ org.eclipse.wst.common.frameworks.ui,
+ org.eclipse.wst.common.ui,
+ org.eclipse.compare,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.jface,
+ org.eclipse.ui,
+ org.eclipse.draw2d,
+ org.eclipse.gef,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.core.expressions,
+ org.eclipse.ui.views,
+ org.jboss.tools.common.ui,
+ org.jboss.tools.common.model,
+ org.jboss.tools.common.model.ui,
+ org.jboss.tools.common.text.xml,
+ org.jboss.tools.esb.core
+Bundle-Version: 1.5.100.qualifier
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.ui/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.ui/pom.xml 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.ui/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.esb</groupId>
<artifactId>plugins</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.esb.plugins</groupId>
<artifactId>org.jboss.tools.esb.ui</artifactId>
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF 2013-01-17 20:09:42 UTC (rev 44659)
@@ -1,20 +1,20 @@
-Manifest-Version: 1.0
-Bundle-ActivationPolicy: lazy
-Bundle-Name: %pluginName
-Bundle-Activator: org.jboss.tools.esb.validator.ESBValidatorPlugin
-Bundle-ManifestVersion: 2
-Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.jboss.tools.esb.validator;singleton:=true
-Bundle-Localization: plugin
-Export-Package: org.jboss.tools.esb.validator,
- org.jboss.tools.esb.validator.ui
-Require-Bundle: org.jboss.tools.common.ui,
- org.jboss.tools.esb.core,
- org.eclipse.ui;bundle-version="3.7.0",
- org.jboss.tools.esb.project.core,
- org.eclipse.wst.validation;bundle-version="1.2.300",
- org.eclipse.jdt.ui;bundle-version="3.7.0",
- org.jboss.tools.common.validation,
- org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200"
-Bundle-Version: 1.5.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0
+Bundle-ActivationPolicy: lazy
+Bundle-Name: %pluginName
+Bundle-Activator: org.jboss.tools.esb.validator.ESBValidatorPlugin
+Bundle-ManifestVersion: 2
+Bundle-Vendor: %providerName
+Bundle-SymbolicName: org.jboss.tools.esb.validator;singleton:=true
+Bundle-Localization: plugin
+Export-Package: org.jboss.tools.esb.validator,
+ org.jboss.tools.esb.validator.ui
+Require-Bundle: org.jboss.tools.common.ui,
+ org.jboss.tools.esb.core,
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.jboss.tools.esb.project.core,
+ org.eclipse.wst.validation;bundle-version="1.2.300",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.jboss.tools.common.validation,
+ org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200"
+Bundle-Version: 1.5.100.qualifier
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.validator/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.validator/pom.xml 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.validator/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.esb</groupId>
<artifactId>plugins</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.esb.plugins</groupId>
<artifactId>org.jboss.tools.esb.validator</artifactId>
Modified: branches/jbosstools-3.3.x/esb/plugins/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/pom.xml 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/plugins/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>esb</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.esb</groupId>
<artifactId>plugins</artifactId>
Modified: branches/jbosstools-3.3.x/esb/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/esb/pom.xml 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
@@ -11,7 +11,7 @@
<groupId>org.jboss.tools</groupId>
<artifactId>esb</artifactId>
<name>esb.all</name>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.100-SNAPSHOT</version>
<packaging>pom</packaging>
<!--
NOTE: if you don't have build/ checked out into a folder parallel to this one, the relativePath resolution above will fail. .
Modified: branches/jbosstools-3.3.x/esb/site/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/esb/site/pom.xml 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/site/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>esb</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.esb</groupId>
<artifactId>esb.site</artifactId>
Modified: branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/META-INF/MANIFEST.MF 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/META-INF/MANIFEST.MF 2013-01-17 20:09:42 UTC (rev 44659)
@@ -1,14 +1,14 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.jboss.tools.esb.core.test;singleton:=true
-Bundle-Version: 1.5.0.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
-Export-Package: org.jboss.tools.esb.core.test
-Require-Bundle:
- org.junit,
- org.jboss.tools.esb.core,
- org.jboss.tools.tests,
- org.jboss.tools.common.test
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name.0
+Bundle-SymbolicName: org.jboss.tools.esb.core.test;singleton:=true
+Bundle-Version: 1.5.100.qualifier
+Bundle-Vendor: %Bundle-Vendor.0
+Export-Package: org.jboss.tools.esb.core.test
+Require-Bundle:
+ org.junit,
+ org.jboss.tools.esb.core,
+ org.jboss.tools.tests,
+ org.jboss.tools.common.test
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/pom.xml 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.esb</groupId>
<artifactId>tests</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.esb.tests</groupId>
<artifactId>org.jboss.tools.esb.core.test</artifactId>
Modified: branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.project.core.test/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.project.core.test/META-INF/MANIFEST.MF 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.project.core.test/META-INF/MANIFEST.MF 2013-01-17 20:09:42 UTC (rev 44659)
@@ -1,23 +1,23 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.jboss.tools.esb.project.core.test
-Bundle-Version: 1.5.0.qualifier
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.junit,
- org.jboss.tools.esb.project.core;bundle-version="1.0.0",
- org.eclipse.wst.common.project.facet.core;bundle-version="1.4.0",
- org.eclipse.wst.server.core;bundle-version="1.1.101",
- org.eclipse.core.resources;bundle-version="3.5.0",
- org.eclipse.core.runtime;bundle-version="3.5.0",
- org.eclipse.jdt.core;bundle-version="3.5.0",
- org.jboss.ide.eclipse.as.core;bundle-version="1.0.0",
- org.eclipse.jdt.launching;bundle-version="3.5.0",
- org.eclipse.wst.common.frameworks;bundle-version="1.1.300",
- org.jboss.tools.esb.project.ui;bundle-version="1.0.0",
- org.eclipse.jst.common.frameworks;bundle-version="1.1.300",
- org.eclipse.core.commands;bundle-version="3.5.0",
- org.eclipse.jst.j2ee;bundle-version="1.1.300",
- org.jboss.ide.eclipse.as.classpath.core;bundle-version="2.1.0",
- org.jboss.tools.tests;bundle-version="3.1.0"
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name.0
+Bundle-SymbolicName: org.jboss.tools.esb.project.core.test
+Bundle-Version: 1.5.100.qualifier
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.junit,
+ org.jboss.tools.esb.project.core;bundle-version="1.0.0",
+ org.eclipse.wst.common.project.facet.core;bundle-version="1.4.0",
+ org.eclipse.wst.server.core;bundle-version="1.1.101",
+ org.eclipse.core.resources;bundle-version="3.5.0",
+ org.eclipse.core.runtime;bundle-version="3.5.0",
+ org.eclipse.jdt.core;bundle-version="3.5.0",
+ org.jboss.ide.eclipse.as.core;bundle-version="1.0.0",
+ org.eclipse.jdt.launching;bundle-version="3.5.0",
+ org.eclipse.wst.common.frameworks;bundle-version="1.1.300",
+ org.jboss.tools.esb.project.ui;bundle-version="1.0.0",
+ org.eclipse.jst.common.frameworks;bundle-version="1.1.300",
+ org.eclipse.core.commands;bundle-version="3.5.0",
+ org.eclipse.jst.j2ee;bundle-version="1.1.300",
+ org.jboss.ide.eclipse.as.classpath.core;bundle-version="2.1.0",
+ org.jboss.tools.tests;bundle-version="3.1.0"
Modified: branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.esb</groupId>
<artifactId>tests</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.esb.tests</groupId>
<artifactId>org.jboss.tools.esb.project.core.test</artifactId>
Modified: branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.ui.bot.test/META-INF/MANIFEST.MF 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.ui.bot.test/META-INF/MANIFEST.MF 2013-01-17 20:09:42 UTC (rev 44659)
@@ -1,28 +1,28 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: ESB SWTBot Tests
-Bundle-SymbolicName: org.jboss.tools.esb.ui.bot.test
-Bundle-Version: 1.5.0.qualifier
-Bundle-Activator: org.jboss.tools.esb.ui.bot.tests.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.apache.log4j;bundle-version="1.2.13",
- org.jboss.tools.ui.bot.ext,
- org.eclipse.jdt.ui,
- org.eclipse.swtbot.eclipse.core;bundle-version="2.0.0",
- org.eclipse.swtbot.eclipse.finder;bundle-version="2.0.0",
- org.eclipse.swtbot.eclipse.ui;bundle-version="2.0.0",
- org.eclipse.swtbot.junit4_x;bundle-version="2.0.0",
- org.eclipse.swtbot.swt.finder;bundle-version="2.0.0",
- org.eclipse.ui.ide;bundle-version="3.5.1",
- org.eclipse.ui.forms;bundle-version="3.4.1",
- org.junit4;bundle-version="4.5.0",
- org.eclipse.core.resources,
- org.jboss.tools.esb.ui,
- org.jboss.tools.esb.project.ui,
- org.jboss.tools.community.project.examples,
- org.jboss.tools.project.examples
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Eclipse-RegisterBuddy: org.apache.log4j
-Bundle-ClassPath: .
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ESB SWTBot Tests
+Bundle-SymbolicName: org.jboss.tools.esb.ui.bot.test
+Bundle-Version: 1.5.100.qualifier
+Bundle-Activator: org.jboss.tools.esb.ui.bot.tests.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.apache.log4j;bundle-version="1.2.13",
+ org.jboss.tools.ui.bot.ext,
+ org.eclipse.jdt.ui,
+ org.eclipse.swtbot.eclipse.core;bundle-version="2.0.0",
+ org.eclipse.swtbot.eclipse.finder;bundle-version="2.0.0",
+ org.eclipse.swtbot.eclipse.ui;bundle-version="2.0.0",
+ org.eclipse.swtbot.junit4_x;bundle-version="2.0.0",
+ org.eclipse.swtbot.swt.finder;bundle-version="2.0.0",
+ org.eclipse.ui.ide;bundle-version="3.5.1",
+ org.eclipse.ui.forms;bundle-version="3.4.1",
+ org.junit4;bundle-version="4.5.0",
+ org.eclipse.core.resources,
+ org.jboss.tools.esb.ui,
+ org.jboss.tools.esb.project.ui,
+ org.jboss.tools.community.project.examples,
+ org.jboss.tools.project.examples
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Eclipse-RegisterBuddy: org.apache.log4j
+Bundle-ClassPath: .
Modified: branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.esb</groupId>
<artifactId>tests</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.esb.tests</groupId>
<artifactId>org.jboss.tools.esb.ui.bot.test</artifactId>
Modified: branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.validator.test/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.validator.test/META-INF/MANIFEST.MF 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.validator.test/META-INF/MANIFEST.MF 2013-01-17 20:09:42 UTC (rev 44659)
@@ -1,20 +1,20 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Contexts and Dependency Injection Test
-Bundle-SymbolicName: org.jboss.tools.esb.validator.test
-Bundle-Version: 1.5.0.qualifier
-Bundle-Vendor: JBoss by Red Hat
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.jboss.tools.esb.core,
- org.jboss.tools.esb.project.core,
- org.jboss.tools.esb.validator,
- org.jboss.tools.tests,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.junit,
- org.jboss.tools.common,
- org.eclipse.ui,
- org.eclipse.jdt.core,
- org.eclipse.ltk.core.refactoring,
- org.jboss.tools.common.base.test
-Export-Package: org.jboss.tools.esb.validator.test
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Contexts and Dependency Injection Test
+Bundle-SymbolicName: org.jboss.tools.esb.validator.test
+Bundle-Version: 1.5.100.qualifier
+Bundle-Vendor: JBoss by Red Hat
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.jboss.tools.esb.core,
+ org.jboss.tools.esb.project.core,
+ org.jboss.tools.esb.validator,
+ org.jboss.tools.tests,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.junit,
+ org.jboss.tools.common,
+ org.eclipse.ui,
+ org.eclipse.jdt.core,
+ org.eclipse.ltk.core.refactoring,
+ org.jboss.tools.common.base.test
+Export-Package: org.jboss.tools.esb.validator.test
Modified: branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.validator.test/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.validator.test/pom.xml 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.validator.test/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.esb</groupId>
<artifactId>tests</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.esb.tests</groupId>
<artifactId>org.jboss.tools.esb.validator.test</artifactId>
Modified: branches/jbosstools-3.3.x/esb/tests/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/esb/tests/pom.xml 2013-01-11 22:11:01 UTC (rev 44658)
+++ branches/jbosstools-3.3.x/esb/tests/pom.xml 2013-01-17 20:09:42 UTC (rev 44659)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>esb</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.esb</groupId>
<artifactId>tests</artifactId>
11 years, 11 months
- 1
- 0