JBoss Tools SVN: r40952 - workspace/snjeza/jbossas7-examples.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-05-11 10:46:44 -0400 (Fri, 11 May 2012)
New Revision: 40952
Modified:
workspace/snjeza/jbossas7-examples/login.zip
Log:
JBIDE-11843 - Update jboss-as-maven plugin version in jboss-as-login quickstart
Modified: workspace/snjeza/jbossas7-examples/login.zip
===================================================================
(Binary files differ)
12 years, 8 months
JBoss Tools SVN: r40951 - trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke.
by jbosstools-commits＠lists.jboss.org
Author: jgargula
Date: 2012-05-11 10:37:34 -0400 (Fri, 11 May 2012)
New Revision: 40951
Modified:
trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java
Log:
Changed deleting objects (clicking menu instead of unstable simulating pressing delete key)
Modified: trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java
===================================================================
--- trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java 2012-05-11 14:29:09 UTC (rev 40950)
+++ trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java 2012-05-11 14:37:34 UTC (rev 40951)
@@ -11,7 +11,7 @@
package org.jboss.tools.drools.ui.bot.test.smoke;
-import java.awt.event.KeyEvent;
+//import java.awt.event.KeyEvent;
import java.io.File;
import java.io.IOException;
import java.util.Iterator;
@@ -41,7 +41,7 @@
import org.jboss.tools.ui.bot.ext.SWTUtilExt;
import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.gen.ActionItem;
-import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper;
+//import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.ui.bot.ext.types.ViewType;
import org.junit.Test;
@@ -175,12 +175,14 @@
" Name=" + name, id.equals("1") && name.equals("Start"));
// Delete each component
gefEditor.activateTool("Select");
+ bot.sleep(Timing.time1S());
for (int toolIndex = 0;toolIndex < tools.length;toolIndex++){
gefEditor.click(xspacing * (toolIndex % 3) + xoffset + 10,
yspacing * (toolIndex / 3) + yoffset + 10);
gefEditor.setFocus();
- bot.sleep(Timing.time1S());
- KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_DELETE);
+ //bot.sleep(Timing.time1S());
+ //KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_DELETE);
+ bot.menu(IDELabel.Menu.EDIT).menu(IDELabel.Menu.DELETE).click();
}
// Restore maximized editor
bot.menu(IDELabel.Menu.WINDOW)
@@ -666,14 +668,16 @@
errorDescription = checkNodeName(nodesNode, NODES_NODE_NAME);
if (errorDescription == null) {
List<Node> nodes = removeTextNodes(nodesNode.getChildNodes());
+ bot.sleep(Timing.time1S());
for (Node node : nodes){
NamedNodeMap attributes = node.getAttributes();
int xPos = Integer.parseInt(attributes.getNamedItem("x").getNodeValue());
int yPos = Integer.parseInt(attributes.getNamedItem("y").getNodeValue());
gefEditor.click(xPos + 3, yPos + 3);
- bot.sleep(Timing.time1S());
- KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_DELETE);
- bot.sleep(Timing.time1S());
+ //bot.sleep(Timing.time1S());
+ bot.menu(IDELabel.Menu.EDIT).menu(IDELabel.Menu.DELETE).click();
+ //KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_DELETE);
+ //bot.sleep(Timing.time1S());
}
}
} else {
@@ -708,8 +712,9 @@
final int OFFSET = 3;
gefEditor.click(x + OFFSET, y + OFFSET);
bot.sleep(Timing.time1S());
- KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_DELETE);
- bot.sleep(Timing.time1S());
+ bot.menu(IDELabel.Menu.EDIT).menu(IDELabel.Menu.DELETE).click();
+ //KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_DELETE);
+ //bot.sleep(Timing.time1S());
}
}
}
12 years, 8 months
JBoss Tools SVN: r40950 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: jgargula
Date: 2012-05-11 10:29:09 -0400 (Fri, 11 May 2012)
New Revision: 40950
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java
Log:
Added support for finding menu matching regular expression.
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2012-05-11 12:29:33 UTC (rev 40949)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2012-05-11 14:29:09 UTC (rev 40950)
@@ -1244,7 +1244,9 @@
//System.out.println (treeItem.contextMenu("Run As").menu("2 Java Application").getText());
bot.sleep(Timing.time30S());
- treeItem.contextMenu("Run As").menu("2 Java Application").click();
+ //treeItem.contextMenu("Run As").menu("2 Java Application").click();
+ SWTUtilExt.menuWithRegex("(.*) Java Application", treeItem.contextMenu(IDELabel.Menu.RUN_AS)).click();
+
//runJavaApplication("helloworld_testclient","org.jboss.soa.esb.samples.quickstart.helloworld.test.SendJMSMessage"," ");
bot.sleep(Timing.time30S()); // This is needed to enable the test to run successfully to completion
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java 2012-05-11 12:29:33 UTC (rev 40949)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java 2012-05-11 14:29:09 UTC (rev 40950)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.ui.bot.ext;
+import static org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable.syncExec;
+import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.withRegex;
import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.withTooltip;
import static org.junit.Assert.fail;
@@ -29,6 +31,7 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.MenuItem;
import org.eclipse.swt.widgets.Widget;
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
@@ -36,21 +39,24 @@
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.eclipse.swtbot.swt.finder.finders.MenuFinder;
import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
import org.eclipse.swtbot.swt.finder.results.Result;
+import org.eclipse.swtbot.swt.finder.results.WidgetResult;
import org.eclipse.swtbot.swt.finder.utils.SWTUtils;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarButton;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
import org.jboss.tools.ui.bot.ext.parts.SWTBotBrowserExt;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.ui.bot.ext.types.JobLists;
import org.jboss.tools.ui.bot.ext.types.JobState;
import org.osgi.framework.Bundle;
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
/**
* SWTUtilExt is contains helper method for writing SWTBot tests, i.e. various delay methods
@@ -822,4 +828,29 @@
projectName;
}
+ /**
+ * Returns the first found menu which matches given regular expression.
+ *
+ * @param menuRegex Regular expression which is looking for in menu text.
+ * @param parentMenu Parent menu which is used for searching.
+ *
+ * @return Menu matching regular expression.
+ *
+ * @throws WidgetNotFoundException If no menu matches.
+ */
+ public static SWTBotMenu menuWithRegex(final String menuRegex, final SWTBotMenu parentMenu) throws WidgetNotFoundException {
+ final Matcher<? extends Widget> matcher = withRegex(menuRegex);
+ MenuItem menuItem = syncExec(new WidgetResult<MenuItem>() {
+ public MenuItem run() {
+ Menu bar = parentMenu.widget.getMenu();
+ Matcher<MenuItem> withRegex = withRegex(menuRegex);
+ List<MenuItem> menus = new MenuFinder().findMenus(bar, withRegex, true);
+ if (!menus.isEmpty())
+ return menus.get(0);
+ return null;
+ }
+ });
+ return new SWTBotMenu(menuItem, matcher);
+ }
+
}
\ No newline at end of file
12 years, 8 months
JBoss Tools SVN: r40949 - in trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test: src/org/jboss/tools/bpel/ui/bot/test/util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: apodhrad
Date: 2012-05-11 08:29:33 -0400 (Fri, 11 May 2012)
New Revision: 40949
Modified:
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/util/ResourceHelper.java
Log:
BPEL bot tests: setting the java version as default in org.jboss.tools.bpel.ui.bot.test.properties
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties 2012-05-11 12:11:44 UTC (rev 40948)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties 2012-05-11 12:29:33 UTC (rev 40949)
@@ -1,11 +1,11 @@
# SWTBotTest properties
# all properties are optional, all defined paths should exist
# <java version>,<jre/jdk home>
-JAVA=1.6,/opt/java/jdk1.6.0_30
+#JAVA=1.6,/opt/java/jdk1.6.0_30
#EAP|JBOSS_AS|EPP|SOA,<server version>,<jre version to run with>|default,<server home>
# note : when server is type of SOA, version is version of SOA (not the bundled EAP)
#SERVER=JBOSS_AS,5.0,1.6,/home/psrna/data/jboss/jboss/jboss-as
-SERVER=SOA,5.2,1.6,../../../requirements/target/jboss-soa-p-5/jboss-as
+SERVER=SOA,5.2,default,../../../requirements/target/jboss-soa-p-5/jboss-as
#SERVER=AS,5.1,1.6,/home/apodhrad/Software/jboss-5.1.0.GA
#<seam version>,<seam runtime home>
#SEAM=2.2,/home/psrna/data/jboss/soa-5.1.0.ER6-eds/seam
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/util/ResourceHelper.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/util/ResourceHelper.java 2012-05-11 12:11:44 UTC (rev 40948)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/util/ResourceHelper.java 2012-05-11 12:29:33 UTC (rev 40949)
@@ -32,6 +32,7 @@
Thread.sleep(3000);
} catch (Exception e) {
+ e.printStackTrace();
throw new RuntimeException("Failed to import project: " + projectName, e.getCause());
}
}
12 years, 8 months
JBoss Tools SVN: r40948 - in branches/jbosstools-3.3.0.Beta3/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples: utils and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-05-11 08:11:44 -0400 (Fri, 11 May 2012)
New Revision: 40948
Modified:
branches/jbosstools-3.3.0.Beta3/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/messages.properties
branches/jbosstools-3.3.0.Beta3/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/utils/MavenArtifactHelper.java
Log:
JBIDE-11684 : check enterprise version of jboss spec using a version range (version containing redhat)
Modified: branches/jbosstools-3.3.0.Beta3/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/messages.properties
===================================================================
--- branches/jbosstools-3.3.0.Beta3/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/messages.properties 2012-05-11 10:17:09 UTC (rev 40947)
+++ branches/jbosstools-3.3.0.Beta3/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/messages.properties 2012-05-11 12:11:44 UTC (rev 40948)
@@ -5,6 +5,6 @@
ArchetypeExamplesWizardFirstPage_ProjectName_Label=Project name
ArchetypeExamplesWizardFirstPage_Target_Runtime_Label=Target Runtime
ArchetypeExamplesWizardFirstPage_Title=Create a new Java EE project
-ArchetypeExamplesWizardFirstPage_Unresolved_Enterprise_Repo={0} cannot be found. This indicates you do not have access to a JBoss Enterprise Maven repository.\nThis can cause build problems. Follow this <a href\="http\://community.jboss.org/wiki/SettingUpTheJBossEnterpriseRepositories">link</a> for more details.
+ArchetypeExamplesWizardFirstPage_Unresolved_Enterprise_Repo=A *-redhat version of {0} cannot be found. This indicates you do not have access to a JBoss Enterprise Maven repository.\nThis can cause build problems. Follow this <a href\="http\://community.jboss.org/wiki/SettingUpTheJBossEnterpriseRepositories">link</a> for more details.
ArchetypeExamplesWizardFirstPage_Unresolved_WFK_Repo=The enterprise version of this project has a dependency on {0} which cannot be found. This indicates you do not have access to a JBoss WFK Maven repository or that repository is incomplete.\nThis can cause build problems. Follow this <a href\="http\://community.jboss.org/wiki/SettingUpTheJBossEnterpriseRepositories">link</a> for more details.
ArchetypeExamplesWizardFirstPage_Error_Package=Invalid package name
\ No newline at end of file
Modified: branches/jbosstools-3.3.0.Beta3/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/utils/MavenArtifactHelper.java
===================================================================
--- branches/jbosstools-3.3.0.Beta3/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/utils/MavenArtifactHelper.java 2012-05-11 10:17:09 UTC (rev 40947)
+++ branches/jbosstools-3.3.0.Beta3/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/utils/MavenArtifactHelper.java 2012-05-11 12:11:44 UTC (rev 40948)
@@ -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 JBOSS_SPEC = "org.jboss.spec:jboss-javaee-web-6.0"; //$NON-NLS-1$
+ private static final String COORDS = JBOSS_SPEC+":[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 = redHatArtifactExists(COORDS);
return isRepoAvailable;
}
@@ -74,7 +87,7 @@
if (!isEnterpriseRepositoryAvailable()) {
return new Status(IStatus.ERROR,
MavenProjectExamplesActivator.PLUGIN_ID,
- NLS.bind(Messages.ArchetypeExamplesWizardFirstPage_Unresolved_Enterprise_Repo, ENTERPRISE_JBOSS_SPEC));
+ NLS.bind(Messages.ArchetypeExamplesWizardFirstPage_Unresolved_Enterprise_Repo, JBOSS_SPEC));
}
if (project != null) {
Set<String> requirements = project.getEssentialEnterpriseDependencyGavs();
@@ -91,4 +104,47 @@
}
return Status.OK_STATUS;
}
+
+ private static boolean redHatArtifactExists(String coords) {
+ RepositorySystem system;
+ try {
+ system = new DefaultPlexusContainer()
+ .lookup(RepositorySystem.class);
+ } catch (Exception e) {
+ MavenProjectExamplesActivator.log(e);
+ return false;
+ }
+ MavenRepositorySystemSession session = new MavenRepositorySystemSession();
+ IMaven maven = MavenPlugin.getMaven();
+ String localRepoHome = maven.getLocalRepositoryPath();
+ LocalRepository localRepo = new LocalRepository(localRepoHome);
+ session.setLocalRepositoryManager(system.newLocalRepositoryManager(localRepo));
+
+ VersionRangeRequest rangeRequest = new VersionRangeRequest();
+ rangeRequest.setArtifact( new DefaultArtifact(coords));
+
+ List<ArtifactRepository> repos = new ArrayList<ArtifactRepository>();
+ 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, 8 months
JBoss Tools SVN: r40947 - in trunk/requirements: jbossas-5.1.0.GA-riftsaw-2.3.0.Final and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: apodhrad
Date: 2012-05-11 06:17:09 -0400 (Fri, 11 May 2012)
New Revision: 40947
Added:
trunk/requirements/jbossas-5.1.0.GA-riftsaw-2.3.0.Final/
trunk/requirements/jbossas-5.1.0.GA-riftsaw-2.3.0.Final/buildRequirement.xml
Log:
Added new requirement jbossas-5.1.0.GA-riftsaw-2.3.0.Final
Added: trunk/requirements/jbossas-5.1.0.GA-riftsaw-2.3.0.Final/buildRequirement.xml
===================================================================
--- trunk/requirements/jbossas-5.1.0.GA-riftsaw-2.3.0.Final/buildRequirement.xml (rev 0)
+++ trunk/requirements/jbossas-5.1.0.GA-riftsaw-2.3.0.Final/buildRequirement.xml 2012-05-11 10:17:09 UTC (rev 40947)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+download required dependencies
+-jbossas
+-jbossesb
+-riftsaw
+
+unpack jbossas to location different from default
+install jbossesb
+install riftsaw
+
+-->
+<project name="projectroject" default="build.requirement">
+ <property file="build.properties" />
+
+ <target name="build.requirement" depends="unpack.requirement,install-jbossas,install-jbossesb,install-riftsaw" />
+ <target name="download.requirement" />
+ <target name="unpack.requirement" >
+ <ant dir="../jbossas-5.1.0.GA" antfile="../generic/build.xml" target="download.requirement" inheritall="true">
+ <property name="requirement" value="jbossas-5.1.0.GA"/>
+ </ant>
+ <ant dir="../jbossesb-4.10" antfile="../generic/build.xml" target="build.requirement" inheritall="true">
+ <property name="requirement" value="jbossesb-4.10"/>
+ </ant>
+ <ant dir="../riftsaw-2.3.0.Final" antfile="../generic/build.xml" target="build.requirement" inheritall="true">
+ <property name="requirement" value="riftsaw-2.3.0.Final"/>
+ </ant>
+ </target>
+ <target name="install-jbossas" >
+ <property file="../jbossas-5.1.0.GA/build.properties" />
+ <unzip src="${requirement.build.root}/../download/jbossas-5.1.0.GA/${jboss51.build.archive}" dest="${unzip.dest}" >
+ <mapper type="glob" from="jboss-5.1.0.GA/*" to="${jboss51.build.name}-riftsaw-2.3.0.Final/*"/>
+ </unzip>
+ </target>
+ <target name="install-jbossesb" >
+ <property file="../jbossesb-4.10/build.properties" prefix="jbossesb-4.10" />
+ <ant dir="${unzip.dest}/${jbossesb-4.10.build.archive.root}/install" target="deploy">
+ <property name="org.jboss.esb.server.home" value="${unzip.dest}/${jboss51.build.name}-riftsaw-2.3.0.Final" />
+ <property name="org.jboss.esb.server.config" value="default" />
+ </ant>
+ </target>
+ <target name="install-riftsaw" >
+ <property file="../riftsaw-2.3.0.Final/build.properties" prefix="riftsaw-2.3.0.Final" />
+ <ant dir="${unzip.dest}/${riftsaw-2.3.0.Final.build.archive.root}/install" target="deploy">
+ <property name="org.jboss.as.home" value="${unzip.dest}/${jboss51.build.name}-riftsaw-2.3.0.Final" />
+ <property name="org.jboss.as.config" value="default" />
+ <property name="org.jboss.esb.home" value="${unzip.dest}/${jbossesb.build.archive.root}" />
+ <property name="databasev" value="hsql" />
+ <property name="ws.version" value="3.4.0.GA" />
+
+ </ant>
+ </target>
+
+
+</project>
12 years, 8 months
JBoss Tools SVN: r40946 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console: workbench and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2012-05-11 04:01:15 -0400 (Fri, 11 May 2012)
New Revision: 40946
Added:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/Messages.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ProjectCompilerVersionChecker.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/messages.properties
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/ExecuteQueryAction.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConsoleConfigurationWorkbenchAdapter.java
Log:
https://issues.jboss.org/browse/JBIDE-11773
Warn user about the problem with JDK levels
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/ExecuteQueryAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/ExecuteQueryAction.java 2012-05-11 06:33:15 UTC (rev 40945)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/ExecuteQueryAction.java 2012-05-11 08:01:15 UTC (rev 40946)
@@ -31,6 +31,7 @@
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.QueryEditor;
import org.hibernate.eclipse.console.utils.EclipseImages;
+import org.hibernate.eclipse.console.workbench.ProjectCompilerVersionChecker;
/**
* @author max
@@ -65,21 +66,23 @@
if (cfg != null) {
//keep states of ConsoleConfiguration and HibernateExtension synchronized
if (!(cfg.isSessionFactoryCreated() && cfg.getHibernateExtension().isSessionFactoryCreated())) {
- if (queryEditor.askUserForConfiguration(cfg.getName())) {
- if (!(cfg.hasConfiguration() && cfg.getHibernateExtension().hasConfiguration())) {
- try {
- cfg.build();
- } catch (HibernateException he) {
- HibernateConsolePlugin.getDefault().showError(
- HibernateConsolePlugin.getShell(),
- HibernateConsoleMessages.LoadConsoleCFGCompletionProposal_could_not_load_configuration +
- ' ' + cfg.getName(), he);
- }
+ if (ProjectCompilerVersionChecker.validateProjectComplianceLevel(cfg)){
+ if (queryEditor.askUserForConfiguration(cfg.getName())) {
+ if (!(cfg.hasConfiguration() && cfg.getHibernateExtension().hasConfiguration())) {
+ try {
+ cfg.build();
+ } catch (HibernateException he) {
+ HibernateConsolePlugin.getDefault().showError(
+ HibernateConsolePlugin.getShell(),
+ HibernateConsoleMessages.LoadConsoleCFGCompletionProposal_could_not_load_configuration +
+ ' ' + cfg.getName(), he);
+ }
+ }
+ if (cfg.hasConfiguration() && cfg.getHibernateExtension().hasConfiguration()) {
+ cfg.buildSessionFactory();
+ queryEditor.executeQuery(cfg);
+ }
}
- if (cfg.hasConfiguration() && cfg.getHibernateExtension().hasConfiguration()) {
- cfg.buildSessionFactory();
- queryEditor.executeQuery(cfg);
- }
}
} else {
queryEditor.executeQuery(cfg);
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConsoleConfigurationWorkbenchAdapter.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConsoleConfigurationWorkbenchAdapter.java 2012-05-11 06:33:15 UTC (rev 40945)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConsoleConfigurationWorkbenchAdapter.java 2012-05-11 08:01:15 UTC (rev 40946)
@@ -32,8 +32,11 @@
public class ConsoleConfigurationWorkbenchAdapter extends BasicWorkbenchAdapter {
- public Object[] getChildren(Object o) {
+ public Object[] getChildren(Object o) {
final ConsoleConfiguration ccfg = getConsoleConfiguration( o );
+ if (!ProjectCompilerVersionChecker.validateProjectComplianceLevel(ccfg)){
+ return new Object[0];
+ }
//String sfError = null;
if(!ccfg.hasConfiguration()) {
ccfg.build();
Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/Messages.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/Messages.java (rev 0)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/Messages.java 2012-05-11 08:01:15 UTC (rev 40946)
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.hibernate.eclipse.console.workbench;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * @author Dmitry Geraskov (geraskov(a)gmail.com)
+ *
+ */
+public class Messages extends NLS {
+ private static final String BUNDLE_NAME = "org.hibernate.eclipse.console.workbench.messages"; //$NON-NLS-1$
+ public static String ProjectCompilerVersionChecker_title;
+ public static String ProjectCompilerVersionChecker_message;
+ static {
+ // initialize resource bundle
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ private Messages() {
+ }
+}
Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ProjectCompilerVersionChecker.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ProjectCompilerVersionChecker.java (rev 0)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ProjectCompilerVersionChecker.java 2012-05-11 08:01:15 UTC (rev 40946)
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.hibernate.eclipse.console.workbench;
+
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.widgets.Display;
+import org.hibernate.console.ConsoleConfiguration;
+import org.hibernate.eclipse.console.utils.ProjectUtils;
+
+/**
+ * @author Dmitry Geraskov (geraskov(a)gmail.com)
+ *
+ */
+@SuppressWarnings("restriction")
+public class ProjectCompilerVersionChecker {
+
+ /**
+ *
+ * @param ccfg
+ * @return false if Projects jdk version is bigger than Eclipse jdk version
+ */
+ public static boolean validateProjectComplianceLevel(final ConsoleConfiguration ccfg){
+ IJavaProject[] javaProjects = ProjectUtils.findJavaProjects(ccfg);
+ if (javaProjects.length > 0){
+ for (final IJavaProject iJavaProject : javaProjects) {
+ if (iJavaProject.exists()) {
+ String projectTarget = iJavaProject.getOption(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, true);
+ String eclipseCompilerVersion = System.getProperty("java.specification.version"); //$NON-NLS-1$
+ long projectJdkLevel = CompilerOptions.versionToJdkLevel(projectTarget);
+ long eclipseJdkLevel = CompilerOptions.versionToJdkLevel(eclipseCompilerVersion);
+ if (eclipseJdkLevel <= projectJdkLevel){
+ Display.getDefault().syncExec(new Runnable(){
+ @Override
+ public void run() {
+ MessageDialog.openWarning(null, Messages.ProjectCompilerVersionChecker_title,
+ NLS.bind(Messages.ProjectCompilerVersionChecker_message, iJavaProject.getElementName()));
+ }
+ });
+ return false;
+ }
+ }
+ }
+ }
+ return true;
+ }
+}
Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/messages.properties
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/messages.properties (rev 0)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/messages.properties 2012-05-11 08:01:15 UTC (rev 40946)
@@ -0,0 +1,2 @@
+ProjectCompilerVersionChecker_title=Wrong Compiler Settings
+ProjectCompilerVersionChecker_message=Project ''{0}'' has higher compiler option than running Eclipse. Hibernate plugins unable to load its classes. Please decrease the compiler option or run the Eclipse with higher JDK level
12 years, 8 months
JBoss Tools SVN: r40945 - trunk/openshift/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-05-11 02:33:15 -0400 (Fri, 11 May 2012)
New Revision: 40945
Modified:
trunk/openshift/docs/reference/en-US/Book_Info.xml
Log:
updated for brew
Modified: trunk/openshift/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/openshift/docs/reference/en-US/Book_Info.xml 2012-05-11 06:32:49 UTC (rev 40944)
+++ trunk/openshift/docs/reference/en-US/Book_Info.xml 2012-05-11 06:33:15 UTC (rev 40945)
@@ -13,7 +13,7 @@
<edition>5.0.0</edition>
- <pubsnumber>7</pubsnumber>
+ <pubsnumber>8</pubsnumber>
<abstract>
<para>
12 years, 8 months
JBoss Tools SVN: r40944 - 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: xcoulon
Date: 2012-05-11 02:32:49 -0400 (Fri, 11 May 2012)
New Revision: 40944
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java
Log:
Rejected - JBIDE-10305
The username should get selected when you click into the Username text field
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2012-05-11 06:30:46 UTC (rev 40943)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2012-05-11 06:32:49 UTC (rev 40944)
@@ -87,7 +87,6 @@
rhLoginText = new Text(container, SWT.BORDER);
GridDataFactory.fillDefaults()
.align(SWT.FILL, SWT.CENTER).grab(true, false).span(1, 1).applyTo(rhLoginText);
- UIUtils.selectAllOnFocus(rhLoginText);
final IObservableValue rhLoginObservable =
BeanProperties.value(CredentialsWizardPageModel.PROPERTY_RHLOGIN).observe(pageModel);
dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(rhLoginText), rhLoginObservable);
@@ -99,7 +98,6 @@
passwordText = new Text(container, SWT.BORDER | SWT.PASSWORD);
GridDataFactory.fillDefaults()
.align(SWT.FILL, SWT.CENTER).grab(true, false).span(1, 1).applyTo(passwordText);
- UIUtils.selectAllOnFocus(passwordText);
final IObservableValue passwordModelObservable =
BeanProperties.value(CredentialsWizardPageModel.PROPERTY_PASSWORD).observe(pageModel);
final ISWTObservableValue passwordTextObservable = WidgetProperties.text(SWT.Modify).observe(passwordText);
12 years, 8 months
JBoss Tools SVN: r40943 - in trunk/openshift/docs/reference/en-US: images/Creating_an_OpenShift_Express_Application and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-05-11 02:30:46 -0400 (Fri, 11 May 2012)
New Revision: 40943
Removed:
trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_04.png
trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_05a.png
Modified:
trunk/openshift/docs/reference/en-US/Creating_an_OpenShift_Express_Application.xml
trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_03.png
trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_05.png
trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_06.png
trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_07.png
Log:
update to new openshift tooling info in progress
Modified: trunk/openshift/docs/reference/en-US/Creating_an_OpenShift_Express_Application.xml
===================================================================
--- trunk/openshift/docs/reference/en-US/Creating_an_OpenShift_Express_Application.xml 2012-05-11 00:56:21 UTC (rev 40942)
+++ trunk/openshift/docs/reference/en-US/Creating_an_OpenShift_Express_Application.xml 2012-05-11 06:30:46 UTC (rev 40943)
@@ -35,51 +35,35 @@
</mediaobject>
</figure>
<para>
- If you have already signed up for an OpenShift account then you can input your <guilabel>Username</guilabel> and <guilabel>Password</guilabel> here and click the <guibutton>Next</guibutton> button. If validation is successful you will see the <guilabel>Setup OpenShift Application<guilabel> screen.
+ If you have already signed up for an OpenShift account then you can input your <guilabel>Username</guilabel> and <guilabel>Password</guilabel> here and click the <guibutton>Next</guibutton> button. If validation is successful you will see the <guilabel>Setup OpenShift Application</guilabel> screen.
</para>
<para>
If you do not have an OpenShift account, you can create one through the link at the top of the wizard screen. This will open the OpenShift sign-up page within your workbench. Once you have created an account you will need to relaunch the <guilabel>OpenShift Application</guilabel> wizard and input your new username and password.
</para>
<figure id="application_creation_03">
- <title>Setting the domain name</title>
+ <title>Creating a domain</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_03.png" format="PNG" />
</imageobject>
<textobject>
<phrase>
- Creating a domain name or inserting one that already exists for your OpenShift account.
+ Creating a domain for your OpenShift account.
</phrase>
</textobject>
</mediaobject>
</figure>
<para>
- If you already have a domain name then you can type this into the <guilabel>Domain name</guilabel> field.
+ If you need to create a domain, type the name you wish to have into the <guilabel>Domain name</guilabel> field. You will also need to provide your public SSH key. Ensure that the paired private key is listed within the SSH2 Preferences. If you are unsure, click the <guilabel>SSH2 Preferences</guilabel> link. Click <guibutton>Finish</guibutton> to complete domain creation.
</para>
<para>
- If you need to create a domain, type the name you wish to have into the <guilabel>Domain name</guilabel> field and click the <guibutton>Create</guibutton> button. After clicking <guibutton>Create</guibutton>, you will need to provide your public SSH key. You will need to ensure that the paired private key is listed within the SSH2 Preferences. If you are unsure, click the <guilabel>SSH2 Preferences</guilabel> link in the window. Click <guibutton>Finish</guibutton> to complete domain creation.
+ If you already have a domain name then you will not see the <guilabel>Domain Creation</guilabel> screen.
</para>
- <figure id="application_creation_04">
- <title>Creating a domain name</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_04.png" format="PNG" />
- </imageobject>
- <textobject>
- <phrase>
- Going through the process of creating a domain name.
- </phrase>
- </textobject>
- </mediaobject>
- </figure>
<note>
<para>
- If you ever wish to rename your domain, you can do so by changing the name as it appears in the <guilabel>Domain name</guilabel> field and then click <guibutton>Rename</guibutton>.
+ If you ever wish to rename your domain, this can be done through the <guilabel>OpenShift Explorer</guilabel>. <!--put xref here -->
</para>
</note>
- <para>
- Click the <guibutton>New</guibutton> button in the <guilabel>Available Applications</guilabel> section of the wizard to begin creating your first OpenShift application, for the specified domain.
- </para>
<figure id="application_creation_05">
<title>Creating a new OpenShift application</title>
<mediaobject>
@@ -94,105 +78,55 @@
</mediaobject>
</figure>
<para>
- You will need to specify a name for the application and the platform to deploy for, from the <guilabel>Cartdige</guilabel> drop-down list. Click the <guibutton>Next</guibutton> to embedd cartridges or click <guibutton>Finish</guibutton> to create the application.
+ Now ready to create your OpenShift application, you will need to specify a name, the platform type to deploy for, from the <guilabel>Type</guilabel> drop-down list, and the <guilabel>Gear profile</guilabel> to be used. <!--Further gear profile information to go here-->
</para>
<note>
<para>
No underscores or special characters are allowed in the application name.
</para>
</note>
- <figure id="application_creation_05a">
- <title>Embed Cartridges</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_05a.png" format="PNG" />
- </imageobject>
- <textobject>
- <phrase>
- Choosing which cartridges to embed within the application.
- </phrase>
- </textobject>
- </mediaobject>
- </figure>
<para>
- If you clicked <guibutton>Next</guibutton>, you will now see the <guilabel>Embed Cartridges</guilabel> screen. From here you can choose to embed any numbe rof cartridges, or none. Once you have finished your selection click <guibutton>Finish</guibutton>.
+ You can also select to embed cartridges into your applicaiton. By embedding a cartridge, you allow your application the ability to use the asociated technology. For example, embedding the <guilabel>mysql</guilabel> cartridge will grant your application the capability to use a MySQL database.
</para>
- <note>
- <para>
- The <guilabel>Embed Cartridges</guilabel> screen can also be access by highlighting a project in the <guilabel>Available Applications</guilabel> section of the <guilabel>Application Selection</guilabel> screen and clicking on the <guibutton>Edit</guibutton> button. To embed your application with a cartridge is to grant the capability to your application. For example, embedding the <guilabel>mysql</guilabel> cartridge will grant your application the capability to use a MySQL database.
- </para>
- </note>
<figure id="application_creation_06">
- <title>Created application availability</title>
+ <title>Application setup</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_06.png" format="PNG" />
</imageobject>
<textobject>
<phrase>
- The created application is now available in the Available Applications section.
+ Configuring the project and server adaptor settings.
</phrase>
</textobject>
</mediaobject>
</figure>
<para>
- You can select an available application by clicking on it in the <guilabel>Available Applications</guilabel> section of the window. Having selected an application, you can now <guibutton>Delete</guibutton> or view the details of the application by clicking the <guibutton>Details</guibutton>; try that now.
+ Since you are creating a new project, leave the <guilabel>Create a new project</guilabel> checkbox ticked.
</para>
- <figure id="application_creation_07">
- <title>Application details</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_07.png" format="PNG" />
- </imageobject>
- <textobject>
- <phrase>
- The details screen for the application.
- </phrase>
- </textobject>
- </mediaobject>
- </figure>
<para>
- The <guilabel>Application Details</guilabel> will provide you with all the information available concenring the application. To close this window and return to the previous window, click <guibutton>OK</guibutton>.
+ For easy interaction with the OpenShift server and your domain it is recommended that you leave the <guilabel>Create and setup a server for easy publishing</guilabel> checkbox ticked. Doing so will create an OpenShift server instance in the <guilabel>Servers</guilabel> view, upon completing the wizard.
</para>
- <figure id="application_creation_06b">
- <title>Application availability</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_06.png" format="PNG" />
- </imageobject>
- <textobject>
- <phrase>
- Having returned to the previous screen, we can see that the application is still available.
- </phrase>
- </textobject>
- </mediaobject>
- </figure>
<para>
- Click the <guibutton>Next</guibutton> to proceed to the next screen.
+ Click the <guibutton>Next</guibutton> button to progress in the wizard.
</para>
- <figure id="application_creation_08">
- <title>Cloned Git Repository</title>
+ <figure id="application_creation_07">
+ <title>Cloning settings</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_08.png" format="PNG" />
+ <imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_07.png" format="PNG" />
</imageobject>
<textobject>
<phrase>
- Cloning the project from the Git repository and creating the JBoss Server adapter.
+ Clone settings for the project from the Git repository.
</phrase>
</textobject>
</mediaobject>
</figure>
<para>
- The final screen of the <guilabel>OpenShift application wizard</guilabel> specifies <guilabel>Git clone</guilabel> settings and <guilabel>JBoss Server adapter</guilabel> options.
+ The final screen of the <guilabel>OpenShift application wizard</guilabel> specifies <guilabel>Cloning settings</guilabel>. Here you can set the properties for creating a local copy of your application. The <guilabel>Location</guilabel> and <guilabel>Remote name</guilabel> options will be set to automatically, however you are able to change these by deselecting the <property>default</property> option and specifying custom settings in the fields provided.
</para>
<para>
- In the <guilabel>Git clone</guilabel> section of the window sets the properties for creating a local copy of your application for you to work with. The location of your application in the Git repository of your domain is present in the <guilabel>Cloning From</guilabel> field. The <guilabel>Destination</guilabel> and <guilabel>Remote name</guilabel> options will be set to default automatically, however you are able to change these by deselecting the <property>default</property> option and specifying custom settings in the fields provided.
- </para>
- <para>
- The <guilabel>JBoss Server adapter</guilabel> section of the window will have the option to <property>Create a JBoss server adapter</property> selected automatically. Creating a JBoss server adapter will allow you to publish changes you make to your application, back to your OpenShift domain.
- </para>
- <para>
Click the <guibutton>Finish</guibutton> to begin the cloning of the Git repository.
</para>
<figure id="application_creation_09">
@@ -209,7 +143,7 @@
</mediaobject>
</figure>
<para>
- After the Git repository has been cloned, you will see a new <guilabel>Git Repositories</guilabel> tab appear near the bottom of your workbench. If you do not see the tab you can open it manually by navigating to <menuchoice><guimenuitem>Window</guimenuitem><guimenuitem>Show View</guimenuitem><guimenuitem>Other</guimenuitem><guimenuitem>Git</guimenuitem><guimenuitem>Git Repositories</guimenuitem></menuchoice>. With the <guilabel>Git Repositories</guilabel> option selected, click <guibutton>OK</guibutton>.
+ After the Git repository has been cloned, it will be available through the <guilabel>Git Repositories</guilabel> view. You can open it by navigating to <menuchoice><guimenuitem>Window</guimenuitem><guimenuitem>Show View</guimenuitem><guimenuitem>Other</guimenuitem><guimenuitem>Git</guimenuitem><guimenuitem>Git Repositories</guimenuitem></menuchoice>. With the <guilabel>Git Repositories</guilabel> option selected, click <guibutton>OK</guibutton>.
</para>
<figure id="application_creation_10">
<title>Project in Package Explorer</title>
Modified: trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_03.png
===================================================================
(Binary files differ)
Deleted: trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_04.png
===================================================================
(Binary files differ)
Modified: trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_05.png
===================================================================
(Binary files differ)
Deleted: trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_05a.png
===================================================================
(Binary files differ)
Modified: trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_06.png
===================================================================
(Binary files differ)
Modified: trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_07.png
===================================================================
(Binary files differ)
12 years, 8 months