JBoss Tools SVN: r41597 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal: ui/wizard and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: xcoulon
Date: 2012-05-31 17:25:25 -0400 (Thu, 31 May 2012)
New Revision: 41597
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/UserModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java
Log:
Fixed - JBIDE-12006
Users in the OpenShift Explorer view should be lazily loaded
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-05-31 21:19:30 UTC (rev 41596)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java 2012-05-31 21:25:25 UTC (rev 41597)
@@ -41,16 +41,16 @@
private boolean rememberPassword;
private boolean connected;
private boolean alreadyPromptedForPassword;
-
- public UserDelegate(String username, String password) {
+ private boolean passwordLoaded = false;
+
+ public UserDelegate(String username) {
this.username = username;
- this.password = password;
- this.rememberPassword = (password != null);
this.setConnected(false);
}
-
+
public UserDelegate(IUser user, boolean rememberPassword) {
setDelegate(user);
+ this.passwordLoaded = true;
this.rememberPassword = rememberPassword;
}
@@ -69,15 +69,30 @@
this.username = delegate.getRhlogin();
this.password = delegate.getPassword();
this.setConnected(true);
- }
+ }
public String getUsername() {
return username;
}
public String getPassword() {
+ if (!this.passwordLoaded) {
+ loadPassword();
+ }
return password;
}
-
+
+ /**
+ * Attempts to load the password from the secure storage, only at first
+ * time it is called.
+ */
+ private void loadPassword() {
+ if (!passwordLoaded) {
+ this.password = UserModel.getDefault().getPasswordFromSecureStorage(username);
+ this.rememberPassword = (password != null);
+ this.passwordLoaded = true;
+ }
+ }
+
public boolean isRememberPassword() {
return rememberPassword;
}
@@ -99,7 +114,10 @@
*/
public boolean checkForPassword() {
if(delegate == null) {
- if( username != null && password != null ) {
+ if(!passwordLoaded) {
+ loadPassword();
+ }
+ if(username != null && password != null) {
if( checkCurrentCredentials() )
return true;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java 2012-05-31 21:19:30 UTC (rev 41596)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java 2012-05-31 21:25:25 UTC (rev 41597)
@@ -149,8 +149,7 @@
OpenShiftUIActivator.PLUGIN_ID);
String[] users = pref.get();
for (int i = 0; i < users.length; i++) {
- String password = getPasswordFromSecureStorage(users[i]);
- addUser(new UserDelegate(users[i], password));
+ addUser(new UserDelegate(users[i]));
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java 2012-05-31 21:19:30 UTC (rev 41596)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java 2012-05-31 21:25:25 UTC (rev 41597)
@@ -74,7 +74,7 @@
return new PropertyChangeListener() {
@Override
public void propertyChange(PropertyChangeEvent evt) {
- if(!wizardModel.isNewProject() && isUseDefaultRepoPath()) {
+ if(isUseDefaultRepoPath()) {
final IProject project = wizardModel.getProject();
if(project != null && project.exists()) {
setRepositoryPath(project.getLocation().toOSString());
13 years, 4 months
JBoss Tools SVN: r41596 - branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2012-05-31 17:19:30 -0400 (Thu, 31 May 2012)
New Revision: 41596
Modified:
branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators/DefaultJBossCentralConfigurator.java
branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators/discovery.properties
Log:
JBIDE-11683 - Enable defining runtime download using external xml file
Modified: branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators/DefaultJBossCentralConfigurator.java
===================================================================
--- branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators/DefaultJBossCentralConfigurator.java 2012-05-31 21:11:48 UTC (rev 41595)
+++ branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators/DefaultJBossCentralConfigurator.java 2012-05-31 21:19:30 UTC (rev 41596)
@@ -46,7 +46,13 @@
// see pom.xml for actual value -- this is passed it at build-time via Maven
private static final String JBOSS_DIRECTORY_URL;
+
+ private static final String JBOSS_RUNTIME_URL_DEFAULT = "http://download.jboss.org/examples/download_runtimes.xml"; //$NON-NLS-1$
+ private static final String JBOSS_RUNTIME_DIRECTORY = "jboss.runtime.directory.url"; //$NON-NLS-1$
+
+ private static final String JBOSS_RUNTIME_URL;
+
static {
ResourceBundle rb = ResourceBundle.getBundle("org.jboss.tools.project.examples.configurators.discovery"); //$NON-NLS-1$
String url = rb.getString("discovery.url").trim(); //$NON-NLS-1$
@@ -56,6 +62,13 @@
} else {
JBOSS_DIRECTORY_URL = url;
}
+ url = rb.getString("runtime.url").trim(); //$NON-NLS-1$
+ if ("".equals(url) || "${jboss.runtime.directory.url}".equals(url)){ //$NON-NLS-1$//$NON-NLS-2$
+ //was not filtered, fallback to default value
+ JBOSS_RUNTIME_URL = JBOSS_RUNTIME_URL_DEFAULT;
+ } else {
+ JBOSS_RUNTIME_URL = url;
+ }
}
private static final String TWITTER_LINK ="http://twitter.com/#!/jbosstools"; //$NON-NLS-1$
@@ -64,7 +77,6 @@
private static final String NEWS_URL = "http://planet.jboss.org/feeds/news"; //$NON-NLS-1$
- private static final String DOWNLOAD_RUNTIMES_URL = "http://download.jboss.org/examples/download_runtimes.xml"; //$NON-NLS-1$
private Image headerImage;
@Override
@@ -115,6 +127,12 @@
@Override
public String getDownloadRuntimesURL() {
- return DOWNLOAD_RUNTIMES_URL;
+ // use commandline override -Djboss.runtime.directory.url
+ String directory = System.getProperty(JBOSS_RUNTIME_DIRECTORY, null);
+ if (directory == null) {
+ // else use Maven-generated value (or fall back to default)
+ return JBOSS_RUNTIME_URL;
+ }
+ return directory;
}
}
Modified: branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators/discovery.properties
===================================================================
--- branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators/discovery.properties 2012-05-31 21:11:48 UTC (rev 41595)
+++ branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators/discovery.properties 2012-05-31 21:19:30 UTC (rev 41596)
@@ -1 +1,2 @@
-discovery.url=${jboss.discovery.directory.url}
\ No newline at end of file
+discovery.url=${jboss.discovery.directory.url}
+runtime.url=${jboss.runtime.directory.url}
\ No newline at end of file
13 years, 4 months
JBoss Tools SVN: r41595 - trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2012-05-31 17:11:48 -0400 (Thu, 31 May 2012)
New Revision: 41595
Modified:
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/JBossRuntimeStartup.java
Log:
JBDS-2183 - EAP6 installed with JBDS should have name "jboss-eap-6" in Servers view instead of "jboss-as"
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/JBossRuntimeStartup.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/JBossRuntimeStartup.java 2012-05-31 20:09:16 UTC (rev 41594)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/JBossRuntimeStartup.java 2012-05-31 21:11:48 UTC (rev 41595)
@@ -40,7 +40,6 @@
public class JBossRuntimeStartup {
private static final String JBOSS_EAP_HOME = "../../jboss-eap"; // JBoss EAP home directory (relative to plugin)- <RHDS_HOME>/jbossas. //$NON-NLS-1$
- private static final String EAP = "EAP"; //$NON-NLS-1$
private static final String LOCATIONS_FILE_NAME = "runtime_locations.properties"; //$NON-NLS-1$
private static final String LOCATIONS_FILE = "../../../../studio/" + LOCATIONS_FILE_NAME; //$NON-NLS-1$
private static final String LOCATIONS_FILE_CONFIGURATION = "../../studio/" + LOCATIONS_FILE_NAME; //$NON-NLS-1$
@@ -58,10 +57,6 @@
runtimePath.getServerDefinitions().clear();
for (RuntimeDefinition serverDefinition : serverDefinitions) {
serverDefinition.setRuntimePath(runtimePath);
- if (EAP.equals(serverDefinition.getType())) {
- String name = getUniqueName("jboss-eap-" + serverDefinition.getVersion(), serverDefinition, serverDefinitions);
- serverDefinition.setName(name);
- }
}
initializeRuntimes(serverDefinitions);
}
@@ -86,28 +81,6 @@
}
}
- private static String getUniqueName(String name, RuntimeDefinition serverDefinition, List<RuntimeDefinition> serverDefinitions) {
- int i = 0;
- boolean end = false;
- while (!end) {
- end = true;
- for (RuntimeDefinition definition : serverDefinitions) {
- if (definition == serverDefinition) {
- continue;
- }
- if (i > 0) {
- name = name + "(" + i + ")";
- }
- if (name.equals(definition.getName())) {
- i++;
- end = false;
- break;
- }
- }
- }
- return name;
- }
-
public static void initializeRuntimes(List<RuntimeDefinition> serverDefinitions) {
Set<IRuntimeDetector> detectors = RuntimeCoreActivator.getRuntimeDetectors();
for( IRuntimeDetector detector:detectors) {
13 years, 4 months
JBoss Tools SVN: r41594 - in trunk: maven/features/org.jboss.tools.maven.cdi.feature and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2012-05-31 16:09:16 -0400 (Thu, 31 May 2012)
New Revision: 41594
Modified:
trunk/common/features/org.jboss.tools.common.verification.feature/feature.properties
trunk/maven/features/org.jboss.tools.maven.cdi.feature/feature.properties
trunk/maven/features/org.jboss.tools.maven.hibernate.feature/feature.properties
Log:
JBIDE-11324 missing feature descriptions
Modified: trunk/common/features/org.jboss.tools.common.verification.feature/feature.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.verification.feature/feature.properties 2012-05-31 19:37:30 UTC (rev 41593)
+++ trunk/common/features/org.jboss.tools.common.verification.feature/feature.properties 2012-05-31 20:09:16 UTC (rev 41594)
@@ -26,7 +26,7 @@
devUpdateSiteName=JBossTools Development Update Site
# "description" property - description of the feature
-description=JBoss Tools Verification
+description=Common plugins for validation and verification of source files used by other parts of JBoss Tools.
copyright=Copyright (c) 2007-2012 Exadel, Inc and Red Hat, Inc.\n\
Distributed under license by Red Hat, Inc. All rights reserved.\n\
Modified: trunk/maven/features/org.jboss.tools.maven.cdi.feature/feature.properties
===================================================================
--- trunk/maven/features/org.jboss.tools.maven.cdi.feature/feature.properties 2012-05-31 19:37:30 UTC (rev 41593)
+++ trunk/maven/features/org.jboss.tools.maven.cdi.feature/feature.properties 2012-05-31 20:09:16 UTC (rev 41594)
@@ -24,7 +24,7 @@
updateSiteName=JBossTools Update Site
# "description" property - description of the feature
-description=JBoss Maven CDI Configurator
+description=Enables CDI tooling on Maven projects that depends or contain CDI specific artifacts.
# "copyright" property - text of the "Feature Update Copyright"
copyright=Copyright (c) 2010-2012 Red Hat, Inc. and others.\n\
Modified: trunk/maven/features/org.jboss.tools.maven.hibernate.feature/feature.properties
===================================================================
--- trunk/maven/features/org.jboss.tools.maven.hibernate.feature/feature.properties 2012-05-31 19:37:30 UTC (rev 41593)
+++ trunk/maven/features/org.jboss.tools.maven.hibernate.feature/feature.properties 2012-05-31 20:09:16 UTC (rev 41594)
@@ -24,7 +24,7 @@
updateSiteName=JBossTools Update Site
# "description" property - description of the feature
-description=JBoss Maven Hibernate Configurator
+description=Provides automatic enablement of Hibernate/Dali JPA tooling features for Maven projects.
# "copyright" property - text of the "Feature Update Copyright"
copyright=Copyright (c) 2010-2012 Red Hat, Inc. and others.\n\
13 years, 4 months
JBoss Tools SVN: r41593 - in branches/jbosstools-3.3.x: maven/features/org.jboss.tools.maven.cdi.feature and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2012-05-31 15:37:30 -0400 (Thu, 31 May 2012)
New Revision: 41593
Modified:
branches/jbosstools-3.3.x/common/features/org.jboss.tools.common.verification.feature/feature.properties
branches/jbosstools-3.3.x/maven/features/org.jboss.tools.maven.cdi.feature/feature.properties
branches/jbosstools-3.3.x/maven/features/org.jboss.tools.maven.hibernate.feature/feature.properties
Log:
JBIDE-11324 missing feature descriptions
Modified: branches/jbosstools-3.3.x/common/features/org.jboss.tools.common.verification.feature/feature.properties
===================================================================
--- branches/jbosstools-3.3.x/common/features/org.jboss.tools.common.verification.feature/feature.properties 2012-05-31 19:08:22 UTC (rev 41592)
+++ branches/jbosstools-3.3.x/common/features/org.jboss.tools.common.verification.feature/feature.properties 2012-05-31 19:37:30 UTC (rev 41593)
@@ -26,7 +26,7 @@
devUpdateSiteName=JBossTools Development Update Site
# "description" property - description of the feature
-description=JBoss Tools Verification
+description=Common plugins for validation and verification of source files used by other parts of JBoss Tools.
copyright=Copyright (c) 2007-2012 Exadel, Inc and Red Hat, Inc.\n\
Distributed under license by Red Hat, Inc. All rights reserved.\n\
Modified: branches/jbosstools-3.3.x/maven/features/org.jboss.tools.maven.cdi.feature/feature.properties
===================================================================
--- branches/jbosstools-3.3.x/maven/features/org.jboss.tools.maven.cdi.feature/feature.properties 2012-05-31 19:08:22 UTC (rev 41592)
+++ branches/jbosstools-3.3.x/maven/features/org.jboss.tools.maven.cdi.feature/feature.properties 2012-05-31 19:37:30 UTC (rev 41593)
@@ -24,7 +24,7 @@
updateSiteName=JBossTools Update Site
# "description" property - description of the feature
-description=JBoss Maven CDI Configurator
+description=Enables CDI tooling on Maven projects that depends or contain CDI specific artifacts.
# "copyright" property - text of the "Feature Update Copyright"
copyright=Copyright (c) 2010-2012 Red Hat, Inc. and others.\n\
Modified: branches/jbosstools-3.3.x/maven/features/org.jboss.tools.maven.hibernate.feature/feature.properties
===================================================================
--- branches/jbosstools-3.3.x/maven/features/org.jboss.tools.maven.hibernate.feature/feature.properties 2012-05-31 19:08:22 UTC (rev 41592)
+++ branches/jbosstools-3.3.x/maven/features/org.jboss.tools.maven.hibernate.feature/feature.properties 2012-05-31 19:37:30 UTC (rev 41593)
@@ -24,7 +24,7 @@
updateSiteName=JBossTools Update Site
# "description" property - description of the feature
-description=JBoss Maven Hibernate Configurator
+description=Provides automatic enablement of Hibernate/Dali JPA tooling features for Maven projects.
# "copyright" property - text of the "Feature Update Copyright"
copyright=Copyright (c) 2010-2012 Red Hat, Inc. and others.\n\
13 years, 4 months
JBoss Tools SVN: r41592 - trunk/build/parent.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-05-31 15:08:22 -0400 (Thu, 31 May 2012)
New Revision: 41592
Modified:
trunk/build/parent/pom.xml
Log:
update parent pom to point at newer H10 build of m2e-apt
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-05-31 19:07:45 UTC (rev 41591)
+++ trunk/build/parent/pom.xml 2012-05-31 19:08:22 UTC (rev 41592)
@@ -77,8 +77,8 @@
<requirements.root>${basedir}/../../../requirements</requirements.root>
<requirement.build.root>${requirements.root}/target</requirement.build.root>
- <!-- JBIDE-11700: latest stable build of m2e-apt for use with JBDS product builds -->
- <m2e-apt>http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-a...</m2e-apt>
+ <!-- JBIDE-11700, JBIDE-11865: latest stable build of m2e-apt for use with JBDS product builds -->
+ <m2e-apt>http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-a...</m2e-apt>
</properties>
13 years, 4 months
JBoss Tools SVN: r41591 - branches/jbosstools-3.3.x/build/parent.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-05-31 15:07:45 -0400 (Thu, 31 May 2012)
New Revision: 41591
Modified:
branches/jbosstools-3.3.x/build/parent/pom.xml
Log:
update parent pom to point at newer H10 build of m2e-apt
Modified: branches/jbosstools-3.3.x/build/parent/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/build/parent/pom.xml 2012-05-31 19:04:56 UTC (rev 41590)
+++ branches/jbosstools-3.3.x/build/parent/pom.xml 2012-05-31 19:07:45 UTC (rev 41591)
@@ -77,8 +77,8 @@
<requirements.root>${basedir}/../../../requirements</requirements.root>
<requirement.build.root>${requirements.root}/target</requirement.build.root>
- <!-- JBIDE-11700: latest stable build of m2e-apt for use with JBDS product builds -->
- <m2e-apt>http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-a...</m2e-apt>
+ <!-- JBIDE-11700, JBIDE-11865: latest stable build of m2e-apt for use with JBDS product builds -->
+ <m2e-apt>http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-a...</m2e-apt>
</properties>
13 years, 4 months
JBoss Tools SVN: r41590 - trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2012-05-31 15:04:56 -0400 (Thu, 31 May 2012)
New Revision: 41590
Modified:
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/JBossRuntimeStartup.java
Log:
JBDS-2183 - EAP6 installed with JBDS should have name "jboss-eap-6" in Servers view instead of "jboss-as"
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/JBossRuntimeStartup.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/JBossRuntimeStartup.java 2012-05-31 19:03:22 UTC (rev 41589)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/JBossRuntimeStartup.java 2012-05-31 19:04:56 UTC (rev 41590)
@@ -40,7 +40,7 @@
public class JBossRuntimeStartup {
private static final String JBOSS_EAP_HOME = "../../jboss-eap"; // JBoss EAP home directory (relative to plugin)- <RHDS_HOME>/jbossas. //$NON-NLS-1$
-
+ private static final String EAP = "EAP"; //$NON-NLS-1$
private static final String LOCATIONS_FILE_NAME = "runtime_locations.properties"; //$NON-NLS-1$
private static final String LOCATIONS_FILE = "../../../../studio/" + LOCATIONS_FILE_NAME; //$NON-NLS-1$
private static final String LOCATIONS_FILE_CONFIGURATION = "../../studio/" + LOCATIONS_FILE_NAME; //$NON-NLS-1$
@@ -58,6 +58,10 @@
runtimePath.getServerDefinitions().clear();
for (RuntimeDefinition serverDefinition : serverDefinitions) {
serverDefinition.setRuntimePath(runtimePath);
+ if (EAP.equals(serverDefinition.getType())) {
+ String name = getUniqueName("jboss-eap-" + serverDefinition.getVersion(), serverDefinition, serverDefinitions);
+ serverDefinition.setName(name);
+ }
}
initializeRuntimes(serverDefinitions);
}
@@ -82,6 +86,28 @@
}
}
+ private static String getUniqueName(String name, RuntimeDefinition serverDefinition, List<RuntimeDefinition> serverDefinitions) {
+ int i = 0;
+ boolean end = false;
+ while (!end) {
+ end = true;
+ for (RuntimeDefinition definition : serverDefinitions) {
+ if (definition == serverDefinition) {
+ continue;
+ }
+ if (i > 0) {
+ name = name + "(" + i + ")";
+ }
+ if (name.equals(definition.getName())) {
+ i++;
+ end = false;
+ break;
+ }
+ }
+ }
+ return name;
+ }
+
public static void initializeRuntimes(List<RuntimeDefinition> serverDefinitions) {
Set<IRuntimeDetector> detectors = RuntimeCoreActivator.getRuntimeDetectors();
for( IRuntimeDetector detector:detectors) {
13 years, 4 months
JBoss Tools SVN: r41589 - trunk/download.jboss.org/jbosstools/updates/indigo/SR2.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-05-31 15:03:22 -0400 (Thu, 31 May 2012)
New Revision: 41589
Modified:
trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeArtifacts...
trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeContent.xml
Log:
switch from requirements/m2eclipse/20120502-1600 to requirements/m2eclipse/20120531-1100 to pick up org.jboss.tools.maven.apt.feature_1.0.0.201205151950
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeArtifacts...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeArtifacts... 2012-05-31 19:02:59 UTC (rev 41588)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeArtifacts... 2012-05-31 19:03:22 UTC (rev 41589)
@@ -3,7 +3,7 @@
<repository name='JBoss Tools Requirements - Composite Indigo SR2 Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1338266663000'/>
+<property name='p2.timestamp' value='1338490873000'/>
</properties>
<children size='14'>
<child location='../../requirements/indigo/201202240900-SR2/'/>
@@ -17,7 +17,7 @@
<!-- <child location='http://dl.google.com/eclipse/plugin/3.7/'/> -->
<child location='../../requirements/gwt/2.5.0.v201201120043-rel-r37/'/>
<!-- includes m2e, m2e-extras, m2e-wtp, m2e-jdt-compiler -->
-<child location='../../requirements/m2eclipse/20120502-1600/'/>
+<child location='../../requirements/m2eclipse/20120531-1100/'/>
<child location='../../requirements/mylyn/3.6.5.v20120215-0100/'/>
<child location='../../requirements/orbit/R20120119162704/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeContent.xml 2012-05-31 19:02:59 UTC (rev 41588)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeContent.xml 2012-05-31 19:03:22 UTC (rev 41589)
@@ -3,7 +3,7 @@
<repository name='JBoss Tools Requirements - Composite Indigo SR2 Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1338266663000'/>
+<property name='p2.timestamp' value='1338490883000'/>
</properties>
<children size='14'>
<child location='../../requirements/indigo/201202240900-SR2/'/>
@@ -17,7 +17,7 @@
<!-- <child location='http://dl.google.com/eclipse/plugin/3.7/'/> -->
<child location='../../requirements/gwt/2.5.0.v201201120043-rel-r37/'/>
<!-- includes m2e, m2e-extras, m2e-wtp, m2e-jdt-compiler -->
-<child location='../../requirements/m2eclipse/20120502-1600/'/>
+<child location='../../requirements/m2eclipse/20120531-1100/'/>
<child location='../../requirements/mylyn/3.6.5.v20120215-0100/'/>
<child location='../../requirements/orbit/R20120119162704/'/>
13 years, 4 months
JBoss Tools SVN: r41588 - trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-05-31 15:02:59 -0400 (Thu, 31 May 2012)
New Revision: 41588
Modified:
trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml
Log:
update build script for m2e to include m2e-apt-1.0.0-2012-05-15_15-45-38-H10
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml 2012-05-31 18:57:48 UTC (rev 41587)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml 2012-05-31 19:02:59 UTC (rev 41588)
@@ -18,7 +18,7 @@
<target name="mirror">
<property name="URL1" value="http://download.jboss.org/jbosstools/updates/m2eclipse-wtp/"/>
<property name="URL2" value="http://download.jboss.org/jbosstools/updates/m2e-jdt-compiler/"/>
- <property name="URL3" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-a..."/>
+ <property name="URL3" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-a..."/>
<!--
<property name="URL1" value="http://download.eclipse.org/technology/m2e/releases/"/>
@@ -29,7 +29,7 @@
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/20120502-1600" name="m2e 1.0, m2e-wtp 0.15.2, m2e-extras 0.15, m2e-jdt-compiler 1.0, m2e-apt 1.0 (mirrored 20120502-1600)" />
+ <repository location="file:${destination}/20120531-1100" name="m2e 1.0, m2e-wtp 0.15.2, m2e-extras 0.15, m2e-jdt-compiler 1.0, m2e-apt 1.0 (mirrored 20120531-1100)" />
<source>
<repository location="${URL1}" />
<repository location="${URL2}" />
@@ -39,7 +39,7 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/20120502-1600/" artifactRepository="file:${destination}/20120502-1600/"
- publishartifacts="true" source="${destination}/20120502-1600/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/20120531-1100/" artifactRepository="file:${destination}/20120531-1100/"
+ publishartifacts="true" source="${destination}/20120531-1100/" compress="${compress}" />
</target>
</project>
13 years, 4 months