JBoss Tools SVN: r40627 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-04-30 06:46:52 -0400 (Mon, 30 Apr 2012)
New Revision: 40627
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java
Log:
removed unneeded instance var
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-04-30 10:34:47 UTC (rev 40626)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-04-30 10:46:52 UTC (rev 40627)
@@ -48,8 +48,6 @@
private IUserAwareModel wizardModel;
- private OpenShiftPasswordStorageKey key;
-
public CredentialsWizardPageModel(IUserAwareModel wizardModel) {
this.wizardModel = wizardModel;
this.rhLoginPreferenceValue = new StringPreferenceValue(RHLOGIN_PREFS_KEY, OpenShiftUIActivator.PLUGIN_ID);
12 years
JBoss Tools SVN: r40626 - trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources.
by jbosstools-commits＠lists.jboss.org
Author: rhopp
Date: 2012-04-30 06:34:47 -0400 (Mon, 30 Apr 2012)
New Revision: 40626
Modified:
trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/as7.swtbot.test.properties
Log:
=Updated to JBossAS 7.1
Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/as7.swtbot.test.properties
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/as7.swtbot.test.properties 2012-04-30 10:28:53 UTC (rev 40625)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/as7.swtbot.test.properties 2012-04-30 10:34:47 UTC (rev 40626)
@@ -1 +1 @@
-SERVER=AS,7.0,default,${jbosstools.test.jbossas.home}
\ No newline at end of file
+SERVER=AS,7.1,default,${jbosstools.test.jbossas.home}
12 years
JBoss Tools SVN: r40625 - trunk/openshift/plugins/org.jboss.tools.openshift.express.client.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-04-30 06:28:53 -0400 (Mon, 30 Apr 2012)
New Revision: 40625
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
Log:
[JBIDE-11603] enabled version negotiation in client lib (& enabled tests), built new client lib
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
12 years
JBoss Tools SVN: r40624 - trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot.
by jbosstools-commits＠lists.jboss.org
Author: rhopp
Date: 2012-04-30 06:22:30 -0400 (Mon, 30 Apr 2012)
New Revision: 40624
Modified:
trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java
Log:
Deploy on server should work with maven now
Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java 2012-04-30 07:27:02 UTC (rev 40623)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java 2012-04-30 10:22:30 UTC (rev 40624)
@@ -15,6 +15,7 @@
import org.jboss.tools.ui.bot.ext.gen.ActionItem.Preference;
import org.jboss.tools.ui.bot.ext.parts.SWTBotTwistie;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.jboss.tools.ui.bot.ext.view.ProblemsView;
import org.jboss.tools.ui.bot.ext.wizards.SWTBotWizard;
import org.junit.After;
import org.junit.BeforeClass;
@@ -167,21 +168,21 @@
bot.shell("Add and Remove...").activate();
for (SWTBotTreeItem treeItem : bot.tree().getAllItems()) {
treeItem.select();
+ log.info("Adding "+treeItem.getText()+" to server");
bot.clickButton("Add >");
+ log.info("Succesfully added");
}
bot.clickButton("Finish");
servers.show();
- log.info("========================================");
- log.info(bot.tree().getAllItems().toString());
bot.waitWhile(new NonSystemJobRunsCondition());
- log.info("Pred getErrorsNode");
- assertNull("Errors node should be null", problems.getErrorsNode(bot));
- log.info("Za getErrorsNode");
+ assertNull("Errors node should be null", ProblemsView.getErrorsNode(bot));
servers.show();
bot.waitWhile(new NonSystemJobRunsCondition());
SWTBotTreeItem serverTreeItem = servers.findServerByName(servers.bot().tree(), serverName).expand();
+ bot.sleep(TIME_1S);
for (SWTBotTreeItem projectName : projectExplorer.show().bot().tree().getAllItems()) {
try{
+ log.info("Testing project "+projectName.getText());
serverTreeItem.getNode(projectName.getText()+" [Started, Synchronized]");
log.info("Project: "+projectName.getText()+" is properly deployed.");
}catch (WidgetNotFoundException wnfe){
@@ -191,6 +192,7 @@
}
}
}
+ servers.removeProjectFromServers(serverName);
}
private void waitForAWhile(){
12 years
JBoss Tools SVN: r40623 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-30 03:27:02 -0400 (Mon, 30 Apr 2012)
New Revision: 40623
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml
Log:
wtp dependencies commented to test JBIDE-10827 was fixed
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml 2012-04-30 05:52:20 UTC (rev 40622)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml 2012-04-30 07:27:02 UTC (rev 40623)
@@ -54,6 +54,7 @@
<version>0.0.0</version>
</dependency>
<!-- end of workaround -->
+ <!--
<dependency>
<type>p2-installable-unit</type>
<artifactId>org.eclipse.jst.enterprise_ui.feature.feature.group</artifactId>
@@ -78,7 +79,7 @@
<type>p2-installable-unit</type>
<artifactId>org.eclipse.wst.xml_ui.feature.feature.group</artifactId>
<version>0.0.0</version>
- </dependency>
+ </dependency> -->
</dependencies>
</configuration>
</plugin>
12 years
JBoss Tools SVN: r40622 - trunk/jsf/docs/jsf_tools_tutorial/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-04-30 01:52:20 -0400 (Mon, 30 Apr 2012)
New Revision: 40622
Modified:
trunk/jsf/docs/jsf_tools_tutorial/en-US/Author_Group.xml
trunk/jsf/docs/jsf_tools_tutorial/en-US/Book_Info.xml
Log:
updated for JBDS 5
Modified: trunk/jsf/docs/jsf_tools_tutorial/en-US/Author_Group.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_tutorial/en-US/Author_Group.xml 2012-04-30 04:25:58 UTC (rev 40621)
+++ trunk/jsf/docs/jsf_tools_tutorial/en-US/Author_Group.xml 2012-04-30 05:52:20 UTC (rev 40622)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
-<authorgroup><author><firstname>Anatoly</firstname><surname>Fedosik</surname></author>
- <author><firstname>Olga</firstname><surname>Chikvina</surname></author>
- <author><firstname>Svetlana</firstname><surname>Mukhina</surname><email>smukhina(a)exadel.com</email></author></authorgroup>
+<authorgroup><author><firstname>Anatoly</firstname><surname>Fedosik</surname></author>
+ <author><firstname>Olga</firstname><surname>Chikvina</surname></author>
+ <author><firstname>Svetlana</firstname><surname>Mukhina</surname></author></authorgroup>
Modified: trunk/jsf/docs/jsf_tools_tutorial/en-US/Book_Info.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_tutorial/en-US/Book_Info.xml 2012-04-30 04:25:58 UTC (rev 40621)
+++ trunk/jsf/docs/jsf_tools_tutorial/en-US/Book_Info.xml 2012-04-30 05:52:20 UTC (rev 40622)
@@ -5,9 +5,9 @@
<title>JSF Tools Tutorial</title>
<subtitle>Provides information relating to the JSF Tools module.</subtitle>
<productname>JBoss Developer Studio</productname>
- <productnumber>4.1</productnumber>
- <edition>4.1.0</edition>
- <pubsnumber>2</pubsnumber>
+ <productnumber>5.0</productnumber>
+ <edition>5.0.0</edition>
+ <pubsnumber>1</pubsnumber>
<abstract>
<para>The JSF Tools Tutorial explains how to use the JSF Tools module to create a simple JSF application.</para>
</abstract>
12 years
JBoss Tools SVN: r40621 - trunk/portlet/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-04-30 00:25:58 -0400 (Mon, 30 Apr 2012)
New Revision: 40621
Modified:
trunk/portlet/docs/reference/en-US/Author_Group.xml
trunk/portlet/docs/reference/en-US/Book_Info.xml
Log:
updated for JBDS 5
Modified: trunk/portlet/docs/reference/en-US/Author_Group.xml
===================================================================
--- trunk/portlet/docs/reference/en-US/Author_Group.xml 2012-04-30 04:04:34 UTC (rev 40620)
+++ trunk/portlet/docs/reference/en-US/Author_Group.xml 2012-04-30 04:25:58 UTC (rev 40621)
@@ -1,26 +1,23 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
-<authorgroup><author>
- <firstname>Anatoly</firstname>
- <surname>Fedosik</surname>
- </author>
- <author>
- <firstname>Koen</firstname>
- <surname>Aers</surname>
- <email>koen.aers(a)jboss.com</email>
- </author>
- <author>
- <firstname>Olga</firstname>
- <surname>Chikvina</surname>
- </author>
- <author>
- <firstname>Svetlana</firstname>
- <surname>Mukhina</surname>
- <email>smukhina(a)exadel.com</email>
- </author>
- <author>
- <firstname>Tom</firstname>
- <surname>Baeyens</surname>
- <email>tom.baeyens(a)jboss.com</email>
+<authorgroup><author>
+ <firstname>Anatoly</firstname>
+ <surname>Fedosik</surname>
+ </author>
+ <author>
+ <firstname>Koen</firstname>
+ <surname>Aers</surname>
+ </author>
+ <author>
+ <firstname>Olga</firstname>
+ <surname>Chikvina</surname>
+ </author>
+ <author>
+ <firstname>Svetlana</firstname>
+ <surname>Mukhina</surname>
+ </author>
+ <author>
+ <firstname>Tom</firstname>
+ <surname>Baeyens</surname>
</author></authorgroup>
Modified: trunk/portlet/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/portlet/docs/reference/en-US/Book_Info.xml 2012-04-30 04:04:34 UTC (rev 40620)
+++ trunk/portlet/docs/reference/en-US/Book_Info.xml 2012-04-30 04:25:58 UTC (rev 40621)
@@ -5,8 +5,8 @@
<title>JBoss Portlet Tools User Guide</title>
<subtitle>Provides information relating to the JBoss Portlet Tools set.</subtitle>
<productname>JBoss Developer Studio</productname>
- <productnumber>4.1</productnumber>
- <edition>4.1.0</edition>
+ <productnumber>5.0</productnumber>
+ <edition>5.0.0</edition>
<pubsnumber>1</pubsnumber>
<abstract>
<para>The JBoss Portlet Tools User Guide explains how to begin with and manage JBoss Portlet Tools.</para>
12 years
JBoss Tools SVN: r40620 - trunk/birt/docs/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-04-30 00:04:34 -0400 (Mon, 30 Apr 2012)
New Revision: 40620
Modified:
trunk/birt/docs/en-US/Author_Group.xml
trunk/birt/docs/en-US/Book_Info.xml
Log:
updated for JBDS 5
Modified: trunk/birt/docs/en-US/Author_Group.xml
===================================================================
--- trunk/birt/docs/en-US/Author_Group.xml 2012-04-30 03:20:02 UTC (rev 40619)
+++ trunk/birt/docs/en-US/Author_Group.xml 2012-04-30 04:04:34 UTC (rev 40620)
@@ -2,8 +2,8 @@
<!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<authorgroup>
- <author><firstname>Michael</firstname><surname>Sorokin</surname><email>msorokin(a)exadel.com</email></author>
- <author><firstname>Anastasiya</firstname><surname>Bogachuk</surname><email>abogachuk(a)exadel.com</email></author>
+ <author><firstname>Michael</firstname><surname>Sorokin</surname></author>
+ <author><firstname>Anastasiya</firstname><surname>Bogachuk</surname></author>
<author><firstname>Olga</firstname><surname>Chikvina</surname><email></email></author>
</authorgroup>
Modified: trunk/birt/docs/en-US/Book_Info.xml
===================================================================
--- trunk/birt/docs/en-US/Book_Info.xml 2012-04-30 03:20:02 UTC (rev 40619)
+++ trunk/birt/docs/en-US/Book_Info.xml 2012-04-30 04:04:34 UTC (rev 40620)
@@ -5,8 +5,8 @@
<title>JBoss Business Intelligence and Reporting Tools Integration User Guide</title>
<subtitle>Provides information about the use of the Business Intelligence and Reporting Tools (BIRT) plug-in as part of the JBoss Developer Studio.</subtitle>
<productname>JBoss Developer Studio</productname>
-<productnumber>4.1</productnumber>
-<edition>4.1.0</edition>
+<productnumber>5.0</productnumber>
+<edition>5.0.0</edition>
<pubsnumber>1</pubsnumber>
<abstract>
<para>
12 years
JBoss Tools SVN: r40619 - trunk/jsf/docs/userguide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-04-29 23:20:02 -0400 (Sun, 29 Apr 2012)
New Revision: 40619
Modified:
trunk/jsf/docs/userguide/en-US/Book_Info.xml
trunk/jsf/docs/userguide/en-US/browsers.xml
Log:
updated with browsersim info
Modified: trunk/jsf/docs/userguide/en-US/Book_Info.xml
===================================================================
--- trunk/jsf/docs/userguide/en-US/Book_Info.xml 2012-04-29 20:05:54 UTC (rev 40618)
+++ trunk/jsf/docs/userguide/en-US/Book_Info.xml 2012-04-30 03:20:02 UTC (rev 40619)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>5.0.Beta</productnumber>
<edition>5.0.0</edition>
-<pubsnumber>10</pubsnumber>
+<pubsnumber>11</pubsnumber>
<abstract>
<para>The Visual Web Tools Reference Guide explains extensive collection of specialized wizards, editors and views that can be used in various scenarios while developing Web applications.</para>
</abstract>
Modified: trunk/jsf/docs/userguide/en-US/browsers.xml
===================================================================
--- trunk/jsf/docs/userguide/en-US/browsers.xml 2012-04-29 20:05:54 UTC (rev 40618)
+++ trunk/jsf/docs/userguide/en-US/browsers.xml 2012-04-30 03:20:02 UTC (rev 40619)
@@ -60,7 +60,7 @@
</listitem>
<listitem>
<para>
- Apple Safari.
+ Quicktime or iTunes. Each of these installs Apple Application Support in the folder BrowserSim assumes. Apple Application Support is necessary for BrowserSim to work correctly on Windows.
</para>
</listitem>
</itemizedlist>
12 years
JBoss Tools SVN: r40618 - trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/utils.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-04-29 16:05:54 -0400 (Sun, 29 Apr 2012)
New Revision: 40618
Modified:
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/utils/MavenArtifactHelper.java
Log:
JBIDE-11684 - EAP 5.0. ER6 Maven artefacts are not compatible with JBT Java EE Web Project
Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/utils/MavenArtifactHelper.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/utils/MavenArtifactHelper.java 2012-04-29 01:20:25 UTC (rev 40617)
+++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/utils/MavenArtifactHelper.java 2012-04-29 20:05:54 UTC (rev 40618)
@@ -11,14 +11,18 @@
package org.jboss.tools.maven.project.examples.utils;
import java.util.ArrayList;
+import java.util.List;
import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.repository.internal.MavenRepositorySystemSession;
+import org.codehaus.plexus.DefaultPlexusContainer;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.m2e.core.MavenPlugin;
import org.eclipse.m2e.core.embedder.IMaven;
@@ -27,18 +31,27 @@
import org.jboss.tools.maven.project.examples.Messages;
import org.jboss.tools.maven.project.examples.xpl.DependencyKey;
import org.jboss.tools.project.examples.model.ProjectExample;
+import org.sonatype.aether.RepositorySystem;
+import org.sonatype.aether.repository.LocalRepository;
+import org.sonatype.aether.repository.RemoteRepository;
+import org.sonatype.aether.resolution.VersionRangeRequest;
+import org.sonatype.aether.resolution.VersionRangeResolutionException;
+import org.sonatype.aether.resolution.VersionRangeResult;
+import org.sonatype.aether.util.artifact.DefaultArtifact;
+import org.sonatype.aether.version.Version;
public class MavenArtifactHelper {
private static final DependencyKey ENTERPRISE_JBOSS_SPEC = DependencyKey.fromPortableString("org.jboss.spec:jboss-javaee-web-6.0:pom:3.0.0.Beta1-redhat-1::"); //$NON-NLS-1$
+ private static final String COORDS = "org.jboss.spec:jboss-javaee-web-6.0:[0,)"; //$NON-NLS-1$
/**
* Checks if the EAP repository is available
*
- * @return true if org.jboss.spec:jboss-javaee-web-6.0:pom:3.0.0.Beta1-redhat-1 can be resolved
+ * @return true if org.jboss.spec:jboss-javaee-web-6.0:pom:*redhat* can be resolved
*/
public static boolean isEnterpriseRepositoryAvailable() {
- boolean isRepoAvailable = isArtifactAvailable(ENTERPRISE_JBOSS_SPEC); //$NON-NLS-1$
+ boolean isRepoAvailable = artifactExists(COORDS);
return isRepoAvailable;
}
@@ -91,4 +104,48 @@
}
return Status.OK_STATUS;
}
+
+ private static boolean artifactExists(String coords) {
+ RepositorySystem system;
+ try {
+ system = new DefaultPlexusContainer()
+ .lookup(RepositorySystem.class);
+ } catch (Exception e) {
+ MavenProjectExamplesActivator.log(e);
+ return false;
+ }
+ MavenRepositorySystemSession session = new MavenRepositorySystemSession();
+ String localRepoHome = System.getProperty("user.home") //$NON-NLS-1$
+ + Path.SEPARATOR + ".m2" + Path.SEPARATOR + "repository"; //$NON-NLS-1$ //$NON-NLS-2$
+ LocalRepository localRepo = new LocalRepository(localRepoHome);
+ session.setLocalRepositoryManager(system.newLocalRepositoryManager(localRepo));
+ org.sonatype.aether.artifact.Artifact artifact = new DefaultArtifact(coords);
+ VersionRangeRequest rangeRequest = new VersionRangeRequest();
+ rangeRequest.setArtifact(artifact);
+ List<ArtifactRepository> repos = new ArrayList<ArtifactRepository>();
+ IMaven maven = MavenPlugin.getMaven();
+ try {
+ repos.addAll(maven.getArtifactRepositories(false));
+ } catch (CoreException e) {
+ MavenProjectExamplesActivator.log(e);
+ return false;
+ }
+ for (ArtifactRepository repo : repos) {
+ RemoteRepository remoteRepo = new RemoteRepository(repo.getId(), "default", repo.getUrl()); //$NON-NLS-1$
+ rangeRequest.addRepository(remoteRepo);
+ }
+ try {
+ VersionRangeResult result = system.resolveVersionRange(
+ session, rangeRequest);
+ List<Version> versions = result.getVersions();
+ for (Version version:versions) {
+ if (version != null && version.toString().contains("redhat")) { //$NON-NLS-1$
+ return true;
+ }
+ }
+ } catch (VersionRangeResolutionException e) {
+ MavenProjectExamplesActivator.log(e);
+ }
+ return false;
+ }
}
12 years