JBoss Tools SVN: r36213 - trunk/common/features/org.jboss.tools.common.mylyn.feature.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-11-07 20:32:34 -0500 (Mon, 07 Nov 2011)
New Revision: 36213
Modified:
trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.properties
Log:
https://issues.jboss.org/browse/JBIDE-9351 provide mylyn connections for issues.jboss.org and bugzila.redhat.com via new plugin in "Common" component
Modified: trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.properties 2011-11-08 00:58:07 UTC (rev 36212)
+++ trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.properties 2011-11-08 01:32:34 UTC (rev 36213)
@@ -26,7 +26,7 @@
devUpdateSiteName=JBossTools Development Update Site
# "description" property - description of the feature
-description=JBoss Tools Common Core plugins
+description=JBoss Tools Mylyn plugins
copyright=Copyright (c) 2011 Red Hat, Inc.\n\
Distributed under license by Red Hat, Inc. All rights reserved.\n\
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r36212 - in trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui: wizard and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-11-07 19:58:07 -0500 (Mon, 07 Nov 2011)
New Revision: 36212
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AbstractModifyInjectionPointWizard.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java
Log:
Quickfix and Wizard for fixing ambigious injection warning is confusing https://issues.jboss.org/browse/JBIDE-9940
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-11-08 00:14:18 UTC (rev 36211)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-11-08 00:58:07 UTC (rev 36212)
@@ -215,18 +215,21 @@
if(duplicateShortName)
shortName = qualifiedName;
- String str = AT+shortName+params;
+ String newValue = AT+shortName+params;
- if(rootEdit != null){
- TextEdit edit = new ReplaceEdit(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), str);
- rootEdit.addChild(edit);
- }else{
- buffer.replace(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), str);
-
- synchronized(compilationUnit) {
- compilationUnit.reconcile(ICompilationUnit.NO_AST, true, null, null);
+ if(!annotation.getSource().equals(newValue)){
+ if(rootEdit != null){
+ TextEdit edit = new ReplaceEdit(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), newValue);
+ rootEdit.addChild(edit);
+ }else{
+ buffer.replace(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), newValue);
+
+ synchronized(compilationUnit) {
+ compilationUnit.reconcile(ICompilationUnit.NO_AST, true, null, null);
+ }
}
}
+
}
public static void addAnnotation(String qualifiedName, ICompilationUnit compilationUnit, IJavaElement element, String params) throws JavaModelException{
@@ -340,14 +343,18 @@
if(duplicateShortName)
shortName = qualifiedName;
- if(rootEdit != null){
- TextEdit edit = new ReplaceEdit(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), AT+shortName+value);
- rootEdit.addChild(edit);
- }else{
- buffer.replace(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), AT+shortName+value);
-
- synchronized(compilationUnit) {
- compilationUnit.reconcile(ICompilationUnit.NO_AST, true, null, null);
+ String newValue = AT+shortName+value;
+
+ if(!annotation.getSource().equals(newValue)){
+ if(rootEdit != null){
+ TextEdit edit = new ReplaceEdit(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), newValue);
+ rootEdit.addChild(edit);
+ }else{
+ buffer.replace(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), newValue);
+
+ synchronized(compilationUnit) {
+ compilationUnit.reconcile(ICompilationUnit.NO_AST, true, null, null);
+ }
}
}
}
@@ -482,14 +489,19 @@
}
b.append(Signature.getSignatureSimpleName(parameters[index].getTypeSignature())+SPACE);
b.append(parameters[index].getElementName());
- if(rootEdit != null){
- TextEdit edit = new ReplaceEdit(parameters[index].getSourceRange().getOffset(), parameters[index].getSourceRange().getLength(), b.toString());
- rootEdit.addChild(edit);
- }else{
- buffer.replace(parameters[index].getSourceRange().getOffset(), parameters[index].getSourceRange().getLength(), b.toString());
-
- synchronized(compilationUnit) {
- compilationUnit.reconcile(ICompilationUnit.NO_AST, true, null, null);
+
+ String newValue = b.toString();
+
+ if(!parameters[index].getSource().equals(newValue)){
+ if(rootEdit != null){
+ TextEdit edit = new ReplaceEdit(parameters[index].getSourceRange().getOffset(), parameters[index].getSourceRange().getLength(), b.toString());
+ rootEdit.addChild(edit);
+ }else{
+ buffer.replace(parameters[index].getSourceRange().getOffset(), parameters[index].getSourceRange().getLength(), b.toString());
+
+ synchronized(compilationUnit) {
+ compilationUnit.reconcile(ICompilationUnit.NO_AST, true, null, null);
+ }
}
}
}
@@ -735,7 +747,7 @@
// delete annotation
if(rootEdit != null){
- TextEdit edit = new DeleteEdit(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength()+numberOfSpaces);
+ TextEdit edit = new DeleteEdit(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength());
rootEdit.addChild(edit);
}else{
buffer.replace(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength()+numberOfSpaces, "");
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AbstractModifyInjectionPointWizard.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AbstractModifyInjectionPointWizard.java 2011-11-08 00:14:18 UTC (rev 36211)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AbstractModifyInjectionPointWizard.java 2011-11-08 00:58:07 UTC (rev 36212)
@@ -13,8 +13,8 @@
import java.util.List;
import org.eclipse.ltk.core.refactoring.participants.ProcessorBasedRefactoring;
-import org.eclipse.ltk.internal.ui.refactoring.RefactoringWizardDialog;
import org.eclipse.ltk.ui.refactoring.RefactoringWizard;
+import org.eclipse.ltk.ui.refactoring.RefactoringWizardOpenOperation;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.cdi.core.IBean;
@@ -28,8 +28,12 @@
public boolean showWizard() {
final IWorkbenchWindow win = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- RefactoringWizardDialog dialog = new RefactoringWizardDialog(win.getShell(),this);
- dialog.open();
+ RefactoringWizardOpenOperation op = new RefactoringWizardOpenOperation(this);
+ try {
+ op.run(win.getShell(), getWindowTitle());
+ } catch (final InterruptedException irex) {
+ return false;
+ }
return true;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-11-08 00:14:18 UTC (rev 36211)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-11-08 00:58:07 UTC (rev 36212)
@@ -20,6 +20,8 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.core.runtime.jobs.IJobManager;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.draw2d.ColorConstants;
import org.eclipse.jdt.core.Flags;
@@ -48,6 +50,7 @@
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.BusyIndicator;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.ModifyEvent;
@@ -431,31 +434,34 @@
createQualifier.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent event) {
- Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- NewQualifierCreationWizard wizard = new NewQualifierCreationWizard();
- StructuredSelection selection = new StructuredSelection(new Object[]{bean.getBeanClass()});
-
- wizard.init(PlatformUI.getWorkbench(), selection);
- WizardDialog dialog = new WizardDialog(shell, wizard);
- int status = dialog.open();
- if(status == WizardDialog.OK){
- // reload qualifiers
- if (Display.getCurrent() != null) {
- try{
- PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress(){
- public void run(IProgressMonitor monitor)
- throws InvocationTargetException, InterruptedException {
+ final Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+ final IJobManager manager= Job.getJobManager();
+ // reload qualifiers
+ if (Display.getCurrent() != null) {
+ BusyIndicator.showWhile(Display.getCurrent(), new Runnable(){
+ public void run(){
+ manager.endRule(ResourcesPlugin.getWorkspace().getRoot());
+
+ NewQualifierCreationWizard wizard = new NewQualifierCreationWizard();
+ StructuredSelection selection = new StructuredSelection(new Object[]{bean.getBeanClass()});
+
+ wizard.init(PlatformUI.getWorkbench(), selection);
+ WizardDialog dialog = new WizardDialog(shell, wizard);
+ int status = dialog.open();
+ if(status == WizardDialog.OK){
+ try {
Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
+ } catch (OperationCanceledException e) {
+ CDICorePlugin.getDefault().logError(e);
+ } catch (InterruptedException e) {
+ CDICorePlugin.getDefault().logError(e);
}
- });
- }catch(InterruptedException ie){
- CDICorePlugin.getDefault().logError(ie);
- }catch(InvocationTargetException ite){
- CDICorePlugin.getDefault().logError(ite);
+ loadAvailableQualifiers();
+ }
+ manager.beginRule(ResourcesPlugin.getWorkspace().getRoot(), null);
}
- }
-
- loadAvailableQualifiers();
+
+ });
}
}
});
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r36211 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-11-07 19:14:18 -0500 (Mon, 07 Nov 2011)
New Revision: 36211
Modified:
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/unified.target
Log:
reorder target platforms to be more consistent between jbt and jbds; also add mylyn and jira support per JBIDE-9351, JBIDE-10094
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-11-08 00:14:10 UTC (rev 36210)
+++ trunk/build/target-platform/multiple.target 2011-11-08 00:14:18 UTC (rev 36211)
@@ -57,7 +57,7 @@
<!-- Eclipse BPEL -->
<unit id="org.eclipse.bpel.jboss.riftsaw.runtime.feature.feature.group" version="0.5.0.v20110915-1141-H87-CI"/>
<unit id="org.eclipse.bpel.apache.ode.runtime.feature.feature.group" version="0.5.0.v20110915-1141-H87-CI"/>
- <unit id="org.eclipse.bpel.feature.feature.group" version="0.5.0.v20110915-1141-H87-CI"/>
+ <unit id="org.eclipse.bpel.feature.feature.group" version="0.8.0.v20111101-1551-H90-CI"/>
<!-- EMF, XSD -->
<unit id="org.eclipse.emf.workspace.feature.group" version="1.5.0.v20110502-1600-36-8s734C367E3CBC7"/>
@@ -265,20 +265,20 @@
<unit id="com.atlassian.connector.eclipse.subclipse.ui" version="3.0.1.v20110812"/>
<unit id="com.atlassian.connector.eclipse.ui" version="3.0.1.v20110812"/>
<unit id="com.thoughtworks.xstream" version="1.3.0.v20100826-1640"/>
- <unit id="org.eclipse.ui" version="3.7.0.I20110310-1100"/>
+ <unit id="org.eclipse.ui" version="3.7.0.I20110602-0100"/>
<unit id="org.eclipse.core.runtime" version="3.7.0.v20110110"/>
<unit id="org.eclipse.core.resources" version="3.7.100.v20110125b"/>
- <unit id="org.eclipse.ui.ide" version="3.7.0.I20110519-0100"/>
- <unit id="org.eclipse.ui.workbench.texteditor" version="3.7.0.v20110124-0100"/>
+ <unit id="org.eclipse.ui.ide" version="3.7.0.v20110809-1737"/>
+ <unit id="org.eclipse.ui.workbench.texteditor" version="3.7.0.v20110306-1700"/>
<unit id="org.eclipse.jface.text" version="3.7.0.v20110505-0800"/>
<unit id="org.eclipse.osgi" version="3.7.0.v20110613"/>
<unit id="org.eclipse.core.filesystem" version="1.3.100.v20110117"/>
- <unit id="org.eclipse.ui.forms" version="3.5.100.v20101220"/>
+ <unit id="org.eclipse.ui.forms" version="3.5.100.v20110221"/>
<unit id="org.eclipse.ui.editors" version="3.7.0.v20110517-0800"/>
<unit id="org.eclipse.team.core" version="3.6.0.I20110125-0640"/>
<unit id="org.eclipse.team.ui" version="3.6.100.I20110525-0800"/>
<unit id="org.eclipse.jface" version="3.7.0.I20110522-1430"/>
- <unit id="org.eclipse.compare" version="3.5.200.I20101206-1300"/>
+ <unit id="org.eclipse.compare" version="3.5.200.I20110208-0800"/>
<unit id="org.apache.axis" version="1.4.0.v201005080400"/>
<unit id="org.apache.commons.logging" version="1.0.4.v201101211617"/>
<unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-11-08 00:14:10 UTC (rev 36210)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-11-08 00:14:18 UTC (rev 36211)
@@ -56,26 +56,6 @@
<iu id="org.hamcrest.text" version=""/>
<iu id="org.hamcrest.library" version=""/>
<iu id="org.hamcrest.integration" version=""/>
-<iu id="com.sun.syndication" version=""/>
-<iu id="org.eclipse.mylyn.commons.core" version=""/>
-<iu id="org.eclipse.mylyn.discovery.ui" version=""/>
-<iu id="org.eclipse.mylyn.discovery.core" version=""/>
-<iu id="org.eclipse.mylyn.commons.ui" version=""/>
-<iu id="org.eclipse.mylyn.commons.net" version=""/>
-<iu id="org.eclipse.mylyn.commons.screenshots" version=""/>
-<iu id="org.apache.commons.lang" version=""/>
-<iu id="org.eclipse.mylyn.bugzilla_feature.feature.group" version=""/>
-<iu id="org.eclipse.mylyn.ide_feature.feature.group" version=""/>
-<iu id="org.eclipse.mylyn.commons.feature.group" version=""/>
-<iu id="org.eclipse.mylyn.java_feature.feature.group" version=""/>
-<iu id="org.eclipse.mylyn.context_feature.feature.group" version=""/>
-<iu id="org.eclipse.mylyn.pde_feature.feature.group" version=""/>
-<iu id="org.eclipse.mylyn.cvs.feature.group" version=""/>
-<iu id="org.eclipse.mylyn.team_feature.feature.group" version=""/>
-<iu id="org.eclipse.mylyn_feature.feature.group" version=""/>
-<iu id="org.eclipse.mylyn.versions.feature.group" version=""/>
-<iu id="org.eclipse.mylyn.git.feature.group" version=""/>
-<iu id="org.eclipse.mylyn.wikitext_feature.feature.group" version=""/>
<iu id="org.apache.lucene.highlighter" version=""/>
<iu id="org.apache.lucene.memory" version=""/>
<iu id="org.apache.lucene.misc" version=""/>
@@ -85,7 +65,6 @@
<iu id="org.eclipse.bpel.jboss.riftsaw.runtime.feature.feature.group" version=""/>
<iu id="org.eclipse.bpel.apache.ode.runtime.feature.feature.group" version=""/>
<iu id="org.eclipse.bpel.feature.feature.group" version=""/>
-<iu id="org.eclipse.graphiti.feature.feature.group" version=""/>
<iu id="org.eclipse.emf.workspace.feature.group" version=""/>
<iu id="org.eclipse.emf.validation.feature.group" version=""/>
<iu id="org.eclipse.emf.transaction.feature.group" version=""/>
@@ -101,31 +80,24 @@
<iu id="org.eclipse.emf.edit.feature.group" version=""/>
<iu id="org.eclipse.xsd.edit.feature.group" version=""/>
<iu id="org.eclipse.xsd.feature.group" version=""/>
-<iu id="org.eclipse.swtbot.eclipse.feature.group" version=""/>
-<iu id="org.eclipse.swtbot.eclipse.gef.feature.group" version=""/>
-<iu id="org.eclipse.swtbot.ide.feature.group" version=""/>
-<iu id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version=""/>
-<iu id="org.eclipse.swtbot.feature.group" version=""/>
-<iu id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version=""/>
-<iu id="org.eclipse.birt.feature.group" version=""/>
-<iu id="org.eclipse.birt.integration.wtp.feature.group" version=""/>
-<iu id="org.eclipse.birt.chart.feature.group" version=""/>
-<iu id="org.eclipse.birt.chart.integration.wtp.feature.group" version=""/>
+<iu id="org.eclipse.graphiti.feature.feature.group" version=""/>
+<iu id="org.eclipse.draw2d.feature.group" version=""/>
+<iu id="org.eclipse.gef.feature.group" version=""/>
+<iu id="org.eclipse.zest.feature.group" version=""/>
+<iu id="org.eclipse.uml2.feature.group" version=""/>
<iu id="com.ibm.icu.base.feature.group" version=""/>
-<iu id="org.eclipse.equinox.server.core.feature.group" version=""/>
-<iu id="org.eclipse.cvs.feature.group" version=""/>
-<iu id="org.eclipse.help.feature.group" version=""/>
-<iu id="org.eclipse.jdt.feature.group" version=""/>
<iu id="org.eclipse.platform.feature.group" version=""/>
<iu id="org.eclipse.platform.ide" version=""/>
-<iu id="org.eclipse.equinox.executable.feature.group" version=""/>
<iu id="org.eclipse.platform.sdk" version=""/>
-<iu id="org.eclipse.pde.feature.group" version=""/>
<iu id="org.eclipse.sdk.feature.group" version=""/>
<iu id="org.eclipse.releng.tools.feature.group" version=""/>
<iu id="org.eclipse.sdk.ide" version=""/>
<iu id="org.eclipse.sdk.examples.feature.group" version=""/>
<iu id="org.eclipse.sdk.examples.source.feature.group" version=""/>
+<iu id="org.eclipse.cvs.feature.group" version=""/>
+<iu id="org.eclipse.jdt.feature.group" version=""/>
+<iu id="org.eclipse.equinox.server.core.feature.group" version=""/>
+<iu id="org.eclipse.equinox.executable.feature.group" version=""/>
<iu id="org.eclipse.equinox.compendium.sdk.feature.group" version=""/>
<iu id="org.eclipse.equinox.core.sdk.feature.group" version=""/>
<iu id="org.eclipse.equinox.p2.discovery.feature.feature.group" version=""/>
@@ -136,10 +108,12 @@
<iu id="org.eclipse.equinox.weaving.sdk.feature.group" version=""/>
<iu id="org.eclipse.equinox.server.jetty.feature.group" version=""/>
<iu id="org.eclipse.equinox.server.p2.feature.group" version=""/>
-<iu id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version=""/>
<iu id="org.eclipse.equinox.server.servletbridge.feature.group" version=""/>
<iu id="org.eclipse.equinox.server.simple.feature.group" version=""/>
<iu id="org.eclipse.rcp.feature.group" version=""/>
+<iu id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version=""/>
+<iu id="org.eclipse.pde.feature.group" version=""/>
+<iu id="org.eclipse.help.feature.group" version=""/>
<iu id="org.eclipse.datatools.modelbase.feature.feature.group" version=""/>
<iu id="org.eclipse.datatools.connectivity.feature.feature.group" version=""/>
<iu id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version=""/>
@@ -174,10 +148,6 @@
<iu id="org.eclipse.datatools.common.doc.user.feature.group" version=""/>
<iu id="org.eclipse.datatools.connectivity.doc.user.feature.group" version=""/>
<iu id="org.eclipse.datatools.sqltools.doc.user.feature.group" version=""/>
-<iu id="org.eclipse.draw2d.feature.group" version=""/>
-<iu id="org.eclipse.gef.feature.group" version=""/>
-<iu id="org.eclipse.zest.feature.group" version=""/>
-<iu id="org.eclipse.uml2.feature.group" version=""/>
<iu id="org.eclipse.rse.feature.group" version=""/>
<iu id="org.eclipse.rse.ssh.feature.group" version=""/>
<iu id="org.eclipse.rse.terminals.feature.group" version=""/>
@@ -236,6 +206,91 @@
<iu id="org.eclipse.egit.feature.group" version=""/>
<iu id="org.eclipse.egit.mylyn.feature.group" version=""/>
<iu id="org.eclipse.mylyn.github.feature.feature.group" version=""/>
+<iu id="com.sun.syndication" version=""/>
+<iu id="org.eclipse.mylyn.commons.core" version=""/>
+<iu id="org.eclipse.mylyn.discovery.ui" version=""/>
+<iu id="org.eclipse.mylyn.discovery.core" version=""/>
+<iu id="org.eclipse.mylyn.commons.ui" version=""/>
+<iu id="org.eclipse.mylyn.commons.net" version=""/>
+<iu id="org.eclipse.mylyn.commons.screenshots" version=""/>
+<iu id="org.apache.commons.lang" version=""/>
+<iu id="org.eclipse.mylyn_feature.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.ide_feature.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.commons.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.context_feature.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.bugzilla_feature.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.java_feature.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.pde_feature.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.team_feature.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.wikitext_feature.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.cvs.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.git.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.versions.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.tasks.ui" version=""/>
+<iu id="org.eclipse.mylyn.tasks.core" version=""/>
+<iu id="org.eclipse.mylyn.tasks.bugs" version=""/>
+<iu id="com.atlassian.connector.commons" version=""/>
+<iu id="com.atlassian.connector.eclipse.bamboo.core" version=""/>
+<iu id="com.atlassian.connector.eclipse.bamboo.ui" version=""/>
+<iu id="com.atlassian.connector.eclipse.branding.ui" version=""/>
+<iu id="com.atlassian.connector.eclipse.commons.core" version=""/>
+<iu id="com.atlassian.connector.eclipse.commons.ui" version=""/>
+<iu id="com.atlassian.connector.eclipse.core" version=""/>
+<iu id="com.atlassian.connector.eclipse.crucible.core" version=""/>
+<iu id="com.atlassian.connector.eclipse.crucible.ui" version=""/>
+<iu id="com.atlassian.connector.eclipse.cvs.core" version=""/>
+<iu id="com.atlassian.connector.eclipse.cvs.ui" version=""/>
+<iu id="com.atlassian.connector.eclipse.directclickthrough.ui" version=""/>
+<iu id="com.atlassian.connector.eclipse.fisheye.core" version=""/>
+<iu id="com.atlassian.connector.eclipse.fisheye.ui" version=""/>
+<iu id="com.atlassian.connector.eclipse.help" version=""/>
+<iu id="com.atlassian.connector.eclipse.jira.core" version=""/>
+<iu id="com.atlassian.connector.eclipse.jira.ui" version=""/>
+<iu id="com.atlassian.connector.eclipse.monitor.core" version=""/>
+<iu id="com.atlassian.connector.eclipse.monitor.ui" version=""/>
+<iu id="com.atlassian.connector.eclipse.subclipse.core" version=""/>
+<iu id="com.atlassian.connector.eclipse.subclipse.ui" version=""/>
+<iu id="com.atlassian.connector.eclipse.ui" version=""/>
+<iu id="com.thoughtworks.xstream" version=""/>
+<iu id="org.eclipse.ui" version=""/>
+<iu id="org.eclipse.core.runtime" version=""/>
+<iu id="org.eclipse.core.resources" version=""/>
+<iu id="org.eclipse.ui.ide" version=""/>
+<iu id="org.eclipse.ui.workbench.texteditor" version=""/>
+<iu id="org.eclipse.jface.text" version=""/>
+<iu id="org.eclipse.osgi" version=""/>
+<iu id="org.eclipse.core.filesystem" version=""/>
+<iu id="org.eclipse.ui.forms" version=""/>
+<iu id="org.eclipse.ui.editors" version=""/>
+<iu id="org.eclipse.team.core" version=""/>
+<iu id="org.eclipse.team.ui" version=""/>
+<iu id="org.eclipse.jface" version=""/>
+<iu id="org.eclipse.compare" version=""/>
+<iu id="org.apache.axis" version=""/>
+<iu id="org.apache.commons.logging" version=""/>
+<iu id="org.apache.commons.io" version=""/>
+<iu id="org.apache.commons.httpclient" version=""/>
+<iu id="org.apache.commons.lang" version=""/>
+<iu id="org.apache.commons.codec" version=""/>
+<iu id="org.jdom_jaxen" version=""/>
+<iu id="org.mortbay.jetty.server" version=""/>
+<iu id="org.mortbay.jetty.util" version=""/>
+<iu id="org.apache.jasper" version=""/>
+<iu id="org.joda.time" version=""/>
+<iu id="javax.servlet" version=""/>
+<iu id="javax.servlet.jsp" version=""/>
+<iu id="javax.xml.rpc" version=""/>
+<iu id="javax.el" version=""/>
+<iu id="org.eclipse.swtbot.eclipse.feature.group" version=""/>
+<iu id="org.eclipse.swtbot.eclipse.gef.feature.group" version=""/>
+<iu id="org.eclipse.swtbot.ide.feature.group" version=""/>
+<iu id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version=""/>
+<iu id="org.eclipse.swtbot.feature.group" version=""/>
+<iu id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version=""/>
+<iu id="org.eclipse.birt.feature.group" version=""/>
+<iu id="org.eclipse.birt.integration.wtp.feature.group" version=""/>
+<iu id="org.eclipse.birt.chart.feature.group" version=""/>
+<iu id="org.eclipse.birt.chart.integration.wtp.feature.group" version=""/>
<iu id="org.drools.eclipse.feature.feature.group" version=""/>
<iu id="org.drools.eclipse.task.feature.feature.group" version=""/>
<iu id="org.guvnor.tools.feature.feature.group" version=""/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-11-08 00:14:10 UTC (rev 36210)
+++ trunk/build/target-platform/unified.target 2011-11-08 00:14:18 UTC (rev 36211)
@@ -57,7 +57,7 @@
<!-- Eclipse BPEL -->
<unit id="org.eclipse.bpel.jboss.riftsaw.runtime.feature.feature.group" version="0.5.0.v20110915-1141-H87-CI"/>
<unit id="org.eclipse.bpel.apache.ode.runtime.feature.feature.group" version="0.5.0.v20110915-1141-H87-CI"/>
- <unit id="org.eclipse.bpel.feature.feature.group" version="0.5.0.v20110915-1141-H87-CI"/>
+ <unit id="org.eclipse.bpel.feature.feature.group" version="0.8.0.v20111101-1551-H90-CI"/>
<!-- EMF, XSD -->
<unit id="org.eclipse.emf.workspace.feature.group" version="1.5.0.v20110502-1600-36-8s734C367E3CBC7"/>
@@ -265,20 +265,20 @@
<unit id="com.atlassian.connector.eclipse.subclipse.ui" version="3.0.1.v20110812"/>
<unit id="com.atlassian.connector.eclipse.ui" version="3.0.1.v20110812"/>
<unit id="com.thoughtworks.xstream" version="1.3.0.v20100826-1640"/>
- <unit id="org.eclipse.ui" version="3.7.0.I20110310-1100"/>
+ <unit id="org.eclipse.ui" version="3.7.0.I20110602-0100"/>
<unit id="org.eclipse.core.runtime" version="3.7.0.v20110110"/>
<unit id="org.eclipse.core.resources" version="3.7.100.v20110125b"/>
- <unit id="org.eclipse.ui.ide" version="3.7.0.I20110519-0100"/>
- <unit id="org.eclipse.ui.workbench.texteditor" version="3.7.0.v20110124-0100"/>
+ <unit id="org.eclipse.ui.ide" version="3.7.0.v20110809-1737"/>
+ <unit id="org.eclipse.ui.workbench.texteditor" version="3.7.0.v20110306-1700"/>
<unit id="org.eclipse.jface.text" version="3.7.0.v20110505-0800"/>
<unit id="org.eclipse.osgi" version="3.7.0.v20110613"/>
<unit id="org.eclipse.core.filesystem" version="1.3.100.v20110117"/>
- <unit id="org.eclipse.ui.forms" version="3.5.100.v20101220"/>
+ <unit id="org.eclipse.ui.forms" version="3.5.100.v20110221"/>
<unit id="org.eclipse.ui.editors" version="3.7.0.v20110517-0800"/>
<unit id="org.eclipse.team.core" version="3.6.0.I20110125-0640"/>
<unit id="org.eclipse.team.ui" version="3.6.100.I20110525-0800"/>
<unit id="org.eclipse.jface" version="3.7.0.I20110522-1430"/>
- <unit id="org.eclipse.compare" version="3.5.200.I20101206-1300"/>
+ <unit id="org.eclipse.compare" version="3.5.200.I20110208-0800"/>
<unit id="org.apache.axis" version="1.4.0.v201005080400"/>
<unit id="org.apache.commons.logging" version="1.0.4.v201101211617"/>
<unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r36210 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-11-07 19:14:10 -0500 (Mon, 07 Nov 2011)
New Revision: 36210
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/jbds.target.p2mirror.xml
trunk/build/target-platform/multiple.target
trunk/build/target-platform/unified.target
Log:
reorder target platforms to be more consistent between jbt and jbds; also add mylyn and jira support per JBIDE-9351, JBIDE-10094
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-11-07 20:52:50 UTC (rev 36209)
+++ trunk/build/target-platform/jbds.target 2011-11-08 00:14:10 UTC (rev 36210)
@@ -2,7 +2,7 @@
<target includeMode="feature" name="jbds5">
<locations>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <!-- Pro tip: to convert
+ <!-- Pro tip: to convert
from org.eclipse.foo_4.6.0.v201005032111-777K4AkF7B77R7c7N77.jar
to <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.foo.feature.group"/>
using vi, apply this transform:
@@ -11,11 +11,11 @@
<!-- don't forget to increment these files when moving up a version:
build.xml, *.target*, publish.sh, target2p2mirror.xml -->
- <repository location="http://download.jboss.org/jbosstools/updates/indigo/SR1/"/>
- <!-- <repository location="file:///qa/services/http/binaries/RHDS/updates/indigo/SR1/"/> -->
- <!-- <repository location="http://www.qa.jboss.com/binaries/RHDS/updates/indigo/SR1/"/> -->
+ <repository location="http://download.jboss.org/jbosstools/updates/indigo/SR1/"/>
+ <!-- <repository location="file:///qa/services/http/binaries/RHDS/updates/indigo/SR1/"/> -->
+ <!-- <repository location="http://www.qa.jboss.com/binaries/RHDS/updates/indigo/SR1/"/> -->
- <!-- m2e 1.0 / m2e-wtp 0.13.1.20110718-1012 + deps -->
+ <!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106061504"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.1.20110728-1800"/>
@@ -33,7 +33,7 @@
<!-- Orbit bundles -->
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
- <unit id="org.jdom" version="1.1.1.v201101151400"/>
+ <unit id="org.jdom" version="1.0.0.v201005080400"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
<unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
<unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
@@ -44,35 +44,6 @@
<unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.integration" version="1.1.0.v20090501071000"/>
- <!-- needed for JBoss Central -->
- <unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
- <unit id="org.eclipse.mylyn.commons.core" version="3.6.0.I20110523-2039"/>
- <unit id="org.eclipse.mylyn.discovery.ui" version="3.6.1.v20110819-0100"/>
- <unit id="org.eclipse.mylyn.discovery.core" version="3.6.1.v20110817-0100"/>
- <unit id="org.eclipse.mylyn.commons.ui" version="3.6.0.I20110523-2039"/>
- <unit id="org.eclipse.mylyn.commons.net" version="3.6.0.I20110523-2039"/>
- <unit id="org.eclipse.mylyn.commons.screenshots" version="3.6.0.v20110608-1400"/>
- <unit id="org.apache.commons.lang" version="2.4.0.v201005080502"/>
-
- <!-- JBDS-1904 :: mylyn -->
- <unit id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.commons.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.java_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.context_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.pde_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.cvs.feature.group" version="0.8.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.team_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.versions.feature.group" version="0.8.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.git.feature.group" version="0.8.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="1.5.2.v20110908-0706"/>
-
- <!-- Eclipse BPEL features -->
- <unit id="org.eclipse.bpel.jboss.riftsaw.runtime.feature.feature.group" version="0.5.0.v20110915-1141-H87-CI"/>
- <unit id="org.eclipse.bpel.apache.ode.runtime.feature.feature.group" version="0.5.0.v20110915-1141-H87-CI"/>
- <unit id="org.eclipse.bpel.feature.feature.group" version="0.5.0.v20110915-1141-H87-CI"/>
-
<!-- Orbit bundles needed for Eclipse Checkstyle (eclipse-cs) -->
<unit id="org.apache.lucene.highlighter" version="2.9.1.v20100421-0704"/>
<unit id="org.apache.lucene.memory" version="2.9.1.v20100421-0704"/>
@@ -81,10 +52,44 @@
<unit id="org.apache.lucene.snowball" version="2.9.1.v20100421-0704"/>
<unit id="org.apache.lucene.spellchecker" version="2.9.1.v20100421-0704"/>
- <!-- CVS -->
+ <!-- Eclipse BPEL -->
+ <unit id="org.eclipse.bpel.jboss.riftsaw.runtime.feature.feature.group" version="0.5.0.v20110915-1141-H87-CI"/>
+ <unit id="org.eclipse.bpel.apache.ode.runtime.feature.feature.group" version="0.5.0.v20110915-1141-H87-CI"/>
+ <unit id="org.eclipse.bpel.feature.feature.group" version="0.5.0.v20110915-1141-H87-CI"/>
+
+ <!-- EMF, XSD -->
+ <unit id="org.eclipse.emf.feature.group" version="2.7.1.v20111003-1135"/>
+ <unit id="org.eclipse.emf.workspace.feature.group" version="1.5.0.v20110502-1600-36-8s734C367E3CBC7"/>
+ <unit id="org.eclipse.emf.validation.feature.group" version="1.5.0.v20110502-1600-479-9oB56N5BBR6LCA6"/>
+ <unit id="org.eclipse.emf.transaction.feature.group" version="1.5.0.v20110502-1600-377-8s734C3E7D15D6B"/>
+ <unit id="org.eclipse.xsd.ecore.converter.feature.group" version="2.7.0.v20110530-1010"/>
+ <unit id="org.eclipse.xsd.edit.feature.group" version="2.7.0.v20110530-1010"/>
+ <unit id="org.eclipse.xsd.editor.feature.group" version="2.7.0.v20110530-1010"/>
+ <unit id="org.eclipse.xsd.mapping.editor.feature.group" version="2.7.0.v20111003-1135"/>
+ <unit id="org.eclipse.xsd.mapping.feature.group" version="2.7.0.v20111003-1135"/>
+ <unit id="org.eclipse.xsd.feature.group" version="2.7.0.v20111003-1135"/>
+
+ <!-- GEF, Draw2D, Graphiti, Zest -->
+ <unit id="org.eclipse.graphiti.feature.feature.group" version="0.8.0.v20110524-0815"/>
+ <unit id="org.eclipse.draw2d.feature.group" version="3.7.1.v20110830-1143-4607w3122194102254"/>
+ <unit id="org.eclipse.gef.feature.group" version="3.7.0.v20110425-2050-777D-81B2Bz0685C3A6E34272"/>
+ <unit id="org.eclipse.zest.feature.group" version="1.3.0.v20101213-1100-67A-8yF4F09A9H4D6O54272"/>
+
+ <!-- UML2 -->
+ <unit id="org.eclipse.uml2.feature.group" version="3.2.1.v201109082252"/>
+ <unit id="org.eclipse.uml2.doc.feature.group" version="3.2.0.v201103291514"/>
+
+ <!-- Platform: CVS, JDT, RCP, PDE, Equinox, Help -->
+ <unit id="org.eclipse.platform.feature.group" version="3.7.1.r37x_v20110729-9gF7UHOxFtniV7mI3T556iZN9AU8bEZ1lHMcVK"/>
<unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110520-0800-7B78FHk8sF7BB7VAH5AYC5"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.7.1.r371_v20110810-0800-7z8gFcoFMLfTabvKsR5Qm9rBGEBK"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="3.5.0.v20110530-7P7NFUFFLWUl76mart"/>
+ <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.1.2.R37x_v20110815-1155-6-Bj9JXOeQxOURYC-l9BL7rDEQO7"/>
+ <unit id="org.eclipse.rcp.feature.group" version="3.7.1.r37x_v20110729-9DB5FmNFnFLSFCtLxnRfMqt15A4A"/>
+ <unit id="org.eclipse.pde.feature.group" version="3.7.0.v20110504-0800-7b7qFVpFEx2XnmYtj_9RfO7"/>
+ <unit id="org.eclipse.help.feature.group" version="1.3.0.v20110121-7i7uFCaFFt6Zqif0tNYDdt"/>
- <!-- DTP 1.9 -->
+ <!-- DTP -->
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.9.0.v201010181130-77078CcNBHCBYKYEbNV"/>
<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8hEt1ZwmrIjglSM8CoR_Bu4"/>
<unit id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.9.0.v201010181130-7H7C7GCcNBHHBcIeEcQb"/>
@@ -107,7 +112,6 @@
<unit id="org.eclipse.datatools.enablement.ingres.feature.feature.group" version="1.9.0.v201010181130-540AkF78Y7VCOCQDB"/>
<unit id="org.eclipse.datatools.enablement.sqlite.feature.feature.group" version="1.9.0.v201010181130-541AkF79P7N8NAQ77"/>
<unit id="org.eclipse.datatools.sqldevtools.feature.feature.group" version="1.9.0.v201010181130-7N845FDsn0TdrPUJvPRskDVIMJ0T"/>
-
<unit id="org.eclipse.datatools.sqldevtools.results.feature.feature.group" version="1.9.1.v201108301820-57B4AkF7AJ7NCBBMBL"/>
<unit id="org.eclipse.datatools.sqldevtools.ddlgen.feature.feature.group" version="1.9.1.v201108301820-7A-3F7RZHLz-Hz-OlPz0Qf"/>
<unit id="org.eclipse.datatools.sqldevtools.ddl.feature.feature.group" version="1.9.0.v201010181130-278-78B04G8S_IMz00Iz00PmQz01"/>
@@ -115,37 +119,21 @@
<unit id="org.eclipse.datatools.sqldevtools.parsers.feature.feature.group" version="1.9.0.v201010181130-622BgJ9CR9XFcEWLP"/>
<unit id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.feature.group" version="1.9.1.v201108301820-79-4EVVFJoFwKcN-L_"/>
<unit id="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature.feature.group" version="1.9.1.v201108301820-4208375LG5BJ93413"/>
-
<unit id="org.eclipse.datatools.intro.feature.group" version="1.9.0.v201010181130-26-7w312116392911"/>
<unit id="org.eclipse.datatools.doc.user.feature.group" version="1.9.0.v201010181130-47C08w95ENAK6AFDFK7"/>
<unit id="org.eclipse.datatools.common.doc.user.feature.group" version="1.9.1.v201108301820-26-311A16321A3557"/>
<unit id="org.eclipse.datatools.connectivity.doc.user.feature.group" version="1.9.0.v201010181130-37D-7733L3D753L7BBF"/>
<unit id="org.eclipse.datatools.sqltools.doc.user.feature.group" version="1.9.0.v201010181130-37D-7733L3D753L7BBF"/>
- <!-- XSD 2.7 -->
- <unit id="org.eclipse.xsd.ecore.converter.feature.group" version="2.7.0.v20110530-1010"/>
- <unit id="org.eclipse.xsd.edit.feature.group" version="2.7.0.v20110530-1010"/>
- <unit id="org.eclipse.xsd.editor.feature.group" version="2.7.0.v20110530-1010"/>
- <unit id="org.eclipse.xsd.mapping.editor.feature.group" version="2.7.0.v20111003-1135"/>
- <unit id="org.eclipse.xsd.mapping.feature.group" version="2.7.0.v20111003-1135"/>
- <unit id="org.eclipse.xsd.feature.group" version="2.7.0.v20111003-1135"/>
+ <!-- RSE, TM -->
+ <unit id="org.eclipse.rse.feature.group" version="3.3.0.v201105231230-7L7CFGB8wqio7ppp-b5xwz-6LVIZ"/>
+ <unit id="org.eclipse.rse.useractions.feature.group" version="1.1.300.v201103142315-31F8N8s7355353B75DD"/>
+ <unit id="org.eclipse.tm.terminal.feature.group" version="3.1.0.v201105231230-40-7w312216342341"/>
+ <unit id="org.eclipse.tm.terminal.view.feature.group" version="2.2.0.v201103142315-31-7w312214253426"/>
+ <unit id="org.eclipse.tm.terminal.telnet.feature.group" version="2.1.0.v201103142315-30-7w312213121A22"/>
+ <unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.1.0.v201103142315-30-7w312212153266"/>
- <!-- EMF 2.7 + others -->
- <unit id="org.eclipse.graphiti.feature.feature.group" version="0.8.0.v20110524-0815"/>
- <unit id="org.eclipse.emf.feature.group" version="2.7.1.v20111003-1135"/>
- <unit id="org.eclipse.emf.workspace.feature.group" version="1.5.0.v20110502-1600-36-8s734C367E3CBC7"/>
- <unit id="org.eclipse.emf.validation.feature.group" version="1.5.0.v20110502-1600-479-9oB56N5BBR6LCA6"/>
- <unit id="org.eclipse.emf.transaction.feature.group" version="1.5.0.v20110502-1600-377-8s734C3E7D15D6B"/>
-
- <!-- GEF 3.7 -->
- <unit id="org.eclipse.draw2d.feature.group" version="3.7.1.v20110830-1143-4607w3122194102254"/>
- <unit id="org.eclipse.gef.feature.group" version="3.7.0.v20110425-2050-777D-81B2Bz0685C3A6E34272"/>
- <unit id="org.eclipse.zest.feature.group" version="1.3.0.v20101213-1100-67A-8yF4F09A9H4D6O54272"/>
-
- <!-- JDT 3.7 -->
- <unit id="org.eclipse.jdt.feature.group" version="3.7.1.r371_v20110810-0800-7z8gFcoFMLfTabvKsR5Qm9rBGEBK"/>
-
- <!-- WTP SDK 3.3 -->
+ <!-- WTP -->
<unit id="org.eclipse.jpt.common.feature.feature.group" version="1.0.1.v201108080010-6-0AkF7BB7S9N7788"/>
<unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.0.0.v201104050000-3--8s73553C4G3333"/>
<unit id="org.eclipse.jpt.jpa.eclipselink.feature.feature.group" version="3.0.1.v201108303011-7J7F78F7RZHQPJBNCKbSR7FB"/>
@@ -192,36 +180,93 @@
<unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="1.2.0.v201102200555-67K8ZBgJ9DKANEPBTGT"/>
<unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.2.0.v201102200555-7S7ZFT0FIpS-8NuhBrBnS9FQCUHU"/>
- <!-- RCP 3.7 -->
- <unit id="org.eclipse.equinox.executable.feature.group" version="3.5.0.v20110530-7P7NFUFFLWUl76mart"/>
- <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.1.2.R37x_v20110815-1155-6-Bj9JXOeQxOURYC-l9BL7rDEQO7"/>
- <unit id="org.eclipse.help.feature.group" version="1.3.0.v20110121-7i7uFCaFFt6Zqif0tNYDdt"/>
- <unit id="org.eclipse.platform.feature.group" version="3.7.1.r37x_v20110729-9gF7UHOxFtniV7mI3T556iZN9AU8bEZ1lHMcVK"/>
- <unit id="org.eclipse.rcp.feature.group" version="3.7.1.r37x_v20110729-9DB5FmNFnFLSFCtLxnRfMqt15A4A"/>
-
- <!-- UML -->
- <unit id="org.eclipse.uml2.feature.group" version="3.2.1.v201109082252"/>
- <unit id="org.eclipse.uml2.doc.feature.group" version="3.2.0.v201103291514"/>
-
- <!-- PDE -->
- <unit id="org.eclipse.pde.feature.group" version="3.7.0.v20110504-0800-7b7qFVpFEx2XnmYtj_9RfO7"/>
-
- <!-- RSE SDK 3.3 -->
- <unit id="org.eclipse.rse.feature.group" version="3.3.0.v201105231230-7L7CFGB8wqio7ppp-b5xwz-6LVIZ"/>
- <unit id="org.eclipse.rse.useractions.feature.group" version="1.1.300.v201103142315-31F8N8s7355353B75DD"/>
- <unit id="org.eclipse.tm.terminal.feature.group" version="3.1.0.v201105231230-40-7w312216342341"/>
- <unit id="org.eclipse.tm.terminal.view.feature.group" version="2.2.0.v201103142315-31-7w312214253426"/>
- <unit id="org.eclipse.tm.terminal.telnet.feature.group" version="2.1.0.v201103142315-30-7w312213121A22"/>
- <unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.1.0.v201103142315-30-7w312212153266"/>
-
<!-- JBIDE-9549, JBDS-1904 add egit/jgit and mylyn support to TP, including dependent plugins -->
<unit id="org.eclipse.jsch.ui" version="1.1.300.I20110511-0800"/>
- <unit id="org.eclipse.jsch.core" version="1.1.300.I20110514-0800"/>
+ <unit id="org.eclipse.jsch.core" version="1.1.300.I20110118-0800"/>
<unit id="com.jcraft.jsch" version="0.1.41.v201101211617"/>
<unit id="org.eclipse.jgit.feature.group" version="1.1.0.201109151100-r"/>
<unit id="org.eclipse.egit.feature.group" version="1.1.0.201109151100-r"/>
<unit id="org.eclipse.egit.mylyn.feature.group" version="1.1.0.201109151100-r"/>
<unit id="org.eclipse.mylyn.github.feature.feature.group" version="1.1.0.201109151100-r"/>
+
+ <!-- needed for JBoss Central -->
+ <unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
+ <unit id="org.eclipse.mylyn.commons.core" version="3.6.0.I20110523-2039"/>
+ <unit id="org.eclipse.mylyn.discovery.ui" version="3.6.1.v20110819-0100"/>
+ <unit id="org.eclipse.mylyn.discovery.core" version="3.6.1.v20110817-0100"/>
+ <unit id="org.eclipse.mylyn.commons.ui" version="3.6.0.I20110523-2039"/>
+ <unit id="org.eclipse.mylyn.commons.net" version="3.6.0.I20110523-2039"/>
+ <unit id="org.eclipse.mylyn.commons.screenshots" version="3.6.0.v20110608-1400"/>
+ <unit id="org.apache.commons.lang" version="2.4.0.v201005080502"/>
+
+ <!-- JBDS-1904, JBIDE-9351, JBIDE-10094 add mylyn and jira to JBT/JBDS TP -->
+ <unit id="org.eclipse.mylyn_feature.feature.group" version="3.6.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.6.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.commons.feature.group" version="3.6.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.context_feature.feature.group" version="3.6.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="3.6.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.java_feature.feature.group" version="3.6.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.pde_feature.feature.group" version="3.6.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.team_feature.feature.group" version="3.6.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="1.5.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.cvs.feature.group" version="0.8.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.git.feature.group" version="0.8.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.versions.feature.group" version="0.8.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.tasks.ui" version="3.6.2.v20110826-0100"/>
+ <unit id="org.eclipse.mylyn.tasks.core" version="3.6.0.v20110608-1400"/>
+ <unit id="org.eclipse.mylyn.tasks.bugs" version="3.6.1.v20110825-0100"/>
+ <unit id="com.atlassian.connector.commons" version="4.0.0.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.bamboo.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.bamboo.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.branding.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.commons.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.commons.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.crucible.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.crucible.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.cvs.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.cvs.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.directclickthrough.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.fisheye.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.fisheye.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.help" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.jira.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.jira.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.monitor.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.monitor.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.subclipse.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.subclipse.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.ui" version="3.0.1.v20110812"/>
+ <unit id="com.thoughtworks.xstream" version="1.3.0.v20100826-1640"/>
+ <unit id="org.eclipse.ui" version="3.7.0.I20110310-1100"/>
+ <unit id="org.eclipse.core.runtime" version="3.7.0.v20110110"/>
+ <unit id="org.eclipse.core.resources" version="3.7.100.v20110125b"/>
+ <unit id="org.eclipse.ui.ide" version="3.7.0.I20110519-0100"/>
+ <unit id="org.eclipse.ui.workbench.texteditor" version="3.7.0.v20110124-0100"/>
+ <unit id="org.eclipse.jface.text" version="3.7.0.v20110505-0800"/>
+ <unit id="org.eclipse.osgi" version="3.7.0.v20110613"/>
+ <unit id="org.eclipse.core.filesystem" version="1.3.100.v20110117"/>
+ <unit id="org.eclipse.ui.forms" version="3.5.100.v20101220"/>
+ <unit id="org.eclipse.ui.editors" version="3.7.0.v20110517-0800"/>
+ <unit id="org.eclipse.team.core" version="3.6.0.I20110125-0640"/>
+ <unit id="org.eclipse.team.ui" version="3.6.100.I20110525-0800"/>
+ <unit id="org.eclipse.jface" version="3.7.0.I20110522-1430"/>
+ <unit id="org.eclipse.compare" version="3.5.200.I20101206-1300"/>
+ <unit id="org.apache.axis" version="1.4.0.v201005080400"/>
+ <unit id="org.apache.commons.logging" version="1.0.4.v201101211617"/>
+ <unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
+ <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+ <unit id="org.apache.commons.lang" version="2.4.0.v201005080502"/>
+ <unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
+ <unit id="org.jdom_jaxen" version="1.0.0.20081203-1100"/>
+ <unit id="org.mortbay.jetty.server" version="6.1.23.v201012071420"/>
+ <unit id="org.mortbay.jetty.util" version="6.1.23.v201012071420"/>
+ <unit id="org.apache.jasper" version="5.5.17.v201101211617"/>
+ <unit id="org.joda.time" version="1.6.0.v20081202-0100"/>
+ <unit id="javax.servlet" version="3.0.0.v201103241727"/>
+ <unit id="javax.servlet.jsp" version="2.0.0.v201101211617"/>
+ <unit id="javax.xml.rpc" version="1.1.0.v201005080400"/>
+ <unit id="javax.el" version="2.2.0.v201105051105"/>
</location>
</locations>
-</target>
+</target>
\ No newline at end of file
Modified: trunk/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/jbds.target.p2mirror.xml 2011-11-07 20:52:50 UTC (rev 36209)
+++ trunk/build/target-platform/jbds.target.p2mirror.xml 2011-11-08 00:14:10 UTC (rev 36210)
@@ -55,36 +55,39 @@
<iu id="org.hamcrest.text" version=""/>
<iu id="org.hamcrest.library" version=""/>
<iu id="org.hamcrest.integration" version=""/>
-<iu id="com.sun.syndication" version=""/>
-<iu id="org.eclipse.mylyn.commons.core" version=""/>
-<iu id="org.eclipse.mylyn.discovery.ui" version=""/>
-<iu id="org.eclipse.mylyn.discovery.core" version=""/>
-<iu id="org.eclipse.mylyn.commons.ui" version=""/>
-<iu id="org.eclipse.mylyn.commons.net" version=""/>
-<iu id="org.eclipse.mylyn.commons.screenshots" version=""/>
-<iu id="org.apache.commons.lang" version=""/>
-<iu id="org.eclipse.mylyn.bugzilla_feature.feature.group" version=""/>
-<iu id="org.eclipse.mylyn.ide_feature.feature.group" version=""/>
-<iu id="org.eclipse.mylyn.commons.feature.group" version=""/>
-<iu id="org.eclipse.mylyn.java_feature.feature.group" version=""/>
-<iu id="org.eclipse.mylyn.context_feature.feature.group" version=""/>
-<iu id="org.eclipse.mylyn.pde_feature.feature.group" version=""/>
-<iu id="org.eclipse.mylyn.cvs.feature.group" version=""/>
-<iu id="org.eclipse.mylyn.team_feature.feature.group" version=""/>
-<iu id="org.eclipse.mylyn_feature.feature.group" version=""/>
-<iu id="org.eclipse.mylyn.versions.feature.group" version=""/>
-<iu id="org.eclipse.mylyn.git.feature.group" version=""/>
-<iu id="org.eclipse.mylyn.wikitext_feature.feature.group" version=""/>
-<iu id="org.eclipse.bpel.jboss.riftsaw.runtime.feature.feature.group" version=""/>
-<iu id="org.eclipse.bpel.apache.ode.runtime.feature.feature.group" version=""/>
-<iu id="org.eclipse.bpel.feature.feature.group" version=""/>
<iu id="org.apache.lucene.highlighter" version=""/>
<iu id="org.apache.lucene.memory" version=""/>
<iu id="org.apache.lucene.misc" version=""/>
<iu id="org.apache.lucene.queries" version=""/>
<iu id="org.apache.lucene.snowball" version=""/>
<iu id="org.apache.lucene.spellchecker" version=""/>
+<iu id="org.eclipse.bpel.jboss.riftsaw.runtime.feature.feature.group" version=""/>
+<iu id="org.eclipse.bpel.apache.ode.runtime.feature.feature.group" version=""/>
+<iu id="org.eclipse.bpel.feature.feature.group" version=""/>
+<iu id="org.eclipse.emf.feature.group" version=""/>
+<iu id="org.eclipse.emf.workspace.feature.group" version=""/>
+<iu id="org.eclipse.emf.validation.feature.group" version=""/>
+<iu id="org.eclipse.emf.transaction.feature.group" version=""/>
+<iu id="org.eclipse.xsd.ecore.converter.feature.group" version=""/>
+<iu id="org.eclipse.xsd.edit.feature.group" version=""/>
+<iu id="org.eclipse.xsd.editor.feature.group" version=""/>
+<iu id="org.eclipse.xsd.mapping.editor.feature.group" version=""/>
+<iu id="org.eclipse.xsd.mapping.feature.group" version=""/>
+<iu id="org.eclipse.xsd.feature.group" version=""/>
+<iu id="org.eclipse.graphiti.feature.feature.group" version=""/>
+<iu id="org.eclipse.draw2d.feature.group" version=""/>
+<iu id="org.eclipse.gef.feature.group" version=""/>
+<iu id="org.eclipse.zest.feature.group" version=""/>
+<iu id="org.eclipse.uml2.feature.group" version=""/>
+<iu id="org.eclipse.uml2.doc.feature.group" version=""/>
+<iu id="org.eclipse.platform.feature.group" version=""/>
<iu id="org.eclipse.cvs.feature.group" version=""/>
+<iu id="org.eclipse.jdt.feature.group" version=""/>
+<iu id="org.eclipse.equinox.executable.feature.group" version=""/>
+<iu id="org.eclipse.equinox.p2.user.ui.feature.group" version=""/>
+<iu id="org.eclipse.rcp.feature.group" version=""/>
+<iu id="org.eclipse.pde.feature.group" version=""/>
+<iu id="org.eclipse.help.feature.group" version=""/>
<iu id="org.eclipse.datatools.modelbase.feature.feature.group" version=""/>
<iu id="org.eclipse.datatools.connectivity.feature.feature.group" version=""/>
<iu id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version=""/>
@@ -119,21 +122,12 @@
<iu id="org.eclipse.datatools.common.doc.user.feature.group" version=""/>
<iu id="org.eclipse.datatools.connectivity.doc.user.feature.group" version=""/>
<iu id="org.eclipse.datatools.sqltools.doc.user.feature.group" version=""/>
-<iu id="org.eclipse.xsd.ecore.converter.feature.group" version=""/>
-<iu id="org.eclipse.xsd.edit.feature.group" version=""/>
-<iu id="org.eclipse.xsd.editor.feature.group" version=""/>
-<iu id="org.eclipse.xsd.mapping.editor.feature.group" version=""/>
-<iu id="org.eclipse.xsd.mapping.feature.group" version=""/>
-<iu id="org.eclipse.xsd.feature.group" version=""/>
-<iu id="org.eclipse.graphiti.feature.feature.group" version=""/>
-<iu id="org.eclipse.emf.feature.group" version=""/>
-<iu id="org.eclipse.emf.workspace.feature.group" version=""/>
-<iu id="org.eclipse.emf.validation.feature.group" version=""/>
-<iu id="org.eclipse.emf.transaction.feature.group" version=""/>
-<iu id="org.eclipse.draw2d.feature.group" version=""/>
-<iu id="org.eclipse.gef.feature.group" version=""/>
-<iu id="org.eclipse.zest.feature.group" version=""/>
-<iu id="org.eclipse.jdt.feature.group" version=""/>
+<iu id="org.eclipse.rse.feature.group" version=""/>
+<iu id="org.eclipse.rse.useractions.feature.group" version=""/>
+<iu id="org.eclipse.tm.terminal.feature.group" version=""/>
+<iu id="org.eclipse.tm.terminal.view.feature.group" version=""/>
+<iu id="org.eclipse.tm.terminal.telnet.feature.group" version=""/>
+<iu id="org.eclipse.tm.terminal.ssh.feature.group" version=""/>
<iu id="org.eclipse.jpt.common.feature.feature.group" version=""/>
<iu id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version=""/>
<iu id="org.eclipse.jpt.jpa.eclipselink.feature.feature.group" version=""/>
@@ -179,20 +173,6 @@
<iu id="org.eclipse.wst.xml_userdoc.feature.feature.group" version=""/>
<iu id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version=""/>
<iu id="org.eclipse.wst.xsl.feature.feature.group" version=""/>
-<iu id="org.eclipse.equinox.executable.feature.group" version=""/>
-<iu id="org.eclipse.equinox.p2.user.ui.feature.group" version=""/>
-<iu id="org.eclipse.help.feature.group" version=""/>
-<iu id="org.eclipse.platform.feature.group" version=""/>
-<iu id="org.eclipse.rcp.feature.group" version=""/>
-<iu id="org.eclipse.uml2.feature.group" version=""/>
-<iu id="org.eclipse.uml2.doc.feature.group" version=""/>
-<iu id="org.eclipse.pde.feature.group" version=""/>
-<iu id="org.eclipse.rse.feature.group" version=""/>
-<iu id="org.eclipse.rse.useractions.feature.group" version=""/>
-<iu id="org.eclipse.tm.terminal.feature.group" version=""/>
-<iu id="org.eclipse.tm.terminal.view.feature.group" version=""/>
-<iu id="org.eclipse.tm.terminal.telnet.feature.group" version=""/>
-<iu id="org.eclipse.tm.terminal.ssh.feature.group" version=""/>
<iu id="org.eclipse.jsch.ui" version=""/>
<iu id="org.eclipse.jsch.core" version=""/>
<iu id="com.jcraft.jsch" version=""/>
@@ -200,6 +180,81 @@
<iu id="org.eclipse.egit.feature.group" version=""/>
<iu id="org.eclipse.egit.mylyn.feature.group" version=""/>
<iu id="org.eclipse.mylyn.github.feature.feature.group" version=""/>
+<iu id="com.sun.syndication" version=""/>
+<iu id="org.eclipse.mylyn.commons.core" version=""/>
+<iu id="org.eclipse.mylyn.discovery.ui" version=""/>
+<iu id="org.eclipse.mylyn.discovery.core" version=""/>
+<iu id="org.eclipse.mylyn.commons.ui" version=""/>
+<iu id="org.eclipse.mylyn.commons.net" version=""/>
+<iu id="org.eclipse.mylyn.commons.screenshots" version=""/>
+<iu id="org.apache.commons.lang" version=""/>
+<iu id="org.eclipse.mylyn_feature.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.ide_feature.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.commons.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.context_feature.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.bugzilla_feature.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.java_feature.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.pde_feature.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.team_feature.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.wikitext_feature.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.cvs.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.git.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.versions.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.tasks.ui" version=""/>
+<iu id="org.eclipse.mylyn.tasks.core" version=""/>
+<iu id="org.eclipse.mylyn.tasks.bugs" version=""/>
+<iu id="com.atlassian.connector.commons" version=""/>
+<iu id="com.atlassian.connector.eclipse.bamboo.core" version=""/>
+<iu id="com.atlassian.connector.eclipse.bamboo.ui" version=""/>
+<iu id="com.atlassian.connector.eclipse.branding.ui" version=""/>
+<iu id="com.atlassian.connector.eclipse.commons.core" version=""/>
+<iu id="com.atlassian.connector.eclipse.commons.ui" version=""/>
+<iu id="com.atlassian.connector.eclipse.core" version=""/>
+<iu id="com.atlassian.connector.eclipse.crucible.core" version=""/>
+<iu id="com.atlassian.connector.eclipse.crucible.ui" version=""/>
+<iu id="com.atlassian.connector.eclipse.cvs.core" version=""/>
+<iu id="com.atlassian.connector.eclipse.cvs.ui" version=""/>
+<iu id="com.atlassian.connector.eclipse.directclickthrough.ui" version=""/>
+<iu id="com.atlassian.connector.eclipse.fisheye.core" version=""/>
+<iu id="com.atlassian.connector.eclipse.fisheye.ui" version=""/>
+<iu id="com.atlassian.connector.eclipse.help" version=""/>
+<iu id="com.atlassian.connector.eclipse.jira.core" version=""/>
+<iu id="com.atlassian.connector.eclipse.jira.ui" version=""/>
+<iu id="com.atlassian.connector.eclipse.monitor.core" version=""/>
+<iu id="com.atlassian.connector.eclipse.monitor.ui" version=""/>
+<iu id="com.atlassian.connector.eclipse.subclipse.core" version=""/>
+<iu id="com.atlassian.connector.eclipse.subclipse.ui" version=""/>
+<iu id="com.atlassian.connector.eclipse.ui" version=""/>
+<iu id="com.thoughtworks.xstream" version=""/>
+<iu id="org.eclipse.ui" version=""/>
+<iu id="org.eclipse.core.runtime" version=""/>
+<iu id="org.eclipse.core.resources" version=""/>
+<iu id="org.eclipse.ui.ide" version=""/>
+<iu id="org.eclipse.ui.workbench.texteditor" version=""/>
+<iu id="org.eclipse.jface.text" version=""/>
+<iu id="org.eclipse.osgi" version=""/>
+<iu id="org.eclipse.core.filesystem" version=""/>
+<iu id="org.eclipse.ui.forms" version=""/>
+<iu id="org.eclipse.ui.editors" version=""/>
+<iu id="org.eclipse.team.core" version=""/>
+<iu id="org.eclipse.team.ui" version=""/>
+<iu id="org.eclipse.jface" version=""/>
+<iu id="org.eclipse.compare" version=""/>
+<iu id="org.apache.axis" version=""/>
+<iu id="org.apache.commons.logging" version=""/>
+<iu id="org.apache.commons.io" version=""/>
+<iu id="org.apache.commons.httpclient" version=""/>
+<iu id="org.apache.commons.lang" version=""/>
+<iu id="org.apache.commons.codec" version=""/>
+<iu id="org.jdom_jaxen" version=""/>
+<iu id="org.mortbay.jetty.server" version=""/>
+<iu id="org.mortbay.jetty.util" version=""/>
+<iu id="org.apache.jasper" version=""/>
+<iu id="org.joda.time" version=""/>
+<iu id="javax.servlet" version=""/>
+<iu id="javax.servlet.jsp" version=""/>
+<iu id="javax.xml.rpc" version=""/>
+<iu id="javax.el" version=""/>
</p2.mirror>
</target>
</project>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-11-07 20:52:50 UTC (rev 36209)
+++ trunk/build/target-platform/multiple.target 2011-11-08 00:14:10 UTC (rev 36210)
@@ -17,7 +17,7 @@
build.xml, *.target*, publish.sh, target2p2mirror.xml -->
<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR1/"/>
- <!-- m2e 1.0 / m2e-wtp 0.13.1.20110718-1012 + deps -->
+ <!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106061504"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.1.20110728-1800"/>
@@ -26,12 +26,12 @@
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
<unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
- <unit id="com.ning.async-http-client" version="1.6.3.201106061504"/>
- <unit id="org.jboss.netty" version="3.2.4.Final-201106061504"/>
+ <unit id="com.ning.async-http-client" version="1.6.3.201108040830"/>
+ <unit id="org.jboss.netty" version="3.2.4.Final-201108040830"/>
<unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110502-1955"/>
<unit id="org.eclipse.equinox.p2.discovery" version="1.0.100.v20110502-1955"/>
<unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110502-1955"/>
- <unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110516-1727"/>
+ <unit id="org.eclipse.net4j.jms.api" version="3.0.1.v20110818-0811"/>
<!-- Orbit bundles -->
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
@@ -46,30 +46,6 @@
<unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.integration" version="1.1.0.v20090501071000"/>
- <!-- needed for JBoss Central -->
- <unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
- <unit id="org.eclipse.mylyn.commons.core" version="3.6.0.I20110523-2039"/>
- <unit id="org.eclipse.mylyn.discovery.ui" version="3.6.1.v20110819-0100"/>
- <unit id="org.eclipse.mylyn.discovery.core" version="3.6.1.v20110817-0100"/>
- <unit id="org.eclipse.mylyn.commons.ui" version="3.6.0.I20110523-2039"/>
- <unit id="org.eclipse.mylyn.commons.net" version="3.6.0.I20110523-2039"/>
- <unit id="org.eclipse.mylyn.commons.screenshots" version="3.6.0.v20110608-1400"/>
- <unit id="org.apache.commons.lang" version="2.4.0.v201005080502"/>
-
- <!-- JBDS-1904 :: mylyn -->
- <unit id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.commons.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.java_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.context_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.pde_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.cvs.feature.group" version="0.8.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.team_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.versions.feature.group" version="0.8.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.git.feature.group" version="0.8.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="1.5.2.v20110908-0706"/>
-
<!-- Orbit bundles needed for Eclipse Checkstyle (eclipse-cs) -->
<unit id="org.apache.lucene.highlighter" version="2.9.1.v20100421-0704"/>
<unit id="org.apache.lucene.memory" version="2.9.1.v20100421-0704"/>
@@ -78,12 +54,12 @@
<unit id="org.apache.lucene.snowball" version="2.9.1.v20100421-0704"/>
<unit id="org.apache.lucene.spellchecker" version="2.9.1.v20100421-0704"/>
- <!-- Eclipse BPEL features -->
+ <!-- Eclipse BPEL -->
<unit id="org.eclipse.bpel.jboss.riftsaw.runtime.feature.feature.group" version="0.5.0.v20110915-1141-H87-CI"/>
<unit id="org.eclipse.bpel.apache.ode.runtime.feature.feature.group" version="0.5.0.v20110915-1141-H87-CI"/>
<unit id="org.eclipse.bpel.feature.feature.group" version="0.5.0.v20110915-1141-H87-CI"/>
- <unit id="org.eclipse.graphiti.feature.feature.group" version="0.8.0.v20110607-1252"/>
+ <!-- EMF, XSD -->
<unit id="org.eclipse.emf.workspace.feature.group" version="1.5.0.v20110502-1600-36-8s734C367E3CBC7"/>
<unit id="org.eclipse.emf.validation.feature.group" version="1.5.0.v20110502-1600-479-9oB56N5BBR6LCA6"/>
<unit id="org.eclipse.emf.transaction.feature.group" version="1.5.0.v20110502-1600-377-8s734C3E7D15D6B"/>
@@ -100,33 +76,29 @@
<unit id="org.eclipse.xsd.edit.feature.group" version="2.6.0.v20110128-1446"/>
<unit id="org.eclipse.xsd.feature.group" version="2.7.0.v20110530-1010"/>
- <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
- <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
- <unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
- <unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
- <unit id="org.eclipse.swtbot.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
+ <!-- GEF, Draw2D, Graphiti, Zest -->
+ <unit id="org.eclipse.graphiti.feature.feature.group" version="0.8.0.v20110607-1252"/>
+ <unit id="org.eclipse.draw2d.feature.group" version="3.7.0.v20110425-2050-46-7w3122153603161"/>
+ <unit id="org.eclipse.gef.feature.group" version="3.7.1.v20110830-1143-777D181B3Bz06C853D8863365"/>
+ <unit id="org.eclipse.zest.feature.group" version="1.3.0.v20110425-2050-67A08yF5F18CBD4I9G53365"/>
- <unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="3.7.0.v20110905-777D186vH9ByS6g9QJbm7yp7gZp-"/>
- <unit id="org.eclipse.birt.feature.group" version="4.0.0.v20101013-CJ8h7AGS7-BwX_RBv07XxGDko6kN"/>
- <unit id="org.eclipse.birt.integration.wtp.feature.group" version="3.7.0.v20110523-2201-46-7w3122163403312"/>
- <unit id="org.eclipse.birt.chart.feature.group" version="4.0.0.v20101008-828L1FQCnvKA7YW2lWF7"/>
- <unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="3.7.1.v20110905-1820-4607w31221A1602931"/>
+ <!-- UML2 -->
+ <unit id="org.eclipse.uml2.feature.group" version="3.2.0.v201101271655"/>
+ <!-- Platform: CVS, JDT, RCP, PDE, Equinox, Help -->
<unit id="com.ibm.icu.base.feature.group" version="1.2.0.v20110302-797738s7355373J"/>
- <unit id="org.eclipse.equinox.server.core.feature.group" version="1.1.1.R37x_v20110907-7K7TFBYDzbeA3ypK_98cDL15A4A"/>
- <unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110207-7B78FGB8sF7BB7I8H58WG5"/>
- <unit id="org.eclipse.help.feature.group" version="1.3.0.v20110121-7i7uFCaFFt6Zqif0tNYDdt"/>
- <unit id="org.eclipse.jdt.feature.group" version="3.7.0.v20110208-0800-7z8gFb7FMTfEULpkdZIlQtX9H155"/>
<unit id="org.eclipse.platform.feature.group" version="3.7.0.v20110121-9fF7OHGyFsAlpuWVeMel4CcNBmNslp8D-B"/>
<unit id="org.eclipse.platform.ide" version="3.7.0.I20110127-2034"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="3.5.0.v20101220-7P7NFUFFLWUl6m499UD1941"/>
<unit id="org.eclipse.platform.sdk" version="3.7.0.I20110310-1119"/>
- <unit id="org.eclipse.pde.feature.group" version="3.7.0.v20110121-7b7oFXNFEx2Xmp_WfY574C"/>
<unit id="org.eclipse.sdk.feature.group" version="3.7.0.v20110121-7Q7xA7DPa2z-lGjJRd0f6hRgSZ1DWdaZTRWbk_SVSlVqV"/>
<unit id="org.eclipse.releng.tools.feature.group" version="3.4.100.v20110503-4507s482aw31221929"/>
<unit id="org.eclipse.sdk.ide" version="3.7.0.I20110613-1736"/>
<unit id="org.eclipse.sdk.examples.feature.group" version="3.4.0.v20110503-817mFcfFEdccNcRhh8BTgNN"/>
<unit id="org.eclipse.sdk.examples.source.feature.group" version="3.4.0.v20110121"/>
+ <unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110207-7B78FGB8sF7BB7I8H58WG5"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.7.0.v20110208-0800-7z8gFb7FMTfEULpkdZIlQtX9H155"/>
+ <unit id="org.eclipse.equinox.server.core.feature.group" version="1.1.1.R37x_v20110907-7K7TFBYDzbeA3ypK_98cDL15A4A"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="3.5.0.v20101220-7P7NFUFFLWUl6m499UD1941"/>
<unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.7.1.R37x_v20110909-7X7XGA3FNKoMz-UVh-nB7ZBJ"/>
<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.7.0.v20110506-0800-7uF9LFp7FWmE7gTBiKg15LDD"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.100.v20110519-4-8_9oB5885K5B28WKK"/>
@@ -137,12 +109,14 @@
<unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="1.0.100.v20110502-79-F8PEVVFNNFsFV"/>
<unit id="org.eclipse.equinox.server.jetty.feature.group" version="1.0.100.v20110124-7I77AqBgJ9EBBNBb8IAD"/>
<unit id="org.eclipse.equinox.server.p2.feature.group" version="1.1.0.v20110124-7x7PFRBFT0z0-VD5xYnTNoi1"/>
- <unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.200.r37x_v20110803-7D-FHkFAFkNZZO9PfBZStN"/>
<unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.100.v20110124-42Bg9oB5856H5F"/>
<unit id="org.eclipse.equinox.server.simple.feature.group" version="1.0.100.v20110124-0830-44Eo8s7353574H2531"/>
<unit id="org.eclipse.rcp.feature.group" version="3.7.0.v20110216-9DB5Fm1FpBGy_AaVz-mFamgY"/>
+ <unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.200.r37x_v20110803-7D-FHkFAFkNZZO9PfBZStN"/>
+ <unit id="org.eclipse.pde.feature.group" version="3.7.0.v20110121-7b7oFXNFEx2Xmp_WfY574C"/>
+ <unit id="org.eclipse.help.feature.group" version="1.3.0.v20110121-7i7uFCaFFt6Zqif0tNYDdt"/>
- <!-- DTP 1.9 -->
+ <!-- DTP -->
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.9.0.v201010181130-77078CcNBHCBYKYEbNV"/>
<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.1.v201108301820-7C7e8mEt1_wmuQjYnXQ6Zj5dM17"/>
<unit id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.9.0.v201010181130-7H7C7FCcNBHFCQGgERLX"/>
@@ -165,7 +139,6 @@
<unit id="org.eclipse.datatools.enablement.ingres.feature.feature.group" version="1.9.1.v201108301820-540AkF78Z7UCRAQDB"/>
<unit id="org.eclipse.datatools.enablement.sqlite.feature.feature.group" version="1.9.1.v201108301820-541AkF79P7N8NAQ77"/>
<unit id="org.eclipse.datatools.sqldevtools.feature.feature.group" version="1.9.0.v201010181130-7N845FDsn0TdrPUJvPRskDVIMJ0T"/>
-
<unit id="org.eclipse.datatools.sqldevtools.results.feature.feature.group" version="1.9.0.v201101201115-57B3AkF7AI8FDDAOCP"/>
<unit id="org.eclipse.datatools.sqldevtools.ddlgen.feature.feature.group" version="1.9.1.v201108301820-7A-3F7RZHLz-Hz-OlPz0Qf"/>
<unit id="org.eclipse.datatools.sqldevtools.ddl.feature.feature.group" version="1.9.0.v201010181130-278-78B04G8S_IMz00Iz00PmQz01"/>
@@ -173,18 +146,13 @@
<unit id="org.eclipse.datatools.sqldevtools.parsers.feature.feature.group" version="1.9.0.v201010181130-622BgJ9CR9XFcEWLP"/>
<unit id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.feature.group" version="1.9.1.v201108301820-79-4EVVFJoFwKcN-L_"/>
<unit id="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature.feature.group" version="1.9.0.v201010181130-4208375LG5BJ93413"/>
-
<unit id="org.eclipse.datatools.intro.feature.group" version="1.9.0.v201010181130-26-7w312116392911"/>
<unit id="org.eclipse.datatools.doc.user.feature.group" version="1.9.0.v201010181130-47C08w95ENAK6AFDFK7"/>
<unit id="org.eclipse.datatools.common.doc.user.feature.group" version="1.9.1.v201108301820-26-311A16321A3557"/>
<unit id="org.eclipse.datatools.connectivity.doc.user.feature.group" version="1.9.0.v201010181130-37D-7733L3D753L7BBF"/>
<unit id="org.eclipse.datatools.sqltools.doc.user.feature.group" version="1.9.0.v201010181130-37D-7733L3D753L7BBF"/>
- <unit id="org.eclipse.draw2d.feature.group" version="3.7.0.v20110425-2050-46-7w3122153603161"/>
- <unit id="org.eclipse.gef.feature.group" version="3.7.1.v20110830-1143-777D181B3Bz06C853D8863365"/>
- <unit id="org.eclipse.zest.feature.group" version="1.3.0.v20110425-2050-67A08yF5F18CBD4I9G53365"/>
- <unit id="org.eclipse.uml2.feature.group" version="3.2.0.v201101271655"/>
-
+ <!-- RSE, TM -->
<unit id="org.eclipse.rse.feature.group" version="3.3.0.v201105231230-7L7CFGB8wqio7ppp-b5xwz-6LVIZ"/>
<unit id="org.eclipse.rse.ssh.feature.group" version="3.0.301.R33x_v201109141647-7A3F9xAGGB5k0C7KEATN92641"/>
<unit id="org.eclipse.rse.terminals.feature.group" version="1.1.0.v201101042155-771Bg9uD6I4AB9LECPS3A45"/>
@@ -192,7 +160,6 @@
<unit id="org.eclipse.rse.ftp.feature.group" version="3.0.300.v201101261515-782F8N9oB588587HAFII"/>
<unit id="org.eclipse.rse.local.feature.group" version="2.1.300.v201101042155-7B4FKsBgJ9EE9F9QHMUU"/>
<unit id="org.eclipse.rse.useractions.feature.group" version="1.1.300.v201103142315-31F8N8s7355353B75DD"/>
-
<unit id="org.eclipse.tm.terminal.feature.group" version="3.1.0.v201105231230-40-7w312216342341"/>
<unit id="org.eclipse.tm.terminal.view.feature.group" version="2.2.0.v201101042155-31-7w312212362832"/>
<unit id="org.eclipse.tm.terminal.telnet.feature.group" version="2.1.0.v201101042155-30-7w312213121A22"/>
@@ -200,22 +167,7 @@
<unit id="org.eclipse.tm.terminal.feature.group" version="3.1.0.v201105231230-40-7w312216342341"/>
<unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.1.0.v201103142315-30-7w312212153266"/>
- <!-- SAVARA dependencies -->
- <!-- <unit version="1.2.0.201006151053" id="org.eclipse.stp.bpmn.feature.feature.group"/>
- <unit version="1.4.1.v20100909-1000-37708s73533F5C1479I" id="org.eclipse.gmf.runtime.notation.feature.group"/>
- <unit version="1.4.1.v20100909-1300-7d9A78FYnmMD7VBZOqOghp2tsgXc" id="org.eclipse.gmf.feature.group"/>
- <unit version="2.3.0.v20100421-2359-7c7MFO2FLWUl0im8BjQMa9f" id="org.eclipse.gmf.tooling.feature.group"/>
- <unit version="1.4.0.v20100521-1113-7P8W5FHV2CNOiy0niXURaw311A16" id="org.eclipse.gmf.runtime.thirdparty.feature.group"/>
- <unit version="3.0.1.v20100818-1530-7B11AkF7AG8VAT3BRLA" id="org.eclipse.m2m.qvt.oml.feature.group"/>
- <unit version="1.4.0.v20100428-2315-36-8s734C367E3CBC7" id="org.eclipse.emf.workspace.feature.group"/>
- <unit version="1.4.0.v20100428-2315-377-8s734C3E7D15D6B" id="org.eclipse.emf.transaction.feature.group"/>
- <unit version="3.0.1.R30x_v201008251030-79-7I8qD6z-DtD7E6BP9D5393" id="org.eclipse.ocl.feature.group"/>
- <unit version="1.0.0.v20100831" id="org.eclipse.pde.junit.runtime.standalone.feature.group"/>
- <unit version="2.1.0.v20100606-1530-7908_AkF7AG8KEM3CMFA" id="org.eclipse.m2m.qvt.oml.common.feature.group"/>
- <unit version="1.4.0.v20100428-2315-479-9oB56N5BBR6LCA6" id="org.eclipse.emf.validation.feature.group"/>
- <unit version="1.4.0.v20100428-2315-23-7w3121133502768" id="org.eclipse.emf.validation.ocl.feature.group"/>
- <unit version="2.1.0.v20100606-1530-7A2-AkF7AG8PBU3BRLA" id="org.eclipse.m2m.qvt.oml.runtime.feature.group"/> -->
-
+ <!-- WTP -->
<unit id="org.eclipse.jst.jee" version="1.0.401.v201105122000"/>
<unit id="org.eclipse.wst.common.frameworks" version="1.2.101.v201107192200"/>
<unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.200.v201101240054"/>
@@ -255,10 +207,6 @@
<unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.3.1.v201108102025-7I7AFg0EtEoVFjv98J1itfLE0uwVWklmuBTjEJM2"/>
<unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.3.1.v201108102009-7C7OFeKF7RZHQNI3R-OuRb"/>
- <!-- <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="1.4.2.v201012211742"/>
- <unit id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.2.0.feature.group" version="2.2.0.v201102111811"/>
- <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="2.2.0.v201102111811"/> -->
-
<!-- JBIDE-9549, JBDS-1904 add egit/jgit and mylyn support to TP, including dependent plugins -->
<unit id="org.eclipse.jsch.ui" version="1.1.300.I20110511-0800"/>
<unit id="org.eclipse.jsch.core" version="1.1.300.I20110514-0800"/>
@@ -267,6 +215,120 @@
<unit id="org.eclipse.egit.feature.group" version="1.1.0.201109151100-r"/>
<unit id="org.eclipse.egit.mylyn.feature.group" version="1.1.0.201109151100-r"/>
<unit id="org.eclipse.mylyn.github.feature.feature.group" version="1.1.0.201109151100-r"/>
+
+ <!-- needed for JBoss Central -->
+ <unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
+ <unit id="org.eclipse.mylyn.commons.core" version="3.6.0.I20110523-2039"/>
+ <unit id="org.eclipse.mylyn.discovery.ui" version="3.6.1.v20110819-0100"/>
+ <unit id="org.eclipse.mylyn.discovery.core" version="3.6.1.v20110817-0100"/>
+ <unit id="org.eclipse.mylyn.commons.ui" version="3.6.0.I20110523-2039"/>
+ <unit id="org.eclipse.mylyn.commons.net" version="3.6.0.I20110523-2039"/>
+ <unit id="org.eclipse.mylyn.commons.screenshots" version="3.6.0.v20110608-1400"/>
+ <unit id="org.apache.commons.lang" version="2.4.0.v201005080502"/>
+
+ <!-- JBDS-1904, JBIDE-9351, JBIDE-10094 add mylyn and jira to JBT/JBDS TP -->
+ <unit id="org.eclipse.mylyn_feature.feature.group" version="3.6.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.6.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.commons.feature.group" version="3.6.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.context_feature.feature.group" version="3.6.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="3.6.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.java_feature.feature.group" version="3.6.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.pde_feature.feature.group" version="3.6.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.team_feature.feature.group" version="3.6.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="1.5.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.cvs.feature.group" version="0.8.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.git.feature.group" version="0.8.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.versions.feature.group" version="0.8.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.tasks.ui" version="3.6.2.v20110826-0100"/>
+ <unit id="org.eclipse.mylyn.tasks.core" version="3.6.0.v20110608-1400"/>
+ <unit id="org.eclipse.mylyn.tasks.bugs" version="3.6.1.v20110825-0100"/>
+ <unit id="com.atlassian.connector.commons" version="4.0.0.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.bamboo.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.bamboo.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.branding.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.commons.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.commons.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.crucible.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.crucible.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.cvs.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.cvs.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.directclickthrough.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.fisheye.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.fisheye.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.help" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.jira.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.jira.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.monitor.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.monitor.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.subclipse.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.subclipse.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.ui" version="3.0.1.v20110812"/>
+ <unit id="com.thoughtworks.xstream" version="1.3.0.v20100826-1640"/>
+ <unit id="org.eclipse.ui" version="3.7.0.I20110310-1100"/>
+ <unit id="org.eclipse.core.runtime" version="3.7.0.v20110110"/>
+ <unit id="org.eclipse.core.resources" version="3.7.100.v20110125b"/>
+ <unit id="org.eclipse.ui.ide" version="3.7.0.I20110519-0100"/>
+ <unit id="org.eclipse.ui.workbench.texteditor" version="3.7.0.v20110124-0100"/>
+ <unit id="org.eclipse.jface.text" version="3.7.0.v20110505-0800"/>
+ <unit id="org.eclipse.osgi" version="3.7.0.v20110613"/>
+ <unit id="org.eclipse.core.filesystem" version="1.3.100.v20110117"/>
+ <unit id="org.eclipse.ui.forms" version="3.5.100.v20101220"/>
+ <unit id="org.eclipse.ui.editors" version="3.7.0.v20110517-0800"/>
+ <unit id="org.eclipse.team.core" version="3.6.0.I20110125-0640"/>
+ <unit id="org.eclipse.team.ui" version="3.6.100.I20110525-0800"/>
+ <unit id="org.eclipse.jface" version="3.7.0.I20110522-1430"/>
+ <unit id="org.eclipse.compare" version="3.5.200.I20101206-1300"/>
+ <unit id="org.apache.axis" version="1.4.0.v201005080400"/>
+ <unit id="org.apache.commons.logging" version="1.0.4.v201101211617"/>
+ <unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
+ <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+ <unit id="org.apache.commons.lang" version="2.4.0.v201005080502"/>
+ <unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
+ <unit id="org.jdom_jaxen" version="1.0.0.20081203-1100"/>
+ <unit id="org.mortbay.jetty.server" version="6.1.23.v201012071420"/>
+ <unit id="org.mortbay.jetty.util" version="6.1.23.v201012071420"/>
+ <unit id="org.apache.jasper" version="5.5.17.v201101211617"/>
+ <unit id="org.joda.time" version="1.6.0.v20081202-0100"/>
+ <unit id="javax.servlet" version="3.0.0.v201103241727"/>
+ <unit id="javax.servlet.jsp" version="2.0.0.v201101211617"/>
+ <unit id="javax.xml.rpc" version="1.1.0.v201005080400"/>
+ <unit id="javax.el" version="2.2.0.v201105051105"/>
+
+ <!-- SWTBot -->
+ <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
+ <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
+ <unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
+ <unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
+ <unit id="org.eclipse.swtbot.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
+
+ <!-- BIRT -->
+ <unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="3.7.0.v20110905-777D186vH9ByS6g9QJbm7yp7gZp-"/>
+ <unit id="org.eclipse.birt.feature.group" version="4.0.0.v20101013-CJ8h7AGS7-BwX_RBv07XxGDko6kN"/>
+ <unit id="org.eclipse.birt.integration.wtp.feature.group" version="3.7.0.v20110523-2201-46-7w3122163403312"/>
+ <unit id="org.eclipse.birt.chart.feature.group" version="4.0.0.v20101008-828L1FQCnvKA7YW2lWF7"/>
+ <unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="3.7.1.v20110905-1820-4607w31221A1602931"/>
+
+ <!-- GWT dependencies -->
+ <!-- <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="1.4.2.v201012211742"/>
+ <unit id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.2.0.feature.group" version="2.2.0.v201102111811"/>
+ <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="2.2.0.v201102111811"/> -->
+
+ <!-- SAVARA dependencies -->
+ <!-- <unit version="1.2.0.201006151053" id="org.eclipse.stp.bpmn.feature.feature.group"/>
+ <unit version="1.4.1.v20100909-1000-37708s73533F5C1479I" id="org.eclipse.gmf.runtime.notation.feature.group"/>
+ <unit version="1.4.1.v20100909-1300-7d9A78FYnmMD7VBZOqOghp2tsgXc" id="org.eclipse.gmf.feature.group"/>
+ <unit version="2.3.0.v20100421-2359-7c7MFO2FLWUl0im8BjQMa9f" id="org.eclipse.gmf.tooling.feature.group"/>
+ <unit version="1.4.0.v20100521-1113-7P8W5FHV2CNOiy0niXURaw311A16" id="org.eclipse.gmf.runtime.thirdparty.feature.group"/>
+ <unit version="3.0.1.v20100818-1530-7B11AkF7AG8VAT3BRLA" id="org.eclipse.m2m.qvt.oml.feature.group"/>
+ <unit version="1.4.0.v20100428-2315-36-8s734C367E3CBC7" id="org.eclipse.emf.workspace.feature.group"/>
+ <unit version="1.4.0.v20100428-2315-377-8s734C3E7D15D6B" id="org.eclipse.emf.transaction.feature.group"/>
+ <unit version="3.0.1.R30x_v201008251030-79-7I8qD6z-DtD7E6BP9D5393" id="org.eclipse.ocl.feature.group"/>
+ <unit version="1.0.0.v20100831" id="org.eclipse.pde.junit.runtime.standalone.feature.group"/>
+ <unit version="2.1.0.v20100606-1530-7908_AkF7AG8KEM3CMFA" id="org.eclipse.m2m.qvt.oml.common.feature.group"/>
+ <unit version="1.4.0.v20100428-2315-479-9oB56N5BBR6LCA6" id="org.eclipse.emf.validation.feature.group"/>
+ <unit version="1.4.0.v20100428-2315-23-7w3121133502768" id="org.eclipse.emf.validation.ocl.feature.group"/>
+ <unit version="2.1.0.v20100606-1530-7A2-AkF7AG8PBU3BRLA" id="org.eclipse.m2m.qvt.oml.runtime.feature.group"/> -->
</location>
</locations>
<includeBundles>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-11-07 20:52:50 UTC (rev 36209)
+++ trunk/build/target-platform/unified.target 2011-11-08 00:14:10 UTC (rev 36210)
@@ -2,7 +2,7 @@
<target includeMode="feature" name="e37-wtp33">
<!-- Pro tip: to convert
from org.eclipse.foo_4.6.0.v201005032111-777K4AkF7B77R7c7N77.jar
- to <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.foo.feature.group"/>
+ to <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.foo.feature.group"/>
using vi, apply this transform:
:%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit id="\1.feature.group" version="\2"\/>/g
-->
@@ -17,7 +17,7 @@
build.xml, *.target*, publish.sh, target2p2mirror.xml -->
<repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo/l..."/>
- <!-- m2e 1.0 / m2e-wtp 0.13.1.20110718-1012 + deps -->
+ <!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106061504"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.1.20110728-1800"/>
@@ -26,12 +26,12 @@
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
<unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
- <unit id="com.ning.async-http-client" version="1.6.3.201106061504"/>
- <unit id="org.jboss.netty" version="3.2.4.Final-201106061504"/>
+ <unit id="com.ning.async-http-client" version="1.6.3.201108040830"/>
+ <unit id="org.jboss.netty" version="3.2.4.Final-201108040830"/>
<unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110502-1955"/>
<unit id="org.eclipse.equinox.p2.discovery" version="1.0.100.v20110502-1955"/>
<unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110502-1955"/>
- <unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110516-1727"/>
+ <unit id="org.eclipse.net4j.jms.api" version="3.0.1.v20110818-0811"/>
<!-- Orbit bundles -->
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
@@ -46,30 +46,6 @@
<unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.integration" version="1.1.0.v20090501071000"/>
- <!-- needed for JBoss Central -->
- <unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
- <unit id="org.eclipse.mylyn.commons.core" version="3.6.0.I20110523-2039"/>
- <unit id="org.eclipse.mylyn.discovery.ui" version="3.6.1.v20110819-0100"/>
- <unit id="org.eclipse.mylyn.discovery.core" version="3.6.1.v20110817-0100"/>
- <unit id="org.eclipse.mylyn.commons.ui" version="3.6.0.I20110523-2039"/>
- <unit id="org.eclipse.mylyn.commons.net" version="3.6.0.I20110523-2039"/>
- <unit id="org.eclipse.mylyn.commons.screenshots" version="3.6.0.v20110608-1400"/>
- <unit id="org.apache.commons.lang" version="2.4.0.v201005080502"/>
-
- <!-- JBDS-1904 :: mylyn -->
- <unit id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.commons.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.java_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.context_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.pde_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.cvs.feature.group" version="0.8.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.team_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.versions.feature.group" version="0.8.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.git.feature.group" version="0.8.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="1.5.2.v20110908-0706"/>
-
<!-- Orbit bundles needed for Eclipse Checkstyle (eclipse-cs) -->
<unit id="org.apache.lucene.highlighter" version="2.9.1.v20100421-0704"/>
<unit id="org.apache.lucene.memory" version="2.9.1.v20100421-0704"/>
@@ -78,12 +54,12 @@
<unit id="org.apache.lucene.snowball" version="2.9.1.v20100421-0704"/>
<unit id="org.apache.lucene.spellchecker" version="2.9.1.v20100421-0704"/>
- <!-- Eclipse BPEL features -->
+ <!-- Eclipse BPEL -->
<unit id="org.eclipse.bpel.jboss.riftsaw.runtime.feature.feature.group" version="0.5.0.v20110915-1141-H87-CI"/>
<unit id="org.eclipse.bpel.apache.ode.runtime.feature.feature.group" version="0.5.0.v20110915-1141-H87-CI"/>
<unit id="org.eclipse.bpel.feature.feature.group" version="0.5.0.v20110915-1141-H87-CI"/>
- <unit id="org.eclipse.graphiti.feature.feature.group" version="0.8.0.v20110607-1252"/>
+ <!-- EMF, XSD -->
<unit id="org.eclipse.emf.workspace.feature.group" version="1.5.0.v20110502-1600-36-8s734C367E3CBC7"/>
<unit id="org.eclipse.emf.validation.feature.group" version="1.5.0.v20110502-1600-479-9oB56N5BBR6LCA6"/>
<unit id="org.eclipse.emf.transaction.feature.group" version="1.5.0.v20110502-1600-377-8s734C3E7D15D6B"/>
@@ -100,33 +76,29 @@
<unit id="org.eclipse.xsd.edit.feature.group" version="2.6.0.v20110128-1446"/>
<unit id="org.eclipse.xsd.feature.group" version="2.7.0.v20110530-1010"/>
- <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
- <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
- <unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
- <unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
- <unit id="org.eclipse.swtbot.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
+ <!-- GEF, Draw2D, Graphiti, Zest -->
+ <unit id="org.eclipse.graphiti.feature.feature.group" version="0.8.0.v20110607-1252"/>
+ <unit id="org.eclipse.draw2d.feature.group" version="3.7.0.v20110425-2050-46-7w3122153603161"/>
+ <unit id="org.eclipse.gef.feature.group" version="3.7.1.v20110830-1143-777D181B3Bz06C853D8863365"/>
+ <unit id="org.eclipse.zest.feature.group" version="1.3.0.v20110425-2050-67A08yF5F18CBD4I9G53365"/>
- <unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="3.7.0.v20110905-777D186vH9ByS6g9QJbm7yp7gZp-"/>
- <unit id="org.eclipse.birt.feature.group" version="4.0.0.v20101013-CJ8h7AGS7-BwX_RBv07XxGDko6kN"/>
- <unit id="org.eclipse.birt.integration.wtp.feature.group" version="3.7.0.v20110523-2201-46-7w3122163403312"/>
- <unit id="org.eclipse.birt.chart.feature.group" version="4.0.0.v20101008-828L1FQCnvKA7YW2lWF7"/>
- <unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="3.7.1.v20110905-1820-4607w31221A1602931"/>
+ <!-- UML2 -->
+ <unit id="org.eclipse.uml2.feature.group" version="3.2.0.v201101271655"/>
+ <!-- Platform: CVS, JDT, RCP, PDE, Equinox, Help -->
<unit id="com.ibm.icu.base.feature.group" version="1.2.0.v20110302-797738s7355373J"/>
- <unit id="org.eclipse.equinox.server.core.feature.group" version="1.1.1.R37x_v20110907-7K7TFBYDzbeA3ypK_98cDL15A4A"/>
- <unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110207-7B78FGB8sF7BB7I8H58WG5"/>
- <unit id="org.eclipse.help.feature.group" version="1.3.0.v20110121-7i7uFCaFFt6Zqif0tNYDdt"/>
- <unit id="org.eclipse.jdt.feature.group" version="3.7.0.v20110208-0800-7z8gFb7FMTfEULpkdZIlQtX9H155"/>
<unit id="org.eclipse.platform.feature.group" version="3.7.0.v20110121-9fF7OHGyFsAlpuWVeMel4CcNBmNslp8D-B"/>
<unit id="org.eclipse.platform.ide" version="3.7.0.I20110127-2034"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="3.5.0.v20101220-7P7NFUFFLWUl6m499UD1941"/>
<unit id="org.eclipse.platform.sdk" version="3.7.0.I20110310-1119"/>
- <unit id="org.eclipse.pde.feature.group" version="3.7.0.v20110121-7b7oFXNFEx2Xmp_WfY574C"/>
<unit id="org.eclipse.sdk.feature.group" version="3.7.0.v20110121-7Q7xA7DPa2z-lGjJRd0f6hRgSZ1DWdaZTRWbk_SVSlVqV"/>
<unit id="org.eclipse.releng.tools.feature.group" version="3.4.100.v20110503-4507s482aw31221929"/>
<unit id="org.eclipse.sdk.ide" version="3.7.0.I20110613-1736"/>
<unit id="org.eclipse.sdk.examples.feature.group" version="3.4.0.v20110503-817mFcfFEdccNcRhh8BTgNN"/>
<unit id="org.eclipse.sdk.examples.source.feature.group" version="3.4.0.v20110121"/>
+ <unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110207-7B78FGB8sF7BB7I8H58WG5"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.7.0.v20110208-0800-7z8gFb7FMTfEULpkdZIlQtX9H155"/>
+ <unit id="org.eclipse.equinox.server.core.feature.group" version="1.1.1.R37x_v20110907-7K7TFBYDzbeA3ypK_98cDL15A4A"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="3.5.0.v20101220-7P7NFUFFLWUl6m499UD1941"/>
<unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.7.1.R37x_v20110909-7X7XGA3FNKoMz-UVh-nB7ZBJ"/>
<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.7.0.v20110506-0800-7uF9LFp7FWmE7gTBiKg15LDD"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.100.v20110519-4-8_9oB5885K5B28WKK"/>
@@ -137,12 +109,14 @@
<unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="1.0.100.v20110502-79-F8PEVVFNNFsFV"/>
<unit id="org.eclipse.equinox.server.jetty.feature.group" version="1.0.100.v20110124-7I77AqBgJ9EBBNBb8IAD"/>
<unit id="org.eclipse.equinox.server.p2.feature.group" version="1.1.0.v20110124-7x7PFRBFT0z0-VD5xYnTNoi1"/>
- <unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.200.r37x_v20110803-7D-FHkFAFkNZZO9PfBZStN"/>
<unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.100.v20110124-42Bg9oB5856H5F"/>
<unit id="org.eclipse.equinox.server.simple.feature.group" version="1.0.100.v20110124-0830-44Eo8s7353574H2531"/>
<unit id="org.eclipse.rcp.feature.group" version="3.7.0.v20110216-9DB5Fm1FpBGy_AaVz-mFamgY"/>
+ <unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.200.r37x_v20110803-7D-FHkFAFkNZZO9PfBZStN"/>
+ <unit id="org.eclipse.pde.feature.group" version="3.7.0.v20110121-7b7oFXNFEx2Xmp_WfY574C"/>
+ <unit id="org.eclipse.help.feature.group" version="1.3.0.v20110121-7i7uFCaFFt6Zqif0tNYDdt"/>
- <!-- DTP 1.9 -->
+ <!-- DTP -->
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.9.0.v201010181130-77078CcNBHCBYKYEbNV"/>
<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.1.v201108301820-7C7e8mEt1_wmuQjYnXQ6Zj5dM17"/>
<unit id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.9.0.v201010181130-7H7C7FCcNBHFCQGgERLX"/>
@@ -165,7 +139,6 @@
<unit id="org.eclipse.datatools.enablement.ingres.feature.feature.group" version="1.9.1.v201108301820-540AkF78Z7UCRAQDB"/>
<unit id="org.eclipse.datatools.enablement.sqlite.feature.feature.group" version="1.9.1.v201108301820-541AkF79P7N8NAQ77"/>
<unit id="org.eclipse.datatools.sqldevtools.feature.feature.group" version="1.9.0.v201010181130-7N845FDsn0TdrPUJvPRskDVIMJ0T"/>
-
<unit id="org.eclipse.datatools.sqldevtools.results.feature.feature.group" version="1.9.0.v201101201115-57B3AkF7AI8FDDAOCP"/>
<unit id="org.eclipse.datatools.sqldevtools.ddlgen.feature.feature.group" version="1.9.1.v201108301820-7A-3F7RZHLz-Hz-OlPz0Qf"/>
<unit id="org.eclipse.datatools.sqldevtools.ddl.feature.feature.group" version="1.9.0.v201010181130-278-78B04G8S_IMz00Iz00PmQz01"/>
@@ -173,18 +146,13 @@
<unit id="org.eclipse.datatools.sqldevtools.parsers.feature.feature.group" version="1.9.0.v201010181130-622BgJ9CR9XFcEWLP"/>
<unit id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.feature.group" version="1.9.1.v201108301820-79-4EVVFJoFwKcN-L_"/>
<unit id="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature.feature.group" version="1.9.0.v201010181130-4208375LG5BJ93413"/>
-
<unit id="org.eclipse.datatools.intro.feature.group" version="1.9.0.v201010181130-26-7w312116392911"/>
<unit id="org.eclipse.datatools.doc.user.feature.group" version="1.9.0.v201010181130-47C08w95ENAK6AFDFK7"/>
<unit id="org.eclipse.datatools.common.doc.user.feature.group" version="1.9.1.v201108301820-26-311A16321A3557"/>
<unit id="org.eclipse.datatools.connectivity.doc.user.feature.group" version="1.9.0.v201010181130-37D-7733L3D753L7BBF"/>
<unit id="org.eclipse.datatools.sqltools.doc.user.feature.group" version="1.9.0.v201010181130-37D-7733L3D753L7BBF"/>
- <unit id="org.eclipse.draw2d.feature.group" version="3.7.0.v20110425-2050-46-7w3122153603161"/>
- <unit id="org.eclipse.gef.feature.group" version="3.7.1.v20110830-1143-777D181B3Bz06C853D8863365"/>
- <unit id="org.eclipse.zest.feature.group" version="1.3.0.v20110425-2050-67A08yF5F18CBD4I9G53365"/>
- <unit id="org.eclipse.uml2.feature.group" version="3.2.0.v201101271655"/>
-
+ <!-- RSE, TM -->
<unit id="org.eclipse.rse.feature.group" version="3.3.0.v201105231230-7L7CFGB8wqio7ppp-b5xwz-6LVIZ"/>
<unit id="org.eclipse.rse.ssh.feature.group" version="3.0.301.R33x_v201109141647-7A3F9xAGGB5k0C7KEATN92641"/>
<unit id="org.eclipse.rse.terminals.feature.group" version="1.1.0.v201101042155-771Bg9uD6I4AB9LECPS3A45"/>
@@ -192,7 +160,6 @@
<unit id="org.eclipse.rse.ftp.feature.group" version="3.0.300.v201101261515-782F8N9oB588587HAFII"/>
<unit id="org.eclipse.rse.local.feature.group" version="2.1.300.v201101042155-7B4FKsBgJ9EE9F9QHMUU"/>
<unit id="org.eclipse.rse.useractions.feature.group" version="1.1.300.v201103142315-31F8N8s7355353B75DD"/>
-
<unit id="org.eclipse.tm.terminal.feature.group" version="3.1.0.v201105231230-40-7w312216342341"/>
<unit id="org.eclipse.tm.terminal.view.feature.group" version="2.2.0.v201101042155-31-7w312212362832"/>
<unit id="org.eclipse.tm.terminal.telnet.feature.group" version="2.1.0.v201101042155-30-7w312213121A22"/>
@@ -200,22 +167,7 @@
<unit id="org.eclipse.tm.terminal.feature.group" version="3.1.0.v201105231230-40-7w312216342341"/>
<unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.1.0.v201103142315-30-7w312212153266"/>
- <!-- SAVARA dependencies -->
- <!-- <unit version="1.2.0.201006151053" id="org.eclipse.stp.bpmn.feature.feature.group"/>
- <unit version="1.4.1.v20100909-1000-37708s73533F5C1479I" id="org.eclipse.gmf.runtime.notation.feature.group"/>
- <unit version="1.4.1.v20100909-1300-7d9A78FYnmMD7VBZOqOghp2tsgXc" id="org.eclipse.gmf.feature.group"/>
- <unit version="2.3.0.v20100421-2359-7c7MFO2FLWUl0im8BjQMa9f" id="org.eclipse.gmf.tooling.feature.group"/>
- <unit version="1.4.0.v20100521-1113-7P8W5FHV2CNOiy0niXURaw311A16" id="org.eclipse.gmf.runtime.thirdparty.feature.group"/>
- <unit version="3.0.1.v20100818-1530-7B11AkF7AG8VAT3BRLA" id="org.eclipse.m2m.qvt.oml.feature.group"/>
- <unit version="1.4.0.v20100428-2315-36-8s734C367E3CBC7" id="org.eclipse.emf.workspace.feature.group"/>
- <unit version="1.4.0.v20100428-2315-377-8s734C3E7D15D6B" id="org.eclipse.emf.transaction.feature.group"/>
- <unit version="3.0.1.R30x_v201008251030-79-7I8qD6z-DtD7E6BP9D5393" id="org.eclipse.ocl.feature.group"/>
- <unit version="1.0.0.v20100831" id="org.eclipse.pde.junit.runtime.standalone.feature.group"/>
- <unit version="2.1.0.v20100606-1530-7908_AkF7AG8KEM3CMFA" id="org.eclipse.m2m.qvt.oml.common.feature.group"/>
- <unit version="1.4.0.v20100428-2315-479-9oB56N5BBR6LCA6" id="org.eclipse.emf.validation.feature.group"/>
- <unit version="1.4.0.v20100428-2315-23-7w3121133502768" id="org.eclipse.emf.validation.ocl.feature.group"/>
- <unit version="2.1.0.v20100606-1530-7A2-AkF7AG8PBU3BRLA" id="org.eclipse.m2m.qvt.oml.runtime.feature.group"/> -->
-
+ <!-- WTP -->
<unit id="org.eclipse.jst.jee" version="1.0.401.v201105122000"/>
<unit id="org.eclipse.wst.common.frameworks" version="1.2.101.v201107192200"/>
<unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.200.v201101240054"/>
@@ -255,10 +207,6 @@
<unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.3.1.v201108102025-7I7AFg0EtEoVFjv98J1itfLE0uwVWklmuBTjEJM2"/>
<unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.3.1.v201108102009-7C7OFeKF7RZHQNI3R-OuRb"/>
- <!-- <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="1.4.2.v201012211742"/>
- <unit id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.2.0.feature.group" version="2.2.0.v201102111811"/>
- <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="2.2.0.v201102111811"/> -->
-
<!-- JBIDE-9549, JBDS-1904 add egit/jgit and mylyn support to TP, including dependent plugins -->
<unit id="org.eclipse.jsch.ui" version="1.1.300.I20110511-0800"/>
<unit id="org.eclipse.jsch.core" version="1.1.300.I20110514-0800"/>
@@ -267,6 +215,120 @@
<unit id="org.eclipse.egit.feature.group" version="1.1.0.201109151100-r"/>
<unit id="org.eclipse.egit.mylyn.feature.group" version="1.1.0.201109151100-r"/>
<unit id="org.eclipse.mylyn.github.feature.feature.group" version="1.1.0.201109151100-r"/>
+
+ <!-- needed for JBoss Central -->
+ <unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
+ <unit id="org.eclipse.mylyn.commons.core" version="3.6.0.I20110523-2039"/>
+ <unit id="org.eclipse.mylyn.discovery.ui" version="3.6.1.v20110819-0100"/>
+ <unit id="org.eclipse.mylyn.discovery.core" version="3.6.1.v20110817-0100"/>
+ <unit id="org.eclipse.mylyn.commons.ui" version="3.6.0.I20110523-2039"/>
+ <unit id="org.eclipse.mylyn.commons.net" version="3.6.0.I20110523-2039"/>
+ <unit id="org.eclipse.mylyn.commons.screenshots" version="3.6.0.v20110608-1400"/>
+ <unit id="org.apache.commons.lang" version="2.4.0.v201005080502"/>
+
+ <!-- JBDS-1904, JBIDE-9351, JBIDE-10094 add mylyn and jira to JBT/JBDS TP -->
+ <unit id="org.eclipse.mylyn_feature.feature.group" version="3.6.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.6.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.commons.feature.group" version="3.6.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.context_feature.feature.group" version="3.6.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="3.6.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.java_feature.feature.group" version="3.6.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.pde_feature.feature.group" version="3.6.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.team_feature.feature.group" version="3.6.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="1.5.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.cvs.feature.group" version="0.8.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.git.feature.group" version="0.8.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.versions.feature.group" version="0.8.2.v20110908-0706"/>
+ <unit id="org.eclipse.mylyn.tasks.ui" version="3.6.2.v20110826-0100"/>
+ <unit id="org.eclipse.mylyn.tasks.core" version="3.6.0.v20110608-1400"/>
+ <unit id="org.eclipse.mylyn.tasks.bugs" version="3.6.1.v20110825-0100"/>
+ <unit id="com.atlassian.connector.commons" version="4.0.0.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.bamboo.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.bamboo.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.branding.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.commons.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.commons.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.crucible.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.crucible.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.cvs.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.cvs.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.directclickthrough.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.fisheye.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.fisheye.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.help" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.jira.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.jira.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.monitor.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.monitor.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.subclipse.core" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.subclipse.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.eclipse.ui" version="3.0.1.v20110812"/>
+ <unit id="com.thoughtworks.xstream" version="1.3.0.v20100826-1640"/>
+ <unit id="org.eclipse.ui" version="3.7.0.I20110310-1100"/>
+ <unit id="org.eclipse.core.runtime" version="3.7.0.v20110110"/>
+ <unit id="org.eclipse.core.resources" version="3.7.100.v20110125b"/>
+ <unit id="org.eclipse.ui.ide" version="3.7.0.I20110519-0100"/>
+ <unit id="org.eclipse.ui.workbench.texteditor" version="3.7.0.v20110124-0100"/>
+ <unit id="org.eclipse.jface.text" version="3.7.0.v20110505-0800"/>
+ <unit id="org.eclipse.osgi" version="3.7.0.v20110613"/>
+ <unit id="org.eclipse.core.filesystem" version="1.3.100.v20110117"/>
+ <unit id="org.eclipse.ui.forms" version="3.5.100.v20101220"/>
+ <unit id="org.eclipse.ui.editors" version="3.7.0.v20110517-0800"/>
+ <unit id="org.eclipse.team.core" version="3.6.0.I20110125-0640"/>
+ <unit id="org.eclipse.team.ui" version="3.6.100.I20110525-0800"/>
+ <unit id="org.eclipse.jface" version="3.7.0.I20110522-1430"/>
+ <unit id="org.eclipse.compare" version="3.5.200.I20101206-1300"/>
+ <unit id="org.apache.axis" version="1.4.0.v201005080400"/>
+ <unit id="org.apache.commons.logging" version="1.0.4.v201101211617"/>
+ <unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
+ <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+ <unit id="org.apache.commons.lang" version="2.4.0.v201005080502"/>
+ <unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
+ <unit id="org.jdom_jaxen" version="1.0.0.20081203-1100"/>
+ <unit id="org.mortbay.jetty.server" version="6.1.23.v201012071420"/>
+ <unit id="org.mortbay.jetty.util" version="6.1.23.v201012071420"/>
+ <unit id="org.apache.jasper" version="5.5.17.v201101211617"/>
+ <unit id="org.joda.time" version="1.6.0.v20081202-0100"/>
+ <unit id="javax.servlet" version="3.0.0.v201103241727"/>
+ <unit id="javax.servlet.jsp" version="2.0.0.v201101211617"/>
+ <unit id="javax.xml.rpc" version="1.1.0.v201005080400"/>
+ <unit id="javax.el" version="2.2.0.v201105051105"/>
+
+ <!-- SWTBot -->
+ <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
+ <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
+ <unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
+ <unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
+ <unit id="org.eclipse.swtbot.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
+
+ <!-- BIRT -->
+ <unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="3.7.0.v20110905-777D186vH9ByS6g9QJbm7yp7gZp-"/>
+ <unit id="org.eclipse.birt.feature.group" version="4.0.0.v20101013-CJ8h7AGS7-BwX_RBv07XxGDko6kN"/>
+ <unit id="org.eclipse.birt.integration.wtp.feature.group" version="3.7.0.v20110523-2201-46-7w3122163403312"/>
+ <unit id="org.eclipse.birt.chart.feature.group" version="4.0.0.v20101008-828L1FQCnvKA7YW2lWF7"/>
+ <unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="3.7.1.v20110905-1820-4607w31221A1602931"/>
+
+ <!-- GWT dependencies -->
+ <!-- <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="1.4.2.v201012211742"/>
+ <unit id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.2.0.feature.group" version="2.2.0.v201102111811"/>
+ <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="2.2.0.v201102111811"/> -->
+
+ <!-- SAVARA dependencies -->
+ <!-- <unit version="1.2.0.201006151053" id="org.eclipse.stp.bpmn.feature.feature.group"/>
+ <unit version="1.4.1.v20100909-1000-37708s73533F5C1479I" id="org.eclipse.gmf.runtime.notation.feature.group"/>
+ <unit version="1.4.1.v20100909-1300-7d9A78FYnmMD7VBZOqOghp2tsgXc" id="org.eclipse.gmf.feature.group"/>
+ <unit version="2.3.0.v20100421-2359-7c7MFO2FLWUl0im8BjQMa9f" id="org.eclipse.gmf.tooling.feature.group"/>
+ <unit version="1.4.0.v20100521-1113-7P8W5FHV2CNOiy0niXURaw311A16" id="org.eclipse.gmf.runtime.thirdparty.feature.group"/>
+ <unit version="3.0.1.v20100818-1530-7B11AkF7AG8VAT3BRLA" id="org.eclipse.m2m.qvt.oml.feature.group"/>
+ <unit version="1.4.0.v20100428-2315-36-8s734C367E3CBC7" id="org.eclipse.emf.workspace.feature.group"/>
+ <unit version="1.4.0.v20100428-2315-377-8s734C3E7D15D6B" id="org.eclipse.emf.transaction.feature.group"/>
+ <unit version="3.0.1.R30x_v201008251030-79-7I8qD6z-DtD7E6BP9D5393" id="org.eclipse.ocl.feature.group"/>
+ <unit version="1.0.0.v20100831" id="org.eclipse.pde.junit.runtime.standalone.feature.group"/>
+ <unit version="2.1.0.v20100606-1530-7908_AkF7AG8KEM3CMFA" id="org.eclipse.m2m.qvt.oml.common.feature.group"/>
+ <unit version="1.4.0.v20100428-2315-479-9oB56N5BBR6LCA6" id="org.eclipse.emf.validation.feature.group"/>
+ <unit version="1.4.0.v20100428-2315-23-7w3121133502768" id="org.eclipse.emf.validation.ocl.feature.group"/>
+ <unit version="2.1.0.v20100606-1530-7A2-AkF7AG8PBU3BRLA" id="org.eclipse.m2m.qvt.oml.runtime.feature.group"/> -->
</location>
</locations>
<includeBundles>
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r36209 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui: src/org/jboss/tools/openshift/express/internal/core/behaviour and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-11-07 15:52:50 -0500 (Mon, 07 Nov 2011)
New Revision: 36209
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
Log:
[JBIDE-10110] replaced erroneous dependency to org.jboss.ide.eclipse.as.egit.core by org.jboss.tools.openshift.egit.core
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-11-07 19:59:53 UTC (rev 36208)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-11-07 20:52:50 UTC (rev 36209)
@@ -5,7 +5,6 @@
Bundle-Version: 2.3.0.qualifier
Bundle-Activator: org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator
Require-Bundle: org.jboss.tools.openshift.express.client;bundle-version="2.3.0",
- org.jboss.ide.eclipse.as.egit.core;bundle-version="2.3.0",
org.eclipse.egit.ui;bundle-version="[1.0.0,2.0.0)",
org.eclipse.egit.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.jgit;bundle-version="[1.1.0,2.1.0)",
@@ -27,7 +26,8 @@
org.eclipse.ui.ide;bundle-version="3.7.0",
org.eclipse.m2e.core.ui;bundle-version="1.0.100",
org.eclipse.wst.common.modulecore;bundle-version="1.2.100",
- org.eclipse.team.ui;bundle-version="3.6.100"
+ org.eclipse.team.ui;bundle-version="3.6.100",
+ org.jboss.tools.openshift.egit.core;bundle-version="2.3.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.jboss.tools.common.databinding,
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2011-11-07 19:59:53 UTC (rev 36208)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2011-11-07 20:52:50 UTC (rev 36209)
@@ -20,7 +20,7 @@
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler;
-import org.jboss.ide.eclipse.as.egit.core.EGitUtils;
+import org.jboss.tools.openshift.egit.core.EGitUtils;
public class ExpressPublishMethod implements IJBossServerPublishMethod {
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r36208 - in trunk/seam: tests and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-11-07 14:59:53 -0500 (Mon, 07 Nov 2011)
New Revision: 36208
Added:
trunk/seam/tests/org.jboss.tools.seam.base.test/
Removed:
trunk/seam/plugins/org.jboss.tools.seam.base.test/
Modified:
trunk/seam/plugins/pom.xml
trunk/seam/tests/org.jboss.tools.seam.base.test/pom.xml
trunk/seam/tests/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-10107 (Move *.base.test from plugins folder to tests folder)
moved seam.base.test to tests folder to avoid confusion
Modified: trunk/seam/plugins/pom.xml
===================================================================
--- trunk/seam/plugins/pom.xml 2011-11-07 19:45:28 UTC (rev 36207)
+++ trunk/seam/plugins/pom.xml 2011-11-07 19:59:53 UTC (rev 36208)
@@ -13,7 +13,6 @@
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.seam.core</module>
- <module>org.jboss.tools.seam.base.test</module>
<module>org.jboss.tools.seam.pages.xml</module>
<module>org.jboss.tools.seam.text.ext</module>
<module>org.jboss.tools.seam.ui</module>
Modified: trunk/seam/tests/org.jboss.tools.seam.base.test/pom.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.base.test/pom.xml 2011-11-07 16:04:17 UTC (rev 36195)
+++ trunk/seam/tests/org.jboss.tools.seam.base.test/pom.xml 2011-11-07 19:59:53 UTC (rev 36208)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools.seam</groupId>
- <artifactId>plugins</artifactId>
+ <artifactId>tests</artifactId>
<version>3.3.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.seam.plugins</groupId>
Modified: trunk/seam/tests/pom.xml
===================================================================
--- trunk/seam/tests/pom.xml 2011-11-07 19:45:28 UTC (rev 36207)
+++ trunk/seam/tests/pom.xml 2011-11-07 19:59:53 UTC (rev 36208)
@@ -12,6 +12,7 @@
<packaging>pom</packaging>
<modules>
+ <module>org.jboss.tools.seam.base.test</module>
<module>org.jboss.tools.seam.core.test</module>
<module>org.jboss.tools.seam.pages.xml.test</module>
<module>org.jboss.tools.seam.ui.bot.test</module>
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r36207 - in trunk/vpe: tests and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-11-07 14:45:28 -0500 (Mon, 07 Nov 2011)
New Revision: 36207
Added:
trunk/vpe/tests/org.jboss.tools.vpe.base.test/
Removed:
trunk/vpe/plugins/org.jboss.tools.vpe.base.test/
Modified:
trunk/vpe/plugins/pom.xml
trunk/vpe/tests/org.jboss.tools.vpe.base.test/pom.xml
trunk/vpe/tests/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-10107 (Move *.base.test from plugins folder to tests folder)
moved vpe.base.test to tests folder
Modified: trunk/vpe/plugins/pom.xml
===================================================================
--- trunk/vpe/plugins/pom.xml 2011-11-07 19:30:17 UTC (rev 36206)
+++ trunk/vpe/plugins/pom.xml 2011-11-07 19:45:28 UTC (rev 36207)
@@ -13,7 +13,6 @@
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.vpe</module>
- <module>org.jboss.tools.vpe.base.test</module>
<module>org.jboss.tools.vpe.docbook</module>
<module>org.jboss.tools.vpe.html</module>
<module>org.jboss.tools.vpe.jsp</module>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.base.test/pom.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.base.test/pom.xml 2011-11-07 16:04:17 UTC (rev 36195)
+++ trunk/vpe/tests/org.jboss.tools.vpe.base.test/pom.xml 2011-11-07 19:45:28 UTC (rev 36207)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools.vpe</groupId>
- <artifactId>plugins</artifactId>
+ <artifactId>tests</artifactId>
<version>3.3.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.vpe.tests</groupId>
Modified: trunk/vpe/tests/pom.xml
===================================================================
--- trunk/vpe/tests/pom.xml 2011-11-07 19:30:17 UTC (rev 36206)
+++ trunk/vpe/tests/pom.xml 2011-11-07 19:45:28 UTC (rev 36207)
@@ -34,6 +34,7 @@
</property>
</activation>
<modules>
+ <module>org.jboss.tools.vpe.base.test</module>
<module>org.jboss.tools.vpe.docbook.test</module>
<module>org.jboss.tools.vpe.ui.test</module>
<module>org.jboss.tools.vpe.html.test</module>
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r36206 - in trunk/jst: tests and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-11-07 14:30:17 -0500 (Mon, 07 Nov 2011)
New Revision: 36206
Added:
trunk/jst/tests/org.jboss.tools.jst.jsp.base.test/
Removed:
trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/
Modified:
trunk/jst/plugins/pom.xml
trunk/jst/tests/org.jboss.tools.jst.jsp.base.test/pom.xml
trunk/jst/tests/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-10107 (Move *.base.test from plugins folder to tests folder)
moved jst.jsp.base.test to tests project
Modified: trunk/jst/plugins/pom.xml
===================================================================
--- trunk/jst/plugins/pom.xml 2011-11-07 19:17:36 UTC (rev 36205)
+++ trunk/jst/plugins/pom.xml 2011-11-07 19:30:17 UTC (rev 36206)
@@ -15,7 +15,6 @@
<module>org.jboss.tools.jst.css</module>
<module>org.jboss.tools.jst.firstrun</module>
<module>org.jboss.tools.jst.jsp</module>
- <module>org.jboss.tools.jst.jsp.base.test</module>
<module>org.jboss.tools.jst.text.ext</module>
<module>org.jboss.tools.jst.web</module>
<module>org.jboss.tools.jst.web.kb</module>
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.base.test/pom.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/pom.xml 2011-11-07 16:04:17 UTC (rev 36195)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.base.test/pom.xml 2011-11-07 19:30:17 UTC (rev 36206)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools.jst</groupId>
- <artifactId>plugins</artifactId>
+ <artifactId>tests</artifactId>
<version>3.3.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jst.plugins</groupId>
Modified: trunk/jst/tests/pom.xml
===================================================================
--- trunk/jst/tests/pom.xml 2011-11-07 19:17:36 UTC (rev 36205)
+++ trunk/jst/tests/pom.xml 2011-11-07 19:30:17 UTC (rev 36206)
@@ -12,6 +12,7 @@
</parent>
<packaging>pom</packaging>
<modules>
+ <module>org.jboss.tools.jst.jsp.base.test</module>
<module>org.jboss.tools.jst.css.test</module>
<module>org.jboss.tools.jst.jsp.test</module>
<module>org.jboss.tools.jst.text.ext.test</module>
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r36205 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-11-07 14:17:36 -0500 (Mon, 07 Nov 2011)
New Revision: 36205
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java
Log:
Quickfix and Wizard for fixing ambigious injection warning is confusing https://issues.jboss.org/browse/JBIDE-9940
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-11-07 19:17:04 UTC (rev 36204)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-11-07 19:17:36 UTC (rev 36205)
@@ -18,11 +18,8 @@
import java.util.HashSet;
import java.util.Iterator;
-import org.eclipse.core.internal.resources.Workspace;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.IJobChangeListener;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.draw2d.ColorConstants;
import org.eclipse.jdt.core.Flags;
@@ -74,7 +71,6 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.SearchPattern;
import org.jboss.tools.cdi.core.CDIConstants;
-import org.jboss.tools.cdi.core.CDICoreMessages;
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.CDIImages;
import org.jboss.tools.cdi.core.IBean;
@@ -449,14 +445,7 @@
PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress(){
public void run(IProgressMonitor monitor)
throws InvocationTargetException, InterruptedException {
-// Job autoBuildJob = null;
-// Job[] jobs = Job.getJobManager().find(ResourcesPlugin.FAMILY_AUTO_BUILD);
-// for(Job j : jobs){
-// autoBuildJob = j;
-// }
-// if(autoBuildJob != null && autoBuildJob.getState() == Job.RUNNING){
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-// }
+ Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
}
});
}catch(InterruptedException ie){
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r36204 - in trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard: xpl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-11-07 14:17:04 -0500 (Mon, 07 Nov 2011)
New Revision: 36204
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AbstractModifyInjectionPointWizard.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java
Log:
Quickfix and Wizard for fixing ambigious injection warning is confusing https://issues.jboss.org/browse/JBIDE-9940
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AbstractModifyInjectionPointWizard.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AbstractModifyInjectionPointWizard.java 2011-11-07 19:10:33 UTC (rev 36203)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AbstractModifyInjectionPointWizard.java 2011-11-07 19:17:04 UTC (rev 36204)
@@ -13,8 +13,8 @@
import java.util.List;
import org.eclipse.ltk.core.refactoring.participants.ProcessorBasedRefactoring;
+import org.eclipse.ltk.internal.ui.refactoring.RefactoringWizardDialog;
import org.eclipse.ltk.ui.refactoring.RefactoringWizard;
-import org.eclipse.ltk.ui.refactoring.RefactoringWizardOpenOperation;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.cdi.core.IBean;
@@ -28,12 +28,8 @@
public boolean showWizard() {
final IWorkbenchWindow win = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- RefactoringWizardOpenOperation op = new RefactoringWizardOpenOperation(this);
- try {
- op.run(win.getShell(), getWindowTitle());
- } catch (final InterruptedException irex) {
- return false;
- }
+ RefactoringWizardDialog dialog = new RefactoringWizardDialog(win.getShell(),this);
+ dialog.open();
return true;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-11-07 19:10:33 UTC (rev 36203)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-11-07 19:17:04 UTC (rev 36204)
@@ -449,14 +449,14 @@
PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress(){
public void run(IProgressMonitor monitor)
throws InvocationTargetException, InterruptedException {
- Job autoBuildJob = null;
- Job[] jobs = Job.getJobManager().find(ResourcesPlugin.FAMILY_AUTO_BUILD);
- for(Job j : jobs){
- autoBuildJob = j;
- }
- if(autoBuildJob != null && autoBuildJob.getState() == Job.RUNNING){
+// Job autoBuildJob = null;
+// Job[] jobs = Job.getJobManager().find(ResourcesPlugin.FAMILY_AUTO_BUILD);
+// for(Job j : jobs){
+// autoBuildJob = j;
+// }
+// if(autoBuildJob != null && autoBuildJob.getState() == Job.RUNNING){
Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
- }
+// }
}
});
}catch(InterruptedException ie){
13 years, 1 month
- 1
- 0