JBoss Tools SVN: r42711 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2012-07-25 09:26:35 -0400 (Wed, 25 Jul 2012)
New Revision: 42711
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/JPAPostInstallFasetListener.java
Log:
https://issues.jboss.org/browse/JBIDE-6556
Export connection properties of selected ConnectionProfile to persistent.xml
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/JPAPostInstallFasetListener.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/JPAPostInstallFasetListener.java 2012-07-25 12:03:38 UTC (rev 42710)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/JPAPostInstallFasetListener.java 2012-07-25 13:26:35 UTC (rev 42711)
@@ -13,12 +13,15 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Map.Entry;
+import java.util.Properties;
import java.util.regex.Pattern;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Path;
+import org.eclipse.datatools.connectivity.ProfileManager;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationType;
@@ -28,10 +31,17 @@
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
import org.eclipse.jpt.jpa.core.JpaFacet;
import org.eclipse.jpt.jpa.core.JptJpaCorePlugin;
+import org.eclipse.jpt.jpa.core.internal.resource.persistence.PersistenceXmlResourceProvider;
+import org.eclipse.jpt.jpa.core.resource.persistence.PersistenceFactory;
+import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistence;
+import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistenceUnit;
+import org.eclipse.jpt.jpa.core.resource.persistence.XmlProperty;
+import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEvent;
import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEvent.Type;
import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectListener;
import org.eclipse.wst.common.project.facet.core.events.IProjectFacetActionEvent;
+import org.hibernate.console.ConnectionProfileUtil;
import org.hibernate.console.preferences.ConsoleConfigurationPreferences.ConfigurationMode;
import org.hibernate.eclipse.console.utils.LaunchHelper;
import org.hibernate.eclipse.console.utils.ProjectUtils;
@@ -51,12 +61,46 @@
&& (HibernateJpaPlatform.HIBERNATE_PLATFORM_ID.equals(JptJpaCorePlugin.getJpaPlatformId(project))
|| HibernateJpaPlatform.HIBERNATE2_0_PLATFORM_ID.equals(JptJpaCorePlugin.getJpaPlatformId(project)))){
if (checkPreConditions(project)){
+ exportConnectionProfilePropertiesToPersistenceXml(project);
buildConsoleConfiguration(project);
}
}
}
}
+ private void exportConnectionProfilePropertiesToPersistenceXml(IProject project) {
+ PersistenceXmlResourceProvider defaultXmlResourceProvider = PersistenceXmlResourceProvider.getDefaultXmlResourceProvider(project);
+ final JpaXmlResource resource = defaultXmlResourceProvider.getXmlResource();
+ Properties propsToAdd = getConnectionProperties(project);
+ if (propsToAdd.isEmpty() || resource == null) return;
+
+ XmlPersistence persistence = (XmlPersistence) resource.getRootObject();
+ XmlPersistenceUnit persistenceUnit;
+
+ if (persistence.getPersistenceUnits().size() > 0) {
+ persistenceUnit = persistence.getPersistenceUnits().get(0);
+ if (persistenceUnit.getProperties() == null) {
+ persistenceUnit.setProperties(PersistenceFactory.eINSTANCE.createXmlProperties());
+ for (Entry<Object, Object> entry : propsToAdd.entrySet()) {
+ XmlProperty prop = PersistenceFactory.eINSTANCE.createXmlProperty();
+ prop.setName((String)entry.getKey());
+ prop.setValue((String)entry.getValue());
+ persistenceUnit.getProperties().getProperties().add(prop);
+ }
+ }
+ }
+ resource.save();
+ }
+
+ public Properties getConnectionProperties(IProject project){
+ String cpName = JptJpaCorePlugin.getConnectionProfileName(project);
+ if (cpName != null){
+ return ConnectionProfileUtil.getHibernateConnectionProperties(
+ ProfileManager.getInstance().getProfileByName(cpName));
+ }
+ return new Properties();
+ }
+
/**
*
* @param project
11 years, 10 months
JBoss Tools SVN: r42710 - trunk/tests/plugins/org.jboss.tools.tests.installation.
by jbosstools-commits＠lists.jboss.org
Author: ppalaga
Date: 2012-07-25 08:03:38 -0400 (Wed, 25 Jul 2012)
New Revision: 42710
Modified:
trunk/tests/plugins/org.jboss.tools.tests.installation/
Log:
org.jboss.tools.tests.installation/bin added to svn:ignore.
Property changes on: trunk/tests/plugins/org.jboss.tools.tests.installation
___________________________________________________________________
Added: svn:ignore
+ bin
11 years, 10 months
JBoss Tools SVN: r42709 - trunk/tests/tests/org.jboss.tools.tests.test.
by jbosstools-commits＠lists.jboss.org
Author: ppalaga
Date: 2012-07-25 07:59:43 -0400 (Wed, 25 Jul 2012)
New Revision: 42709
Modified:
trunk/tests/tests/org.jboss.tools.tests.test/
Log:
org.jboss.tools.tests.test/bin added to svn:ignore.
Property changes on: trunk/tests/tests/org.jboss.tools.tests.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
bin
11 years, 10 months
JBoss Tools SVN: r42708 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: ppalaga
Date: 2012-07-25 07:41:32 -0400 (Wed, 25 Jul 2012)
New Revision: 42708
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/.classpath
Log:
Removed an unnecessary reference to local jar /jboss/local/hamcrest/hamcrest-all-1.3.0RC2.jar
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/.classpath
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/.classpath 2012-07-25 11:34:10 UTC (rev 42707)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/.classpath 2012-07-25 11:41:32 UTC (rev 42708)
@@ -4,7 +4,6 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="resources"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.jboss.tools.ui.bot.ext"/>
- <classpathentry kind="lib" path="/jboss/local/hamcrest/hamcrest-all-1.3.0RC2.jar"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
11 years, 10 months
JBoss Tools SVN: r42706 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-07-25 05:55:52 -0400 (Wed, 25 Jul 2012)
New Revision: 42706
Modified:
trunk/build/target-platform/jbds.target
Log:
JBIDE-11689: try includeSource="true"
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2012-07-25 09:35:59 UTC (rev 42705)
+++ trunk/build/target-platform/jbds.target 2012-07-25 09:55:52 UTC (rev 42706)
@@ -7,7 +7,7 @@
:%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit id="\1.feature.group" version="\2"\/>/g
-->
<locations>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<!-- 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/juno/SR0/"/>
11 years, 10 months
JBoss Tools SVN: r42705 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2012-07-25 05:35:59 -0400 (Wed, 25 Jul 2012)
New Revision: 42705
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java
Log:
https://issues.jboss.org/browse/JBIDE-8631 - IVpePreferencesPage was updated.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java 2012-07-25 09:35:31 UTC (rev 42704)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java 2012-07-25 09:35:59 UTC (rev 42705)
@@ -17,6 +17,8 @@
static final String SHOW_SELECTION_TAG_BAR = "Show Selection Tag Bar"; //$NON-NLS-1$
static final String SHOW_TEXT_FORMATTING = "Show Text Formatting bar"; //$NON-NLS-1$
static final String SHOW_RESOURCE_BUNDLES_USAGE_AS_EL = "Show Resource Bundles Usage as EL Expressions"; //$NON-NLS-1$
+ static final String SELECTION_VISIBLE_BORDER_COLOR = "Selection border color for visible element"; //$NON-NLS-1$
+ static final String SELECTION_HIDDEN_BORDER_COLOR = "Selection border color for hidden element"; //$NON-NLS-1$
static final String ASK_TAG_ATTRIBUTES_ON_TAG_INSERT = "Ask for tag attributes during tag insert"; //$NON-NLS-1$
static final String INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE = "Inform when a project might not be configured properly for Visual Page Editor"; //$NON-NLS-1$
static final String DEFAULT_VPE_TAB = "Default VPE Tab"; //$NON-NLS-1$
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java 2012-07-25 09:35:31 UTC (rev 42704)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java 2012-07-25 09:35:59 UTC (rev 42705)
@@ -14,6 +14,8 @@
import org.eclipse.core.runtime.preferences.DefaultScope;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.IScopeContext;
+import org.eclipse.jface.resource.StringConverter;
+import org.eclipse.swt.graphics.RGB;
import org.jboss.tools.jst.jsp.JspEditorPlugin;
public class VpePreferencesInitializer extends AbstractPreferenceInitializer {
@@ -27,6 +29,10 @@
defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_SELECTION_TAG_BAR, true);
defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_TEXT_FORMATTING, true);
defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL, false);
+ defaultPreferences.put(IVpePreferencesPage.SELECTION_VISIBLE_BORDER_COLOR,
+ StringConverter.asString(new RGB(0, 0, 255)));
+ defaultPreferences.put(IVpePreferencesPage.SELECTION_HIDDEN_BORDER_COLOR,
+ StringConverter.asString(new RGB(255, 0, 0)));
defaultPreferences.putBoolean(IVpePreferencesPage.ASK_TAG_ATTRIBUTES_ON_TAG_INSERT, true);
defaultPreferences.putBoolean(IVpePreferencesPage.INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE, true);
defaultPreferences.put(IVpePreferencesPage.DEFAULT_VPE_TAB, IVpePreferencesPage.DEFAULT_VPE_TAB_VISUAL_SOURCE_VALUE);
11 years, 10 months
JBoss Tools SVN: r42704 - in branches/jbosstools-3.3.x/openshift/plugins: org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-07-25 05:35:31 -0400 (Wed, 25 Jul 2012)
New Revision: 42704
Modified:
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/UserPropertySource.java
Log:
UI freeze to maintenance JBIDE-10997
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF 2012-07-25 09:35:02 UTC (rev 42703)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF 2012-07-25 09:35:31 UTC (rev 42704)
@@ -5,10 +5,10 @@
Bundle-Version: 2.3.1.qualifier
Bundle-Activator: org.jboss.tools.openshift.egit.core.internal.EGitCoreActivator
Require-Bundle: org.jboss.ide.eclipse.as.core;bundle-version="2.3.0",
- org.eclipse.jgit;bundle-version="1.2.0",
- org.eclipse.egit;bundle-version="1.2.0",
+ org.eclipse.jgit;bundle-version="1.1.0",
+ org.eclipse.egit;bundle-version="1.1.0",
com.jcraft.jsch;bundle-version="0.1.41",
- org.eclipse.egit.core;bundle-version="1.2.0",
+ org.eclipse.egit.core;bundle-version="1.1.0",
org.eclipse.team.core;bundle-version="3.6.0",
org.eclipse.wst.server.core;bundle-version="1.1.302",
org.eclipse.core.resources;bundle-version="3.7.100",
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java 2012-07-25 09:35:02 UTC (rev 42703)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java 2012-07-25 09:35:31 UTC (rev 42704)
@@ -38,6 +38,7 @@
private String username;
private String password;
private IUser delegate;
+ private boolean isDomainLoaded = false;
private boolean rememberPassword;
private boolean connected;
private boolean alreadyPromptedForPassword;
@@ -233,11 +234,17 @@
public IDomain getDefaultDomain() throws OpenShiftException {
if(checkForPassword()) {
- return delegate.getDefaultDomain();
+ IDomain d = delegate.getDefaultDomain();
+ isDomainLoaded = true;
+ return d;
}
return null;
}
-
+
+ public boolean isDomainLoaded() throws OpenShiftException {
+ return isDomainLoaded;
+ }
+
public List<IEmbeddableCartridge> getEmbeddableCartridges()
throws OpenShiftException {
if(checkForPassword()) {
@@ -275,6 +282,7 @@
}
public void refresh() throws OpenShiftException {
+ isDomainLoaded = false;
if(checkForPassword()) {
delegate.refresh();
}
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/UserPropertySource.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/UserPropertySource.java 2012-07-25 09:35:02 UTC (rev 42703)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/UserPropertySource.java 2012-07-25 09:35:31 UTC (rev 42704)
@@ -10,6 +10,13 @@
******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.viewer.property;
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertySource;
import org.eclipse.ui.views.properties.PropertyDescriptor;
@@ -50,8 +57,10 @@
if(!user.isConnected() && !user.canPromptForPassword()) {
return OpenShiftExpressUIMessages.USER_NOT_CONNECTED_LABEL;
}
- if(!user.isConnected() && user.canPromptForPassword()) {
- user.checkForPassword();
+
+ boolean requiresConnect = !user.isConnected() && user.canPromptForPassword();
+ if( requiresConnect || !user.isDomainLoaded()) {
+ loadRemoteDetails();
}
if (id.equals(PROPERTY_USERNAME)) {
@@ -66,6 +75,33 @@
return null;
}
+ private void loadRemoteDetails() throws OpenShiftException {
+ IRunnableWithProgress longRunning = new IRunnableWithProgress() {
+ public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+ monitor.beginTask("Checking Remote Details", 200);
+ try {
+ if( !user.isConnected() && user.canPromptForPassword())
+ user.checkForPassword();
+ monitor.worked(100);
+ if( user.isConnected())
+ user.getDefaultDomain();
+ monitor.worked(100);
+ } catch(OpenShiftException ose) {
+ throw new InvocationTargetException(ose);
+ } finally {
+ monitor.done();
+ }
+ }
+ };
+ try {
+ PlatformUI.getWorkbench().getProgressService().busyCursorWhile(longRunning);
+ } catch( InvocationTargetException ite ) {
+ Throwable t = ite.getCause();
+ throw (OpenShiftException)t;
+ } catch( InterruptedException ie ) {
+ }
+ }
+
@Override
public void resetPropertyValue(Object id) {
// TODO Auto-generated method stub
11 years, 10 months
JBoss Tools SVN: r42703 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal: ui/viewer/property and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-07-25 05:35:02 -0400 (Wed, 25 Jul 2012)
New Revision: 42703
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/UserPropertySource.java
Log:
UI freeze to trunk JBIDE-10997
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java 2012-07-25 09:32:55 UTC (rev 42702)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java 2012-07-25 09:35:02 UTC (rev 42703)
@@ -38,6 +38,7 @@
private String username;
private String password;
private IUser delegate;
+ private boolean isDomainLoaded = false;
private boolean rememberPassword;
private boolean connected;
private boolean alreadyPromptedForPassword;
@@ -233,11 +234,17 @@
public IDomain getDefaultDomain() throws OpenShiftException {
if(checkForPassword()) {
- return delegate.getDefaultDomain();
+ IDomain d = delegate.getDefaultDomain();
+ isDomainLoaded = true;
+ return d;
}
return null;
}
-
+
+ public boolean isDomainLoaded() throws OpenShiftException {
+ return isDomainLoaded;
+ }
+
public List<IEmbeddableCartridge> getEmbeddableCartridges()
throws OpenShiftException {
if(checkForPassword()) {
@@ -275,6 +282,7 @@
}
public void refresh() throws OpenShiftException {
+ isDomainLoaded = false;
if(checkForPassword()) {
delegate.refresh();
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/UserPropertySource.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/UserPropertySource.java 2012-07-25 09:32:55 UTC (rev 42702)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/UserPropertySource.java 2012-07-25 09:35:02 UTC (rev 42703)
@@ -10,6 +10,13 @@
******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.viewer.property;
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertySource;
import org.eclipse.ui.views.properties.PropertyDescriptor;
@@ -50,8 +57,10 @@
if(!user.isConnected() && !user.canPromptForPassword()) {
return OpenShiftExpressUIMessages.USER_NOT_CONNECTED_LABEL;
}
- if(!user.isConnected() && user.canPromptForPassword()) {
- user.checkForPassword();
+
+ boolean requiresConnect = !user.isConnected() && user.canPromptForPassword();
+ if( requiresConnect || !user.isDomainLoaded()) {
+ loadRemoteDetails();
}
if (id.equals(PROPERTY_USERNAME)) {
@@ -66,6 +75,33 @@
return null;
}
+ private void loadRemoteDetails() throws OpenShiftException {
+ IRunnableWithProgress longRunning = new IRunnableWithProgress() {
+ public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+ monitor.beginTask("Checking Remote Details", 200);
+ try {
+ if( !user.isConnected() && user.canPromptForPassword())
+ user.checkForPassword();
+ monitor.worked(100);
+ if( user.isConnected())
+ user.getDefaultDomain();
+ monitor.worked(100);
+ } catch(OpenShiftException ose) {
+ throw new InvocationTargetException(ose);
+ } finally {
+ monitor.done();
+ }
+ }
+ };
+ try {
+ PlatformUI.getWorkbench().getProgressService().busyCursorWhile(longRunning);
+ } catch( InvocationTargetException ite ) {
+ Throwable t = ite.getCause();
+ throw (OpenShiftException)t;
+ } catch( InterruptedException ie ) {
+ }
+ }
+
@Override
public void resetPropertyValue(Object id) {
// TODO Auto-generated method stub
11 years, 10 months
JBoss Tools SVN: r42702 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-07-25 05:32:55 -0400 (Wed, 25 Jul 2012)
New Revision: 42702
Added:
trunk/build/target-platform/local.target
Modified:
trunk/build/target-platform/multiple.target
trunk/build/target-platform/unified.target
Log:
JBIDE-11689: try includeSource="true"
Added: trunk/build/target-platform/local.target
===================================================================
--- trunk/build/target-platform/local.target (rev 0)
+++ trunk/build/target-platform/local.target 2012-07-25 09:32:55 UTC (rev 42702)
@@ -0,0 +1,315 @@
+<?xml version="1.0" encoding="UTF-8"?><?pde version="3.6"?>
+<target includeMode="feature" name="e42-wtp34">
+ <!-- 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:
+ :%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit id="\1.feature.group" version="\2"\/>/g
+ -->
+ <!-- for trunk use _composite_/core/trunk; for 3.4_stable_branch, use _composite_/core/3.4.juno -->
+ <locations>
+ <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <!-- don't forget to increment these files when moving up a version:
+ build.xml, *.target*, publish.sh, target2p2mirror.xml -->
+ <repository location="file:///home/mistria/workspaceJBossTools/jboss-tools-eclipse-repository/build/target-platform/REPO"/>
+
+ <!-- m2e, m2e-wtp + deps -->
+ <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.100.20110804-1717"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.200.20111228-1245"/>
+ <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/>
+ <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201109290002"/>
+ <unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
+ <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.201112281337"/>
+ <unit id="org.jboss.netty" version="3.2.4.Final-201112281337"/>
+ <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"/>
+
+ <!-- Orbit bundles -->
+ <unit id="javax.wsdl" version="1.5.1.v201012040544"/>
+ <unit id="org.jdom" version="1.0.0.v201005080400"/>
+ <unit id="org.apache.commons.lang" version="2.1.0.v201005080500"/>
+ <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"/>
+ <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+ <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.integration" version="1.1.0.v20090501071000"/>
+
+ <!-- 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"/>
+ <unit id="org.apache.lucene.misc" version="2.9.1.v20100421-0704"/>
+ <unit id="org.apache.lucene.queries" version="2.9.1.v20100421-0704"/>
+ <unit id="org.apache.lucene.snowball" version="2.9.1.v20100421-0704"/>
+ <unit id="org.apache.lucene.spellchecker" version="2.9.1.v20100421-0704"/>
+
+ <!-- EMF, XSD -->
+ <unit id="org.eclipse.emf.workspace.feature.group" version="1.5.1.v20110823-1800-37708s734D3C7D3CCC1"/>
+ <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.emf.feature.group" version="2.7.2.v20120130-0943"/>
+ <unit id="org.eclipse.emf.ecore.feature.group" version="2.7.1.v20120127-1122"/>
+ <unit id="org.eclipse.emf.codegen.feature.group" version="2.7.0.v20120130-0943"/>
+ <unit id="org.eclipse.emf.common.feature.group" version="2.7.0.v20120127-1122"/>
+ <unit id="org.eclipse.emf.databinding.feature.group" version="1.2.0.v20120130-0943"/>
+ <unit id="org.eclipse.emf.codegen.ecore.feature.group" version="2.7.0.v20120130-0943"/>
+ <unit id="org.eclipse.emf.ecore.edit.feature.group" version="2.7.1.v20120130-0943"/>
+ <unit id="org.eclipse.emf.ecore.editor.feature.group" version="2.7.0.v20120130-0943"/>
+ <unit id="org.eclipse.emf.ecore.feature.group" version="2.7.1.v20120127-1122"/>
+ <unit id="org.eclipse.emf.edit.feature.group" version="2.7.2.v20120130-0943"/>
+ <unit id="org.eclipse.xsd.edit.feature.group" version="2.7.0.v20120130-0943"/>
+ <unit id="org.eclipse.xsd.feature.group" version="2.7.1.v20120130-0943"/>
+
+ <!-- GEF, Draw2D, Graphiti, Zest -->
+ <unit id="org.eclipse.graphiti.feature.feature.group" version="0.8.2.v20120215-0845"/>
+ <unit id="org.eclipse.draw2d.feature.group" version="3.7.2.v20110927-2020-4617w3122212803131"/>
+ <unit id="org.eclipse.gef.feature.group" version="3.7.2.v20110927-2020-777D381B4Bz0755B465D34242"/>
+ <unit id="org.eclipse.zest.feature.group" version="1.3.0.v20110425-2050-67A18yF6F18CBD5A7N54242"/>
+
+ <!-- UML2 -->
+ <unit id="org.eclipse.uml2.feature.group" version="3.2.1.v201109082252"/>
+
+ <!-- Platform: CVS, JDT, RCP, PDE, Equinox, Help -->
+ <unit id="com.ibm.icu.base" version="4.4.2.v20110831"/>
+ <unit id="org.eclipse.platform.feature.group" version="3.7.2.v20120207-1839-9gF7UHPDFxGjd-PqDr2jX_4yKaumkoHTz04_q-q"/>
+ <unit id="org.eclipse.platform.ide" version="3.7.2.M20120208-0800"/>
+ <unit id="org.eclipse.platform.sdk" version="3.7.2.M20120208-0800"/>
+ <unit id="org.eclipse.sdk.feature.group" version="3.7.2.r37x_v20111213-7Q7xALDPb32vCjY6UACVPdFTz-icPtJkUadz0lMmk4z-8"/>
+ <unit id="org.eclipse.sdk.ide" version="3.7.2.M20120208-0800"/>
+ <unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110520-0800-7B78FHl9VF7BD7KBM4GP9C"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.7.2.v20120120-1414-7z8gFcuFMP7BW5XTz0jLTnz0l9B1"/>
+ <unit id="org.eclipse.equinox.server.core.feature.group" version="1.1.1.R37x_v20110907-7K7TFB_ETaXFZ3oNa8CeJQ02722"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="3.5.1.v20111216-1653-7P7NFUIFIbaUcU77s0KQWHw5HZTZ"/>
+ <unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.7.1.R37x_v20110909-7X7XGA5FOIm78Pif1n7BLB9"/>
+ <unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.7.1.v20110928-1809-7uF9LFpHFUqIcLhnJMmHQGXy3BJB"/>
+ <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.100.v20120524-0542-4-Bh9oB58A5N9L28PCQ"/>
+ <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.1.2.R37x_v20110815-1155-6-Bk8pYWZz0qUTX5I15GZWwbXkrl"/>
+ <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.7.1.R37x_v20110907-9N7sHDdGIUw3H-591a16Tcf5FePP"/>
+ <unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.7.1.R37x_v20110907-7u7PFvHFN5LiN7iUIYPvl4cz-WiW"/>
+ <unit id="org.eclipse.equinox.sdk.feature.group" version="3.7.1.R37x_v20110907-7M7W8i8eNV4WsRkue-4Vq4J6pCyW"/>
+ <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.v20110502-7I77CPBgJ9ECBQ9V8IAD"/>
+ <unit id="org.eclipse.equinox.server.p2.feature.group" version="1.1.1.R37x_v20110907-7z7UFW0FT-4HNfuTsrcmKrl02129"/>
+ <unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.100.v20110502-42DF9oB5865K5D"/>
+ <unit id="org.eclipse.rcp.feature.group" version="3.7.2.v20120120-1424-9DB5FmnFq5JCf1UA38R-kz0S0272"/>
+ <unit id="org.eclipse.pde.feature.group" version="3.7.2.v20120120-1420-7b7rFUOFEx2Xnqafnpz0E--0"/>
+ <unit id="org.eclipse.help.feature.group" version="1.3.0.v20110530-0844-7i7uFFmFFl8nvqbDpEqTvx"/>
+ <unit id="org.eclipse.update.core" version="3.2.500.v20110330"/>
+
+ <!-- DTP -->
+ <unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.10.0.v201201161512-7707DCcNBHJDWIYG_Ni"/>
+ <unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.10.0.v201201161512-7C7h90Et1axo7RlVkOfDNlAf45E"/>
+ <unit id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.10.0.v201201161512-7H7C7QCcNBHLCcJaFWRa"/>
+ <unit id="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group" version="1.10.0.v201201161512-4127w312312232267"/>
+ <unit id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.10.0.v201201161512-7B7C7LCcNBGTBfLREXcc"/>
+ <unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.10.0.v201201161512-7J9Q0BWxeMcYB5KWfz-eG7qiq-sX"/>
+ <unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.10.0.v201201161512-77798fBmKDQ2MoTTLwdv9ILX"/>
+ <unit id="org.eclipse.datatools.enablement.hsqldb.feature.feature.group" version="1.10.0.v201201161512-67E0AqGBM7KfNTHwKO9ILX"/>
+ <unit id="org.eclipse.datatools.enablement.ibm.feature.feature.group" version="1.10.0.v201201161512-7F47WFC7sRdqScnobkd4"/>
+ <unit id="org.eclipse.datatools.enablement.jdbc.feature.feature.group" version="1.10.0.v201201161512-4-29oB5885QBB8HKW"/>
+ <unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.10.0.v201201161512-2-07w312218332612"/>
+ <unit id="org.eclipse.datatools.enablement.msft.feature.feature.group" version="1.10.0.v201201161512-544AkF7AL7MDMAQ8O"/>
+ <unit id="org.eclipse.datatools.enablement.mysql.feature.feature.group" version="1.10.0.v201201161512-5477AkF7AK7_AMENEA"/>
+ <unit id="org.eclipse.datatools.enablement.oda.feature.feature.group" version="1.10.0.v201201161512-7A7T7CDZRDKHF_HnGjOX"/>
+ <unit id="org.eclipse.datatools.enablement.oda.designer.feature.feature.group" version="1.10.0.v201201161512-3368s7356485C59AB"/>
+ <unit id="org.eclipse.datatools.enablement.oracle.feature.feature.group" version="1.10.0.v201201161512-548fAkF7AL7RBJANAI"/>
+ <unit id="org.eclipse.datatools.enablement.postgresql.feature.feature.group" version="1.10.0.v201201161512-553AkF7AK8PCRBQBP"/>
+ <unit id="org.eclipse.datatools.enablement.sap.feature.feature.group" version="1.10.0.v201201161512-540AkF7AJ7YEJBU7S"/>
+ <unit id="org.eclipse.datatools.enablement.sybase.feature.feature.group" version="1.10.0.v201201161512-7E46F9NiNc1QBgyT6T6"/>
+ <unit id="org.eclipse.datatools.enablement.ingres.feature.feature.group" version="1.10.0.v201201161512-540AkF78Z7UCRAQDB"/>
+ <unit id="org.eclipse.datatools.enablement.sqlite.feature.feature.group" version="1.10.0.v201201161512-542AkF7AJ7SAKAPBF"/>
+ <unit id="org.eclipse.datatools.sqldevtools.feature.feature.group" version="1.10.0.v201201161512-7N8B7CFDsn4hwBXz-0AGu5i6V36H"/>
+ <unit id="org.eclipse.datatools.sqldevtools.results.feature.feature.group" version="1.10.0.v201201161512-57B78AkF7BD7QFE9VEG"/>
+ <unit id="org.eclipse.datatools.sqldevtools.ddlgen.feature.feature.group" version="1.10.0.v201201161512-7A-78F7RZHQSIqWjN1Zr"/>
+ <unit id="org.eclipse.datatools.sqldevtools.ddl.feature.feature.group" version="1.10.0.v201201161512-279-78B089G8S_IRTJrXkO2_s"/>
+ <unit id="org.eclipse.datatools.sqldevtools.data.feature.feature.group" version="1.10.0.v201201161512-644BgJ9ECCLFTAfMO"/>
+ <unit id="org.eclipse.datatools.sqldevtools.parsers.feature.feature.group" version="1.10.0.v201201161512-623BgJ9EE9ZJRDZLA"/>
+ <unit id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.feature.group" version="1.10.0.v201201161512-79-78EVVFNOGnTeK-SY"/>
+ <unit id="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature.feature.group" version="1.10.0.v201201161512-4208375LG5BJ93413"/>
+ <unit id="org.eclipse.datatools.intro.feature.group" version="1.10.0.v201201161512-26-7w312116392911"/>
+ <unit id="org.eclipse.datatools.doc.user.feature.group" version="1.10.0.v201201161512-47C08w95FFAK89FHEC7"/>
+ <unit id="org.eclipse.datatools.common.doc.user.feature.group" version="1.10.0.v201201161512-26-311A16321A3557"/>
+ <unit id="org.eclipse.datatools.connectivity.doc.user.feature.group" version="1.10.0.v201201161512-37D-7733L3D753L7BBF"/>
+ <unit id="org.eclipse.datatools.sqltools.doc.user.feature.group" version="1.10.0.v201201161512-37D-7733L3D753L7BBF"/>
+
+ <!-- RSE, TM -->
+ <unit id="org.eclipse.rse.feature.group" version="3.3.2.R33x_v201110030150-7L7CFGH8wqio8s-qYtkPgn8qWd4T"/>
+ <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.1.R33x_v201109141647-771Bh9uD7HbBF3u7DNO3293A3752"/>
+ <unit id="org.eclipse.rse.telnet.feature.group" version="2.2.200.v201106011538-775F8NAkF7BB7B9NEIPP"/>
+ <unit id="org.eclipse.rse.ftp.feature.group" version="3.0.301.R33x_v201109141647-782F8O9KC92gz097E9EKF23225"/>
+ <unit id="org.eclipse.rse.local.feature.group" version="2.1.300.v201103142315-7B4FKsBgJ9EE9ICQIFYT"/>
+ <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.1.R33x_v201106281309-4007S44yaw312218292641"/>
+ <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.serial.feature.group" version="2.1.0.v201103142315-30-7w312212153266"/>
+ <unit id="org.eclipse.tm.terminal.feature.group" version="3.1.1.R33x_v201106281309-4007S44yaw312218292641"/>
+ <unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.1.0.v201103142315-30-7w312212153266"/>
+
+ <!-- WTP -->
+ <unit id="org.eclipse.jst.jee" version="1.0.402.v201202021530"/>
+ <unit id="org.eclipse.wst.common.frameworks" version="1.2.102.v201201190400"/>
+ <unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.201.v201201101553"/>
+ <unit id="org.eclipse.jst.jee.web" version="1.0.301.v201007070907"/>
+ <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.3.0.v201102200555-377DF8s73543E5I5768"/>
+ <unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.200.v201103022333-78-FF0DZRDKDDePSKwHj"/>
+ <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.0.100.v201105171845-7H77DRFAKlZgjHCaHg65uE6I6I"/>
+ <unit id="org.eclipse.jpt.common.feature.feature.group" version="1.0.2.v201111103010-6-3AkF7BC9EBID797"/>
+ <unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.0.1.v201108080010-3-08s73553F3G3343"/>
+ <unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.0.2.v201110193010-7S7B7HFC7sRdlV6fmbQaRBF5"/>
+ <unit id="org.eclipse.persistence.jpa.feature.group" version="2.3.2.v20111125-r10461"/>
+ <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.3.2.v201201121600-377DH8s735735535DD9"/>
+ <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.3.2.v201111030500-7b7II1YFSK2WIuPRDEnExPV-RvTn"/>
+ <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.3.2.v201111030500-7O7IFj6EMjB7yO1Xs_G1kMtQeOye6HTXFWve95_R"/>
+ <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.3.2.v201112072049-7H7EFZ7DxumTmce4khcSkIiqoD8eDMKlT8Oz011P"/>
+ <unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.3.1.v201109012200-7T7YFRTFIqUoIrvbEtBlSIJXGZNg"/>
+ <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.3.2.v201201112313-7G78FZvFC7sRekSz-g-nAlz"/>
+ <unit id="org.eclipse.jsf.feature.feature.group" version="3.3.1.v201109030441-7E7IDUF9JgLWUM6WBSgXp"/>
+ <unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.101.v201201031445-5-BiAkF7BD7E8NBSHa"/>
+ <unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.1.0.v201105171845-7E78BsF8NcJSWKvN1Rjcv"/>
+ <unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.3.2.v201111030500-52FPfAkF7BA8L8K7S98"/>
+ <unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.3.100.v20110810_1722-777HFL5CcNBDmBfJVFHJD6"/>
+ <unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.100.v20110303-208Z7w31211419"/>
+ <unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.3.0.v201102200555-31FD58s7354495L"/>
+ <unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.3.0.v201102200555-7A6FHr9xFcAVCFLZBBJLIR43A"/>
+ <unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.3.2.v201112072049-7F7AFO7C25ToiIbpoiuW12GT78Mciy6W7iwuxaco"/>
+ <unit id="org.eclipse.jsf.feature.source.feature.group" version="3.3.1.v201109030441-7E7IDUF9JgLWUM6WBSgXp"/>
+ <unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="2.0.0.v201103310043-7A7J-CcNBGOCUIWFYMf"/>
+ <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.6.v201201181342-46AB9oB5885D6R5D86"/>
+ <unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.301.v201102200555-2407w312123151655"/>
+ <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.3.2.v201111030500-7B7DFO9F7RZHOhIjR6Mz-NJ"/>
+ <unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.3.2.v201111030500-7C79FVsEdhO_sfog9oNekiJkS7Nz00OK"/>
+ <unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.100.v20110303-51EoAkF77g8HBSc"/>
+ <unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.3.100.v20110810_1722-33Et8s73563B6Ha3113"/>
+ <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.100.v20110810_1722-7B7AFGHAtMcLXxbGc-IjRefCA84"/>
+ <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.3.2.v201111030500-7E7EFMcAJvn8cwW45JTLsz-TCw6tofoJ"/>
+ <unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.3.2.v201112142348-7I7AFg1EtEoVFjz-98J1iuhhBz-uuWclgZtNHnEN"/>
+ <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.3.2.v201112072049-7C7OFeMF7RZHQOIsNANyRc"/>
+
+ <!-- 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.R37x_v20111201-1600"/>
+ <unit id="org.eclipse.jsch.core" version="1.1.300.I20110514-0800"/>
+ <unit id="com.jcraft.jsch" version="0.1.44.v201101211721"/>
+ <unit id="org.eclipse.jgit.feature.group" version="1.3.0.201202151440-r"/>
+ <unit id="org.eclipse.egit.feature.group" version="1.3.0.201202151440-r"/>
+ <unit id="org.eclipse.egit.mylyn.feature.group" version="1.3.0.201202151440-r"/>
+ <unit id="org.eclipse.mylyn.github.feature.feature.group" version="1.3.0.201202151440-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.v20110608-1400"/>
+ <unit id="org.eclipse.mylyn.discovery.ui" version="3.6.2.v20111116-0100"/>
+ <unit id="org.eclipse.mylyn.discovery.core" version="3.6.1.v20110817-0100"/>
+ <unit id="org.eclipse.mylyn.commons.ui" version="3.6.1.v20110720-0100"/>
+ <unit id="org.eclipse.mylyn.commons.net" version="3.6.0.v20110608-1400"/>
+ <unit id="org.eclipse.mylyn.commons.screenshots" version="3.6.0.v20110608-1400"/>
+
+ <!-- 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.5.v20120215-0100"/>
+ <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.6.5.v20120215-0100"/>
+ <unit id="org.eclipse.mylyn.commons.feature.group" version="3.6.5.v20120215-0100"/>
+ <unit id="org.eclipse.mylyn.commons.compatibility.feature.group" version="3.8.0.v20120612-0600"/>
+ <unit id="org.eclipse.mylyn.commons.identity.feature.group" version="1.0.0.v20120612-0600"/>
+ <unit id="org.eclipse.mylyn.commons.notifications.feature.group" version="1.0.0.v20120612-0600"/>
+ <unit id="org.eclipse.mylyn.commons.repositories.feature.group" version="1.0.0.v20120612-0600"/>
+ <unit id="org.eclipse.mylyn.commons.repositories.http.feature.group" version="1.0.0.v20120612-0600"/>
+ <unit id="org.eclipse.mylyn.context_feature.feature.group" version="3.6.5.v20120215-0100"/>
+ <unit id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="3.6.5.v20120215-0100"/>
+ <unit id="org.eclipse.mylyn.discovery.feature.group" version="3.8.0.v20120612-0600"/>
+ <unit id="org.eclipse.mylyn.java_feature.feature.group" version="3.6.5.v20120215-0100"/>
+ <unit id="org.eclipse.mylyn.monitor.feature.group" version="3.8.0.v20120612-0600"/>
+ <unit id="org.eclipse.mylyn.pde_feature.feature.group" version="3.6.5.v20120215-0100"/>
+ <unit id="org.eclipse.mylyn.team_feature.feature.group" version="3.6.5.v20120215-0100"/>
+ <unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="1.5.5.v20120215-0100"/>
+ <unit id="org.eclipse.mylyn.cvs.feature.group" version="0.8.5.v20120215-0100"/>
+ <unit id="org.eclipse.mylyn.git.feature.group" version="0.8.5.v20120215-0100"/>
+ <unit id="org.eclipse.mylyn.versions.feature.group" version="0.8.5.v20120215-0100"/>
+ <unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="3.8.0.v20120612-0600"/>
+ <unit id="org.eclipse.mylyn.tasks.ui" version="3.6.5.v20120215-0100"/>
+ <unit id="org.eclipse.mylyn.tasks.core" version="3.6.1.v20120201-0100"/>
+ <unit id="org.eclipse.mylyn.tasks.bugs" version="3.6.1.v20110825-0100"/>
+ <unit id="com.atlassian.connector.commons" version="4.0.0.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.bamboo.core" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.bamboo.ui" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.branding.ui" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.commons.core" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.commons.ui" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.core" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.crucible.core" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.crucible.ui" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.cvs.core" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.cvs.ui" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.directclickthrough.ui" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.fisheye.core" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.fisheye.ui" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.help" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.jira.core" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.jira.ui" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.monitor.core" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.monitor.ui" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.subclipse.core" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.subclipse.ui" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.ui" version="3.0.2.v20111010"/>
+ <unit id="com.thoughtworks.xstream" version="1.3.0.v20100826-1640"/>
+ <unit id="org.eclipse.ui" version="3.103.0.v20120521-2329"/>
+ <unit id="org.eclipse.core.runtime" version="3.7.0.v20110110"/>
+ <unit id="org.eclipse.core.resources" version="3.7.101.v20120125-1505"/>
+ <unit id="org.eclipse.ui.ide" version="3.7.0.v20110928-1505"/>
+ <unit id="org.eclipse.ui.workbench.texteditor" version="3.7.0.v20110928-1504"/>
+ <unit id="org.eclipse.jface.text" version="3.7.2.v20111213-1208"/>
+ <unit id="org.eclipse.osgi" version="3.7.2.v20120110-1415"/>
+ <unit id="org.eclipse.core.filesystem" version="1.3.100.v20110423-0524"/>
+ <unit id="org.eclipse.ui.forms" version="3.5.101.v20111011-1919"/>
+ <unit id="org.eclipse.ui.editors" version="3.7.0.v20110928-1504"/>
+ <unit id="org.eclipse.team.core" version="3.6.0.I20110525-0800"/>
+ <unit id="org.eclipse.team.ui" version="3.6.101.R37x_v20111109-0800"/>
+ <unit id="org.eclipse.jface" version="3.7.0.v20110928-1505"/>
+ <unit id="org.eclipse.compare" version="3.5.202.R37x_v20111109-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"/>
+ <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+ <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="2.5.0.v201103041518"/>
+ <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.5.20111003_1754-3676ac8-dev-e36"/>
+ <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
+ <unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.5.20111003_1754-3676ac8-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.5.20111003_1754-3676ac8-dev-e36"/>
+
+ <!-- BIRT -->
+ <unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="3.7.2.v20120213-777D386vH9DhL7e9QKLh0vkCyimU"/>
+ <unit id="org.eclipse.birt.feature.group" version="3.7.2.v20120213-BDF9E9bGTzuHh03p2c0AWvmC3Ltk"/>
+ <unit id="org.eclipse.birt.integration.wtp.feature.group" version="3.7.2.v20120214-1408-4617w3123132502519"/>
+ <unit id="org.eclipse.birt.chart.feature.group" version="3.7.2.v20120213-7r9e7PFQCnvKZ5oAdlXE5"/>
+ <unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="3.7.2.v20120214-1408-4617w3123132502519"/>
+
+ <!-- GWT/GPE dependencies (include only those which are EPL or other OSS licensed!) -->
+ <unit id="com.google.gdt.eclipse.suite.e37.feature.feature.group" version="2.5.1.v201201120043-rel-r37"/>
+ <unit id="com.google.gwt.eclipse.sdkbundle.e37.feature.feature.group" version="2.4.0.v201201120043-rel-r37"/>
+ </location>
+ </locations>
+ <includeBundles>
+ <feature id="org.mozilla.xulrunner.feature"/>
+ <feature id="org.mozilla.xpcom.feature"/>
+ </includeBundles>
+ <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+</target>
\ No newline at end of file
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-07-25 07:50:11 UTC (rev 42701)
+++ trunk/build/target-platform/multiple.target 2012-07-25 09:32:55 UTC (rev 42702)
@@ -7,7 +7,7 @@
:%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit id="\1.feature.group" version="\2"\/>/g
-->
<locations>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit" includeSource="true">
<!-- 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/juno/SR0/"/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2012-07-25 07:50:11 UTC (rev 42701)
+++ trunk/build/target-platform/unified.target 2012-07-25 09:32:55 UTC (rev 42702)
@@ -7,7 +7,7 @@
:%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit id="\1.feature.group" version="\2"\/>/g
-->
<locations>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<!-- don't forget to increment these files when moving up a version:
build.xml, *.target*, publish.sh, target2p2mirror.xml -->
<!-- for trunk use _composite_/core/trunk; for 3.4_stable_branch, use _composite_/core/3.4.juno -->
11 years, 10 months
JBoss Tools SVN: r42701 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-07-25 03:50:11 -0400 (Wed, 25 Jul 2012)
New Revision: 42701
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JavaUtils.java
Log:
missed commit /JBIDE-12229
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JavaUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JavaUtils.java 2012-07-25 05:28:29 UTC (rev 42700)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JavaUtils.java 2012-07-25 07:50:11 UTC (rev 42701)
@@ -41,8 +41,7 @@
private static File getLinuxServerLibFolder(String version, IVMInstall install) {
File serverFolder = null;
IPath locPath = new Path(install.getInstallLocation().getAbsolutePath());
- if( version.startsWith("1.7.")) //$NON-NLS-1$
- serverFolder = findServerFolder(locPath.append("jre").append("lib")); //$NON-NLS-1$ //$NON-NLS-2$
+ serverFolder = findServerFolder(locPath.append("jre").append("lib")); //$NON-NLS-1$ //$NON-NLS-2$
return serverFolder;
}
11 years, 10 months