JBoss Tools SVN: r36792 - trunk/download.jboss.org/jbosstools/examples.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-11-30 12:27:02 -0500 (Wed, 30 Nov 2011)
New Revision: 36792
Modified:
trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.M...
Log:
Update compatible runtimes to AS 7.1
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.M...
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.M... 2011-11-30 16:49:25 UTC (rev 36791)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.M... 2011-11-30 17:27:02 UTC (rev 36792)
@@ -50,8 +50,8 @@
<url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas7-examp...</url>
<fixes>
<fix type="wtpruntime">
- <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70</property>
- <property name="description">This project example requires JBoss AS 7.0</property>
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.71</property>
+ <property name="description">This project example requires JBoss AS 7.0/7.1</property>
<property name="downloadId">org.jboss.tools.runtime.core.as.702</property>
</fix>
<fix type="plugin">
@@ -95,8 +95,8 @@
<url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas7-examp...</url>
<fixes>
<fix type="wtpruntime">
- <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70</property>
- <property name="description">This project example requires JBoss AS 7.0</property>
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.71</property>
+ <property name="description">This project example requires JBoss AS 7.0/7.1</property>
<property name="downloadId">org.jboss.tools.runtime.core.as.702</property>
</fix>
<fix type="plugin">
@@ -136,8 +136,8 @@
<url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas7-examp...</url>
<fixes>
<fix type="wtpruntime">
- <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70</property>
- <property name="description">This project example requires JBoss AS 7.0</property>
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.71</property>
+ <property name="description">This project example requires JBoss AS 7.0/7.1</property>
<property name="downloadId">org.jboss.tools.runtime.core.as.702</property>
</fix>
<fix type="plugin">
@@ -177,8 +177,8 @@
<url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas7-examp...</url>
<fixes>
<fix type="wtpruntime">
- <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70</property>
- <property name="description">This project example requires JBoss AS 7.0</property>
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.71</property>
+ <property name="description">This project example requires JBoss AS 7.0/7.1</property>
<property name="downloadId">org.jboss.tools.runtime.core.as.702</property>
</fix>
<fix type="plugin">
@@ -219,8 +219,8 @@
<url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas7-examp...</url>
<fixes>
<fix type="wtpruntime">
- <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70</property>
- <property name="description">This project example requires JBoss AS 7.0</property>
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.71</property>
+ <property name="description">This project example requires JBoss AS 7.0/7.1</property>
<property name="downloadId">org.jboss.tools.runtime.core.as.702</property>
</fix>
<fix type="plugin">
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r36791 - in trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples: wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-11-30 11:49:25 -0500 (Wed, 30 Nov 2011)
New Revision: 36791
Modified:
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/messages.properties
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/MavenArtifactHelper.java
Log:
JBIDE-10209 : updated error message if enterprise repo is unavailable
Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/messages.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/messages.properties 2011-11-30 16:26:11 UTC (rev 36790)
+++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/messages.properties 2011-11-30 16:49:25 UTC (rev 36791)
@@ -5,4 +5,4 @@
ArchetypeExamplesWizardFirstPage_ProjectName_Label=Project name
ArchetypeExamplesWizardFirstPage_Target_Runtime_Label=Target Runtime
ArchetypeExamplesWizardFirstPage_Title=Create a new Java EE project
-ArchetypeExamplesWizardFirstPage_Unresolved_Enterprise_Repo=Artifacts needed from JBoss Enterprise Maven repository do not seem to be available.\nThis might cause build problems. Follow this <a href=\"http://community.jboss.org/wiki/SettingUpTheJBossEnterpriseRepositories\">link</a> for more details.
+ArchetypeExamplesWizardFirstPage_Unresolved_Enterprise_Repo={0} cannot be found.\n This indicates you do not have access to a JBoss Enterprise Maven repository.\n This can cause build problems. Follow this <a href\="http\://community.jboss.org/wiki/SettingUpTheJBossEnterpriseRepositories">link</a> for more details.
Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java 2011-11-30 16:26:11 UTC (rev 36790)
+++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java 2011-11-30 16:49:25 UTC (rev 36791)
@@ -32,6 +32,7 @@
import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
import org.eclipse.m2e.core.project.ProjectImportConfiguration;
import org.eclipse.m2e.core.ui.internal.wizards.MavenProjectWizardLocationPage;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -268,7 +269,7 @@
warningImg.setImage(JFaceResources.getImage(Dialog.DLG_IMG_MESSAGE_WARNING));
Link link = new Link(warningLink, SWT.NONE);
- link.setText(Messages.ArchetypeExamplesWizardFirstPage_Unresolved_Enterprise_Repo);
+ link.setText(NLS.bind(Messages.ArchetypeExamplesWizardFirstPage_Unresolved_Enterprise_Repo, MavenArtifactHelper.ENTERPRISE_JBOSS_SPEC));
link.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/MavenArtifactHelper.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/MavenArtifactHelper.java 2011-11-30 16:26:11 UTC (rev 36790)
+++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/MavenArtifactHelper.java 2011-11-30 16:49:25 UTC (rev 36791)
@@ -23,14 +23,17 @@
public class MavenArtifactHelper {
+ public static final String ENTERPRISE_JBOSS_SPEC = "org.jboss.spec:jboss-javaee-web-6.0:3.0.0.Beta1-redhat-1"; //$NON-NLS-1$
+
+ private static final String ENTERPRISE_JBOSS_SPEC_KEYSTRING = ENTERPRISE_JBOSS_SPEC+"::"; //$NON-NLS-1$
+
/**
* Checks if the EAP repository is available
*
* @return true if org.jboss.spec:jboss-javaee-web-6.0:3.0.0.Beta1-redhat-1 can be resolved
*/
public static boolean isEnterpriseRepositoryAvailable() {
- String keyString = "org.jboss.spec:jboss-javaee-web-6.0:3.0.0.Beta1-redhat-1::"; //$NON-NLS-1$
- boolean isRepoAvailable = isArtifactAvailable(keyString, "pom"); //$NON-NLS-1$
+ boolean isRepoAvailable = isArtifactAvailable(ENTERPRISE_JBOSS_SPEC_KEYSTRING, "pom"); //$NON-NLS-1$
return isRepoAvailable;
}
@@ -49,10 +52,10 @@
ArtifactKey key = ArtifactKey.fromPortableString(artifactKey);
Artifact a = MavenPlugin.getMaven().resolve(
key.getGroupId(), key.getArtifactId(), key.getVersion(),
- type, key.getClassifier(), repos, nullProgressMonitor); //$NON-NLS-1$
+ type, key.getClassifier(), repos, nullProgressMonitor);
isRepoAvailable = a != null && a.isResolved();
} catch (CoreException e) {
- e.printStackTrace();
+ System.err.println(e.getLocalizedMessage());
}
return isRepoAvailable;
}
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r36790 - trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-11-30 11:26:11 -0500 (Wed, 30 Nov 2011)
New Revision: 36790
Modified:
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java
Log:
Add history to the projectName combo
Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java 2011-11-30 16:06:16 UTC (rev 36789)
+++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java 2011-11-30 16:26:11 UTC (rev 36790)
@@ -95,6 +95,7 @@
projectNameLabel.setText(Messages.ArchetypeExamplesWizardFirstPage_ProjectName_Label);
projectNameCombo = new Combo(container, SWT.BORDER);
projectNameCombo.setLayoutData(gridData);
+ addFieldWithHistory("projectNameCombo", projectNameCombo);//$NON-NLS-1$
projectNameCombo.addModifyListener(new ModifyListener() {
@Override
public void modifyText(ModifyEvent e) {
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r36789 - in trunk: central/plugins/org.jboss.tools.central/icons and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-11-30 11:06:16 -0500 (Wed, 30 Nov 2011)
New Revision: 36789
Added:
trunk/central/plugins/org.jboss.tools.central/icons/ear-wiz-icon.gif
trunk/central/plugins/org.jboss.tools.central/icons/html5.png
trunk/central/plugins/org.jboss.tools.central/icons/newprj_wiz.gif
trunk/central/plugins/org.jboss.tools.central/icons/newwebprj_wiz.gif
trunk/central/plugins/org.jboss.tools.central/icons/rf_logo.png
trunk/central/plugins/org.jboss.tools.central/icons/spring_wiz.gif
trunk/central/plugins/org.jboss.tools.central/icons/web_application.gif
Modified:
trunk/central/plugins/org.jboss.tools.central/plugin.xml
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java
trunk/central/plugins/org.jboss.tools.community.central/plugin.xml
trunk/examples/plugins/org.jboss.tools.community.project.examples/plugin.xml
trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml
Log:
JBIDE-10053 : Move current JavaEE 6 archetypes in JBoss Central to the create Project section. This is a bad hack which consists in using a hardcoded Tutorial collection and add it directly in the "Create Project" section. Hopefully, once JBIDE-10264 (wizardify project examples) is done, we'll be able to use wizard ids directly and remove the current hack.
Added: trunk/central/plugins/org.jboss.tools.central/icons/ear-wiz-icon.gif
===================================================================
(Binary files differ)
Property changes on: trunk/central/plugins/org.jboss.tools.central/icons/ear-wiz-icon.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/central/plugins/org.jboss.tools.central/icons/html5.png
===================================================================
(Binary files differ)
Property changes on: trunk/central/plugins/org.jboss.tools.central/icons/html5.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/central/plugins/org.jboss.tools.central/icons/newprj_wiz.gif
===================================================================
(Binary files differ)
Property changes on: trunk/central/plugins/org.jboss.tools.central/icons/newprj_wiz.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/central/plugins/org.jboss.tools.central/icons/newwebprj_wiz.gif
===================================================================
(Binary files differ)
Property changes on: trunk/central/plugins/org.jboss.tools.central/icons/newwebprj_wiz.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/central/plugins/org.jboss.tools.central/icons/rf_logo.png
===================================================================
(Binary files differ)
Property changes on: trunk/central/plugins/org.jboss.tools.central/icons/rf_logo.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/central/plugins/org.jboss.tools.central/icons/spring_wiz.gif
===================================================================
(Binary files differ)
Property changes on: trunk/central/plugins/org.jboss.tools.central/icons/spring_wiz.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/central/plugins/org.jboss.tools.central/icons/web_application.gif
===================================================================
(Binary files differ)
Property changes on: trunk/central/plugins/org.jboss.tools.central/icons/web_application.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/central/plugins/org.jboss.tools.central/plugin.xml
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/plugin.xml 2011-11-30 15:46:51 UTC (rev 36788)
+++ trunk/central/plugins/org.jboss.tools.central/plugin.xml 2011-11-30 16:06:16 UTC (rev 36789)
@@ -208,4 +208,56 @@
</image>
</extension>
+ <extension
+ point="org.jboss.tools.central.tutorials">
+ <category
+ id="org.jboss.tools.central.javaee6.quickstart"
+ name="Java EE Archetypes"
+ priority="1" />
+ <tutorial
+ id="org.jboss.tools.central.jbossas.quickstart.jbossJavaee6Webapp"
+ categoryId="org.jboss.tools.central.javaee6.quickstart"
+ name="Java EE Web Project"
+ type="projectExample"
+ priority="1"
+ icon="icons/newwebprj_wiz.gif"
+ reference="Java EE 6 Quickstarts::jboss-javaee6-webapp"/>
+
+ <tutorial
+ id="org.jboss.tools.central.jbossas.quickstart.jbossJavaee6Ear"
+ categoryId="org.jboss.tools.central.javaee6.quickstart"
+ name="Java EE Project"
+ type="projectExample"
+ priority="2"
+ icon="icons/ear-wiz-icon.gif"
+ reference="Java EE 6 Quickstarts::multi-javaee6-archetype"/>
+
+ <tutorial
+ id="org.jboss.tools.central.jbossas.quickstart.jbossJavaee6Poh5"
+ categoryId="org.jboss.tools.central.javaee6.quickstart"
+ name="HTML5 Project"
+ type="projectExample"
+ priority="3"
+ icon="icons/html5.png"
+ reference="Java EE 6 Quickstarts::jboss-javaee6-poh5-archetype"/>
+
+ <tutorial
+ id="org.jboss.tools.central.jbossas.quickstart.jbossJavaee6SpringMvc"
+ categoryId="org.jboss.tools.central.javaee6.quickstart"
+ name="Spring MVC Project"
+ type="projectExample"
+ priority="4"
+ icon="icons/spring_wiz.gif"
+ reference="Java EE 6 Quickstarts::spring-mvc-webapp"/>
+
+ <tutorial
+ id="org.jboss.tools.central.jbossas.quickstart.jbossJavaee6Richfaces"
+ categoryId="org.jboss.tools.central.javaee6.quickstart"
+ name="RichFaces Project"
+ type="projectExample"
+ priority="5"
+ icon="icons/rf_logo.png"
+ reference="Java EE 6 Quickstarts::richfaces-archetype-simpleapp"/>
+ </extension>
+
</plugin>
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java 2011-11-30 15:46:51 UTC (rev 36788)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java 2011-11-30 16:06:16 UTC (rev 36789)
@@ -66,9 +66,10 @@
List<String> wizardIds = new ArrayList<String>();
//wizardIDs.add("org.jboss.ide.eclipse.as.openshift.express.ui.wizard.NewServerAdapter");
wizardIds.add("org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard");
- wizardIds.add("org.jboss.tools.seam.ui.wizards.SeamProjectWizard");
- wizardIds.add("org.eclipse.m2e.core.wizards.Maven2ProjectWizard");
- wizardIds.add(JBossCentralActivator.NEW_PROJECT_EXAMPLES_WIZARD_ID);
+ //wizardIds.add("org.jboss.tools.seam.ui.wizards.SeamProjectWizard");
+ //wizardIds.add("org.eclipse.m2e.core.wizards.Maven2ProjectWizard");
+ //wizardIds.add(JBossCentralActivator.NEW_PROJECT_EXAMPLES_WIZARD_ID);
+ wizardIds.add("org.jboss.ide.eclipse.as.openshift.express.ui.wizard.NewServerAdapter");
return wizardIds;
}
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java 2011-11-30 15:46:51 UTC (rev 36788)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java 2011-11-30 16:06:16 UTC (rev 36789)
@@ -39,7 +39,6 @@
import org.eclipse.jface.action.ToolBarManager;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.preference.PreferenceDialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.JFaceColors;
import org.eclipse.jface.resource.JFaceResources;
@@ -72,7 +71,6 @@
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
-import org.eclipse.ui.dialogs.PreferencesUtil;
import org.eclipse.ui.forms.IFormColors;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.editor.FormEditor;
@@ -115,6 +113,7 @@
*/
public class GettingStartedPage extends AbstractJBossCentralPage {
+ private static final String ORG_JBOSS_TOOLS_CENTRAL_JAVAEE6_QUICKSTART = "org.jboss.tools.central.javaee6.quickstart";
private static final String NEWS_WARNING_ID = "org.jboss.tools.central.newsWarning";
private static final String BLOGS_WARNING_ID = "org.jboss.tools.central.blogsWarning";
@@ -163,6 +162,7 @@
private ToolBarManager newsToolBarManager;
private ToolBarManager blogsToolBarManager;
private Action blogsWarning;
+ private boolean newProjectsInitialized;
public GettingStartedPage(FormEditor editor) {
super(editor, ID, "Getting Started");
@@ -658,7 +658,22 @@
IStatus.ERROR, "Cannot create extension" ,e));
}
}
-
+
+ private void displayTutorialLinks(final TutorialCategory category, final Composite composite, boolean addTooltips) {
+ for (final Tutorial tutorial:category.getTutorials()) {
+ Project project = tutorial.getProjectExamples();
+ if (project == null) {
+ continue;
+ }
+
+ FormText tutorialText = toolkit.createFormText(composite, true);
+ configureTutorialText(tutorialText, tutorial);
+ if (addTooltips) {
+ hookTooltip(tutorialText, tutorial);
+ }
+ }
+ }
+
private static boolean isActive(Bundle bundle) {
if (bundle == null) {
return false;
@@ -875,13 +890,28 @@
showTutorials(categories);
}
+ @Deprecated
+ //This method should be removed once the EE6 archetypes are wizardified
+ private void updateNewProjects(TutorialCategory tutorialCategory) {
+ if (!newProjectsInitialized) {
+ if (tutorialCategory != null) {
+ newProjectsInitialized = true;
+ displayTutorialLinks(tutorialCategory, projectsComposite, false);
+ resize(true);
+ }
+ }
+ }
+
private void showTutorials(Map<String, TutorialCategory> categories) {
disposeChildren(tutorialsComposite);
- Collection<TutorialCategory> tempCategories = categories.values();
- List<TutorialCategory> sortedCategories = new ArrayList<TutorialCategory>();
- sortedCategories.addAll(tempCategories);
- Collections.sort(sortedCategories);
+ List<TutorialCategory> sortedCategories = getSortedCategories(categories);
for (final TutorialCategory category:sortedCategories) {
+ //TEMPORARY HACK FOR JBIDE-10053 (Java EE6 archetypes in the project section)
+ //Should be removed once these archetype tutorials are changed to use wizards as per JBIDE-10264
+ if (ORG_JBOSS_TOOLS_CENTRAL_JAVAEE6_QUICKSTART.equals(category.getId())) {
+ //bail
+ continue;
+ }
int style = ExpandableComposite.TITLE_BAR|ExpandableComposite.TWISTIE;
if (expandedCategories.contains(category)) {
style|=ExpandableComposite.EXPANDED;
@@ -914,15 +944,7 @@
}
});
- for (final Tutorial tutorial:category.getTutorials()) {
- Project project = tutorial.getProjectExamples();
- if (project == null) {
- continue;
- }
- FormText tutorialText = toolkit.createFormText(composite, true);
- configureTutorialText(tutorialText, tutorial);
- hookTooltip(tutorialText, tutorial);
- }
+ displayTutorialLinks(category, composite, true);
categoryComposite.setClient(composite);
String description = category.getDescription();
if (description != null && !description.isEmpty() && categoryComposite.getControl() != null) {
@@ -939,6 +961,15 @@
//recomputeScrollComposite(tutorialScrollComposite, tutorialPageBook);
}
+ private List<TutorialCategory> getSortedCategories(
+ Map<String, TutorialCategory> categories) {
+ Collection<TutorialCategory> tempCategories = categories.values();
+ List<TutorialCategory> sortedCategories = new ArrayList<TutorialCategory>();
+ sortedCategories.addAll(tempCategories);
+ Collections.sort(sortedCategories);
+ return sortedCategories;
+ }
+
private Font getBoldFont(Font font) {
if (categoryFont != null) {
return categoryFont;
@@ -1258,6 +1289,14 @@
public void run() {
setBusyIndicator(tutorialsLoadingComposite, false);
refreshTutorials();
+
+ //TEMPORARY HACK FOR JBIDE-10053 (Java EE6 archetypes in the project section)
+ //Should be removed once these archetype tutorials are changed to use wizards as per JBIDE-10264
+ RefreshTutorialsJob job = RefreshTutorialsJob.INSTANCE;
+ Map<String, TutorialCategory> categories = job.getTutorialCategories();
+ if (categories != null){
+ updateNewProjects(categories.get(ORG_JBOSS_TOOLS_CENTRAL_JAVAEE6_QUICKSTART));
+ }
}
});
Modified: trunk/central/plugins/org.jboss.tools.community.central/plugin.xml
===================================================================
--- trunk/central/plugins/org.jboss.tools.community.central/plugin.xml 2011-11-30 15:46:51 UTC (rev 36788)
+++ trunk/central/plugins/org.jboss.tools.community.central/plugin.xml 2011-11-30 16:06:16 UTC (rev 36789)
@@ -4,10 +4,6 @@
<extension
point="org.jboss.tools.central.tutorials">
<category
- id="org.jboss.tools.central.javaee6.quickstart"
- name="Java EE 6 Template Projects"
- priority="1" />
- <category
id="org.jboss.tools.central.jbossas.quickstart"
name="JBoss AS 7 Quickstarts"
description="These quickstarts are aimed to get you up to writing applications with minimal fuss. We recommend that you work through the quickstarts in the order they are presented in this guide, however if you have previous experience with Java EE 6, you may wish to skip some or all of the quickstarts."
@@ -53,51 +49,6 @@
priority="4"
icon="icons/jbossas7.png"
reference="JBoss AS 7 Quickstarts::kitchensink"/>
-
- <tutorial
- id="org.jboss.tools.central.jbossas.quickstart.jbossJavaee6Webapp"
- categoryId="org.jboss.tools.central.javaee6.quickstart"
- name="Java EE 6 WAR"
- type="projectExample"
- priority="1"
- icon="icons/jbossas7.png"
- reference="Java EE 6 Quickstarts::jboss-javaee6-webapp"/>
-
- <tutorial
- id="org.jboss.tools.central.jbossas.quickstart.jbossJavaee6Ear"
- categoryId="org.jboss.tools.central.javaee6.quickstart"
- name="Java EE 6 EAR"
- type="projectExample"
- priority="2"
- icon="icons/jbossas7.png"
- reference="Java EE 6 Quickstarts::multi-javaee6-archetype"/>
-
- <tutorial
- id="org.jboss.tools.central.jbossas.quickstart.jbossJavaee6Poh5"
- categoryId="org.jboss.tools.central.javaee6.quickstart"
- name="HTML5 Project"
- type="projectExample"
- priority="3"
- icon="icons/jbossas7.png"
- reference="Java EE 6 Quickstarts::jboss-javaee6-poh5-archetype"/>
-
- <tutorial
- id="org.jboss.tools.central.jbossas.quickstart.jbossJavaee6SpringMvc"
- categoryId="org.jboss.tools.central.javaee6.quickstart"
- name="Spring MVC"
- type="projectExample"
- priority="4"
- icon="icons/jbossas7.png"
- reference="Java EE 6 Quickstarts::spring-mvc-webapp"/>
-
- <tutorial
- id="org.jboss.tools.central.jbossas.quickstart.jbossJavaee6Richfaces"
- categoryId="org.jboss.tools.central.javaee6.quickstart"
- name="Richfaces Project"
- type="projectExample"
- priority="5"
- icon="icons/jbossas7.png"
- reference="Java EE 6 Quickstarts::richfaces-archetype-simpleapp"/>
<!--
<tutorial
id="org.jboss.tools.central.Seam.registration2"
Modified: trunk/examples/plugins/org.jboss.tools.community.project.examples/plugin.xml
===================================================================
--- trunk/examples/plugins/org.jboss.tools.community.project.examples/plugin.xml 2011-11-30 15:46:51 UTC (rev 36788)
+++ trunk/examples/plugins/org.jboss.tools.community.project.examples/plugin.xml 2011-11-30 16:06:16 UTC (rev 36789)
@@ -33,7 +33,8 @@
<extension
point="org.jboss.tools.project.examples.projectExamplesXml"
name="%JBoss_Tools_33_Community_Maven_Examples">
- <url>http://download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml</url>
+ <!-- TODO : rename to project-examples-maven-3.3.xml once M5 is out the door -->
+ <url>http://download.jboss.org/jbosstools/examples/project-examples-maven-3.3....</url>
<experimental>false</experimental>
</extension>
</plugin>
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml 2011-11-30 15:46:51 UTC (rev 36788)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml 2011-11-30 16:06:16 UTC (rev 36789)
@@ -69,4 +69,11 @@
<initializer class="org.jboss.tools.project.examples.preferences.ProjectExamplesPreferencesInitializer"/>
</extension>
+ <extension
+ point="org.jboss.tools.project.examples.projectExamplesXml"
+ name="Java EE Archetypes">
+ <url>http://download.jboss.org/jbosstools/examples/project-examples-shared-3.3...</url>
+ <experimental>false</experimental>
+ </extension>
+
</plugin>
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r36788 - 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: 2011-11-30 10:46:51 -0500 (Wed, 30 Nov 2011)
New Revision: 36788
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
Log:
cleanup (moved code block to its own method)
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-11-30 15:46:38 UTC (rev 36787)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-11-30 15:46:51 UTC (rev 36788)
@@ -158,20 +158,21 @@
}
}
- private List<IProject> importMavenProject(final File projectFolder, IProgressMonitor monitor)
- throws CoreException, InterruptedException {
- MavenProjectImportOperation mavenImport = new MavenProjectImportOperation(projectFolder);
- List<IProject> importedProjects = Collections.emptyList();
- if (mavenImport.isMavenProject()) {
- importedProjects = mavenImport.importToWorkspace(monitor);
- } else {
- importedProjects = new GeneralProjectImportOperation(projectFolder).importToWorkspace(monitor);
- }
- return importedProjects;
- }
}.schedule();
}
+ private List<IProject> importMavenProject(final File projectFolder, IProgressMonitor monitor)
+ throws CoreException, InterruptedException {
+ MavenProjectImportOperation mavenImport = new MavenProjectImportOperation(projectFolder);
+ List<IProject> importedProjects = Collections.emptyList();
+ if (mavenImport.isMavenProject()) {
+ importedProjects = mavenImport.importToWorkspace(monitor);
+ } else {
+ importedProjects = new GeneralProjectImportOperation(projectFolder).importToWorkspace(monitor);
+ }
+ return importedProjects;
+ }
+
private void connectToGitRepo(List<IProject> projects, File projectFolder, IProgressMonitor monitor)
throws CoreException {
File gitFolder = new File(projectFolder, Constants.DOT_GIT);
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r36787 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test: uiutils and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2011-11-30 10:46:38 -0500 (Wed, 30 Nov 2011)
New Revision: 36787
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIWizardHelper.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIRefactorWizard.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/DynamicWebProjectWizard.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/JSFWebProjectWizard.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/QuickFixDialogWizard.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/SpecifyBeanDialogWizard.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/XHTMLDialogWizard.java
Log:
SpecifyBeanDialogWizard created
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-11-30 15:46:17 UTC (rev 36786)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-11-30 15:46:38 UTC (rev 36787)
@@ -50,7 +50,7 @@
* JAVA=1.6,/space/java/sdk/jdk1.6.0_22
*
*
- * Suite duration: aprox. 28min
+ * Suite duration: aprox. 25min
*
* @author Lukas Jungmann
* @author Jaroslav Jankovic
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIWizardHelper.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIWizardHelper.java 2011-11-30 15:46:17 UTC (rev 36786)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIWizardHelper.java 2011-11-30 15:46:38 UTC (rev 36787)
@@ -62,6 +62,10 @@
public void createCDIComponentWithContent(CDIWizardType component, String name,
String packageName, String necessaryParam, String resource) {
createCDIComponent(component, name, packageName, necessaryParam);
+ if (!bot.activeEditor().getTitle().equals(name + ".java")) {
+ bot.editorByTitle(name + ".java").show();
+ setEd(bot.activeEditor().toTextEditor());
+ }
editResourceUtil.replaceClassContentByResource(CDIWizardHelper.class.
getResourceAsStream(resource), false);
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIRefactorWizard.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIRefactorWizard.java 2011-11-30 15:46:17 UTC (rev 36786)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIRefactorWizard.java 2011-11-30 15:46:38 UTC (rev 36787)
@@ -9,6 +9,8 @@
public class CDIRefactorWizard extends Wizard{
private List<String> affectedFiles;
+ private static final String NAMED_TEXT_LABEL = "@Named Bean Name";
+ private static final String RENAME_TEXT_LABEL = "Rename @Named Bean";
public CDIRefactorWizard() {
super(new SWTBot().activeShell().widget);
@@ -17,7 +19,7 @@
}
public CDIRefactorWizard setName(String name) {
- setText("@Named Bean Name", name);
+ setText(NAMED_TEXT_LABEL, name);
return this;
}
@@ -32,7 +34,7 @@
*/
public List<String> getAffectedFiles() {
String temp = null;
- for (SWTBotTreeItem ti : bot().tree().getTreeItem("Rename @Named Bean").getItems()) {
+ for (SWTBotTreeItem ti : bot().tree().getTreeItem(RENAME_TEXT_LABEL).getItems()) {
temp = ti.getText().split("-")[0];
affectedFiles.add(temp.substring(0, temp.length() - 1));
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/DynamicWebProjectWizard.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/DynamicWebProjectWizard.java 2011-11-30 15:46:17 UTC (rev 36786)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/DynamicWebProjectWizard.java 2011-11-30 15:46:38 UTC (rev 36787)
@@ -20,19 +20,24 @@
public class DynamicWebProjectWizard extends Wizard {
+ private static final String PROJECT_NAME = "Project name:";
+ private static final String CDI_PRESET = "Dynamic Web Project " +
+ "with CDI (Context and Dependency Injection)";
+ private static final String CDI_FACET = "CDI (Contexts and Dependency Injection)";
+
public DynamicWebProjectWizard() {
super(new SWTBot().activeShell().widget);
assert "New Dynamic Web Project".equals(getText());
}
public DynamicWebProjectWizard setProjectName(String name) {
- setText("Project name:", name);
+ setText(PROJECT_NAME, name);
return this;
}
public DynamicWebProjectWizard setCDIPreset() {
bot().comboBoxInGroup("Configuration", 0).
- setSelection("Dynamic Web Project with CDI (Context and Dependency Injection)");
+ setSelection(CDI_PRESET);
return this;
}
@@ -48,7 +53,7 @@
SWTBot facetsBot = bot.activeShell().bot();
SWTBotTree tree= facetsBot.tree();
for (SWTBotTreeItem ti: tree.getAllItems()) {
- if (ti.cell(0).contains("CDI (Contexts and Dependency Injection)")) {
+ if (ti.cell(0).contains(CDI_FACET)) {
ti.check();
break;
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/JSFWebProjectWizard.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/JSFWebProjectWizard.java 2011-11-30 15:46:17 UTC (rev 36786)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/JSFWebProjectWizard.java 2011-11-30 15:46:38 UTC (rev 36787)
@@ -17,24 +17,29 @@
public class JSFWebProjectWizard extends Wizard {
+ private static final String JSF_NEW_PROJECT_LABEL = "New JSF Project";
+ private static final String JSF_PROJECT_NAME_LABEL = "Project Name*";
+ private static final String JSF_ENV_LABEL = "JSF Environment*";
+ private static final String JSF_TEMPL_LABEL = "Template*";
+
public JSFWebProjectWizard() {
super(new SWTBot().activeShell().widget);
- assert ("New JSF Project").equals(getText());
+ assert (JSF_NEW_PROJECT_LABEL).equals(getText());
}
public JSFWebProjectWizard setName(String name) {
- setText("Project Name*", name);
+ setText(JSF_PROJECT_NAME_LABEL, name);
return this;
}
public JSFWebProjectWizard setEnvironment(JSFEnvironment env) {
- setTextInCombobox("JSF Environment*", env.getName());
+ setTextInCombobox(JSF_ENV_LABEL, env.getName());
return this;
}
public JSFWebProjectWizard setJSFTemplate(JSFTemplate template) {
- if (canCheckInCombobox("Template*", template.getName())) {
- setTextInCombobox("Template*", template.getName());
+ if (canCheckInCombobox(JSF_TEMPL_LABEL, template.getName())) {
+ setTextInCombobox(JSF_TEMPL_LABEL, template.getName());
}
return this;
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/QuickFixDialogWizard.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/QuickFixDialogWizard.java 2011-11-30 15:46:17 UTC (rev 36786)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/QuickFixDialogWizard.java 2011-11-30 15:46:38 UTC (rev 36787)
@@ -17,9 +17,11 @@
public class QuickFixDialogWizard extends Wizard {
+ private static final String QUICK_FIX_TITLE = "Quick Fix";
+
public QuickFixDialogWizard() {
super(new SWTBot().activeShell().widget);
- assert ("Quick Fix").equals(getText());
+ assert (QUICK_FIX_TITLE).equals(getText());
}
public QuickFixDialogWizard setFix(SWTBotTableItem fix) {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/SpecifyBeanDialogWizard.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/SpecifyBeanDialogWizard.java 2011-11-30 15:46:17 UTC (rev 36786)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/SpecifyBeanDialogWizard.java 2011-11-30 15:46:38 UTC (rev 36787)
@@ -1,23 +1,115 @@
package org.jboss.tools.cdi.bot.test.uiutils.wizards;
+import java.util.ArrayList;
+import java.util.List;
+
import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
public class SpecifyBeanDialogWizard extends Wizard {
+ private static final String ADD = "Add >";
+ private static final String ADD_ALL = "Add All >>";
+ private static final String REMOVE = "< Remove";
+ private static final String REMOVE_ALL = "<< Remove All";
+ private static final String EDIT_VALUE = "Edit Value...";
+ private static final String CREATE_NEW_QUALIFIER = "Create New Qualifier...";
+ private List<String> availableQualifiers = null;
+ private List<String> inBeanQualifiers = null;
+
public SpecifyBeanDialogWizard() {
super(new SWTBot().activeShell().widget);
- assert ("Specify CDI Bean for the Injection Point").equals(getText());
+ assert ("Specify CDI Bean for the Injection Point").equals(getText());
+ availableQualifiers = new ArrayList<String>();
+ inBeanQualifiers = new ArrayList<String>();
}
+ public SpecifyBeanDialogWizard add() {
+ clickButton(ADD);
+ return this;
+ }
- /**
- * not finished yet, what should be implemented:
- *
- * 1. gets all qualifier
- * 2. select proper qualifier
- * 3. add qualifier
- * 4. remove qualifier
- * 5. create a new qualifier
- *
- */
+ public SpecifyBeanDialogWizard addAll() {
+ clickButton(ADD_ALL);
+ return this;
+ }
+
+ public SpecifyBeanDialogWizard remove() {
+ clickButton(REMOVE);
+ return this;
+ }
+
+ public SpecifyBeanDialogWizard removeAll() {
+ clickButton(REMOVE_ALL);
+ return this;
+ }
+
+ public SpecifyBeanDialogWizard edit() {
+ clickButton(EDIT_VALUE);
+ return this;
+ }
+
+ public CDIWizardBase createNewQualifier(String name, String packageName) {
+ clickButton(CREATE_NEW_QUALIFIER);
+ return new CDIWizardBase(CDIWizardType.QUALIFIER);
+ }
+
+ public boolean canAdd() {
+ return canClick(ADD);
+ }
+
+ public boolean canAddAll() {
+ return canClick(ADD_ALL);
+ }
+
+ public boolean canRemove() {
+ return canClick(REMOVE);
+ }
+
+ public boolean canRemoveAll() {
+ return canClick(REMOVE_ALL);
+ }
+
+ public boolean canEdit() {
+ return canClick(EDIT_VALUE);
+ }
+
+ public boolean canCreateNewQualifier() {
+ return canClick(CREATE_NEW_QUALIFIER);
+ }
+
+ public List<String> getAvailableQualifiers() {
+ int tableItemsCount = bot().table(0).rowCount();
+ for (int i = 0; i < tableItemsCount; i++) {
+ availableQualifiers.add(bot().table(0).getTableItem(i).getText());
+ }
+ return availableQualifiers;
+ }
+
+ public List<String> getInBeanQualifiers() {
+ int tableItemsCount = bot().table(1).rowCount();
+ for (int i = 0; i < tableItemsCount; i++) {
+ inBeanQualifiers.add(bot().table(1).getTableItem(i).getText());
+ }
+ return inBeanQualifiers;
+ }
+
+ public SpecifyBeanDialogWizard addQualifier(String qualifier) {
+ return selectAvailableQualifier(qualifier).add();
+ }
+
+ public SpecifyBeanDialogWizard removeQualifier(String qualifier) {
+ return selectInBeanQualifier(qualifier).remove();
+ }
+
+ private SpecifyBeanDialogWizard selectAvailableQualifier(String qualifier) {
+ bot().table(0).select(qualifier);
+ return this;
+ }
+
+ private SpecifyBeanDialogWizard selectInBeanQualifier(String qualifier) {
+ bot().table(1).select(qualifier);
+ return this;
+ }
+
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java 2011-11-30 15:46:17 UTC (rev 36786)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java 2011-11-30 15:46:38 UTC (rev 36787)
@@ -20,6 +20,11 @@
public class Wizard extends SWTBotShell {
+ private static final String NEXT = "Next >";
+ private static final String BACK = "< Back";
+ private static final String CANCEL = "Cancel";
+ private static final String FINISH = "Finish";
+
public Wizard(Shell shell) {
super(shell);
assert getText().contains("New ");
@@ -41,26 +46,30 @@
}
public Wizard back() {
- clickButton("< Back");
+ clickButton(BACK);
return this;
}
public Wizard next() {
- clickButton("Next >");
+ clickButton(NEXT);
return this;
}
public void cancel() {
- clickButton("Cancel");
+ clickButton(CANCEL);
}
public void finish() {
- clickButton("Finish");
+ clickButton(FINISH);
}
public boolean canFinish() {
- return canClick("Finish");
+ return canClick(FINISH);
}
+
+ public boolean canNext() {
+ return canClick(NEXT);
+ }
protected void checkCheckbox(String text) {
bot().checkBoxWithLabel(text).select();
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/XHTMLDialogWizard.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/XHTMLDialogWizard.java 2011-11-30 15:46:17 UTC (rev 36786)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/XHTMLDialogWizard.java 2011-11-30 15:46:38 UTC (rev 36787)
@@ -6,23 +6,28 @@
public class XHTMLDialogWizard extends Wizard {
+ private static final String XHTML_NEW_PAGE_TITLE = "New XHTML Page";
+ private static final String PARENT_FOLDER_LABEL = "Enter or select the parent folder:";
+ private static final String FILE_NAME_LABEL = "File name:";
+ private static final String XHTML_TEMPL_CHECK_BOX = "Use XHTML Template";
+
public XHTMLDialogWizard() {
super(new SWTBot().activeShell().widget);
- assert ("New XHTML Page").equals(getText());
+ assert (XHTML_NEW_PAGE_TITLE).equals(getText());
}
public XHTMLDialogWizard setDestination(String destination) {
- setText("Enter or select the parent folder:", destination);
+ setText(PARENT_FOLDER_LABEL, destination);
return this;
}
public XHTMLDialogWizard setName(String nameOfPage) {
- setText("File name:", nameOfPage);
+ setText(FILE_NAME_LABEL, nameOfPage);
return this;
}
public XHTMLDialogWizard checkXHTMLTemplate() {
- checkCheckbox("Use XHTML Template");
+ checkCheckbox(XHTML_TEMPL_CHECK_BOX);
return this;
}
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r36786 - 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: 2011-11-30 10:46:17 -0500 (Wed, 30 Nov 2011)
New Revision: 36786
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
Log:
cleanup
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-11-30 15:27:16 UTC (rev 36785)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-11-30 15:46:17 UTC (rev 36786)
@@ -146,14 +146,7 @@
@Override
public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
try {
- MavenProjectImportOperation mavenImport = new MavenProjectImportOperation(projectFolder);
- List<IProject> importedProjects = Collections.emptyList();
- if (mavenImport.isMavenProject()) {
- importedProjects = mavenImport.importToWorkspace(monitor);
- } else {
- importedProjects = new GeneralProjectImportOperation(projectFolder).importToWorkspace(monitor);
- }
-
+ List<IProject> importedProjects = importMavenProject(projectFolder, monitor);
connectToGitRepo(importedProjects, projectFolder, monitor);
createServerAdapterIfRequired(importedProjects, monitor);
return Status.OK_STATUS;
@@ -164,6 +157,18 @@
return status;
}
}
+
+ private List<IProject> importMavenProject(final File projectFolder, IProgressMonitor monitor)
+ throws CoreException, InterruptedException {
+ MavenProjectImportOperation mavenImport = new MavenProjectImportOperation(projectFolder);
+ List<IProject> importedProjects = Collections.emptyList();
+ if (mavenImport.isMavenProject()) {
+ importedProjects = mavenImport.importToWorkspace(monitor);
+ } else {
+ importedProjects = new GeneralProjectImportOperation(projectFolder).importToWorkspace(monitor);
+ }
+ return importedProjects;
+ }
}.schedule();
}
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r36785 - trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-11-30 10:27:16 -0500 (Wed, 30 Nov 2011)
New Revision: 36785
Modified:
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshTutorialsJob.java
Log:
Only display tutorials if they can be used (that is if the corresponding import strategy is available)
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshTutorialsJob.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshTutorialsJob.java 2011-11-30 14:54:24 UTC (rev 36784)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshTutorialsJob.java 2011-11-30 15:27:16 UTC (rev 36785)
@@ -66,8 +66,8 @@
for (Category peCategory : categories) {
if (projectExampleCategory.equals(peCategory.getName())) {
for (Project project : peCategory.getProjects()) {
- if (projectExampleName
- .equals(project.getName())) {
+ if (projectExampleName.equals(project.getName())
+ && canBeImported(project)){
projectTutorial = project;
break;
}
@@ -102,6 +102,11 @@
return Status.OK_STATUS;
}
+ private boolean canBeImported(Project project) {
+ return ProjectExamplesActivator.getDefault()
+ .getImportProjectExample(project.getImportType()) != null;
+ }
+
public Exception getException() {
return exception;
}
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r36784 - in workspace/fred/repositories/snapshot/org/jboss/spec/archetypes: jboss-javaee6-ear-webapp and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-11-30 09:54:24 -0500 (Wed, 30 Nov 2011)
New Revision: 36784
Added:
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/_maven.repositories
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/jboss-javaee6-webapp-7.0.2-SNAPSHOT-sources.jar
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/jboss-javaee6-webapp-7.0.2-SNAPSHOT.jar
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/jboss-javaee6-webapp-7.0.2-SNAPSHOT.pom
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/m2e-lastUpdated.properties
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/maven-metadata-local.xml
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/resolver-status.properties
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/maven-metadata-local.xml
Modified:
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/_maven.repositories
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT-sources.jar
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT.jar
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT.pom
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/m2e-lastUpdated.properties
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/maven-metadata-local.xml
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/resolver-status.properties
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/maven-metadata-local.xml
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/_maven.repositories
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/jboss-javaee6-html5-mobile-archetype-7.0.2-SNAPSHOT-sources.jar
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/jboss-javaee6-html5-mobile-archetype-7.0.2-SNAPSHOT.jar
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/jboss-javaee6-html5-mobile-archetype-7.0.2-SNAPSHOT.pom
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/maven-metadata-local.xml
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/maven-metadata-local.xml
Log:
Added missing webapp archetype and updated the others to the latest version
Modified: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/_maven.repositories
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/_maven.repositories 2011-11-30 14:52:28 UTC (rev 36783)
+++ workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/_maven.repositories 2011-11-30 14:54:24 UTC (rev 36784)
@@ -1,5 +1,5 @@
#NOTE: This is an internal implementation file, its format can be changed without prior notice.
-#Wed Nov 16 11:42:51 CET 2011
+#Wed Nov 30 15:50:43 CET 2011
jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT.jar>=
jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT.pom>=
jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT-sources.jar>=
Modified: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT-sources.jar
===================================================================
(Binary files differ)
Modified: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT.pom
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT.pom 2011-11-30 14:52:28 UTC (rev 36783)
+++ workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT.pom 2011-11-30 14:54:24 UTC (rev 36784)
@@ -23,7 +23,7 @@
<packaging>maven-archetype</packaging>
<name>JBoss AS 7 / Java EE 6 EAR Webapp</name>
- <description>An archetype that generates a starter Java EE 6 webapp project for JBoss AS 7 / EAP 6. The project is an EAR, with an EJB-JAR and WAR</description>
+ <description>An archetype that generates a starter Java EE 6 webapp project for JBoss AS 7 (by default) or EAP 6 (if the "enterprise" property is true). The project is an EAR, with an EJB-JAR and WAR</description>
<url>http://jboss.org/jbossas</url>
Modified: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/m2e-lastUpdated.properties
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/m2e-lastUpdated.properties 2011-11-30 14:52:28 UTC (rev 36783)
+++ workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/m2e-lastUpdated.properties 2011-11-30 14:54:24 UTC (rev 36784)
@@ -1,5 +1,6 @@
-#Wed Nov 16 11:40:59 CET 2011
-archetypeRepo|http\://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/snapshot/|null=1320850559970
-eap6-repo|file\://D\:/Dev/maven/jboss-eap-6.0.0.Alpha2-maven-repository|null=1321440059123
-central|http\://repo1.maven.org/maven2|null=1321440059123
-archetype|http\://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/snapshot/|null=1320850566301
+#Tue Nov 29 17:59:18 CET 2011
+archetypeRepo|http\://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/snapshot/|null=1322585958572
+eap6-repo|file\://D\:/Dev/maven/jboss-eap-6.0.0.Alpha2-maven-repository|null=1322585958572
+central|http\://repo1.maven.org/maven2|null=1322585958572
+archetype|http\://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/snapshot/|null=1322583833640
+wfk2-repo|file\://D\:/Dev/maven/jboss-wfk-2.0.0-DR04-repository|null=1322585958572
Modified: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/maven-metadata-local.xml
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/maven-metadata-local.xml 2011-11-30 14:52:28 UTC (rev 36783)
+++ workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/maven-metadata-local.xml 2011-11-30 14:54:24 UTC (rev 36784)
@@ -7,23 +7,23 @@
<snapshot>
<localCopy>true</localCopy>
</snapshot>
- <lastUpdated>20111116104251</lastUpdated>
+ <lastUpdated>20111130145043</lastUpdated>
<snapshotVersions>
<snapshotVersion>
<classifier>sources</classifier>
<extension>jar</extension>
<value>7.0.2-SNAPSHOT</value>
- <updated>20111116104251</updated>
+ <updated>20111130145043</updated>
</snapshotVersion>
<snapshotVersion>
<extension>jar</extension>
<value>7.0.2-SNAPSHOT</value>
- <updated>20111116104251</updated>
+ <updated>20111130145043</updated>
</snapshotVersion>
<snapshotVersion>
<extension>pom</extension>
<value>7.0.2-SNAPSHOT</value>
- <updated>20111116104251</updated>
+ <updated>20111130145043</updated>
</snapshotVersion>
</snapshotVersions>
</versioning>
Modified: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/resolver-status.properties
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/resolver-status.properties 2011-11-30 14:52:28 UTC (rev 36783)
+++ workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/resolver-status.properties 2011-11-30 14:54:24 UTC (rev 36784)
@@ -1,6 +1,10 @@
#NOTE: This is an internal implementation file, its format can be changed without prior notice.
-#Wed Nov 09 13:22:56 CET 2011
-maven-metadata-archetypeRepo.xml.lastUpdated=1320841371659
+#Tue Nov 29 17:23:53 CET 2011
+maven-metadata-eap6-repo.xml.error=
+maven-metadata-wfk2-repo.xml.error=
+maven-metadata-archetypeRepo.xml.lastUpdated=1322576888790
maven-metadata-archetypeRepo.xml.error=
-maven-metadata-archetype.xml.lastUpdated=1320841376845
+maven-metadata-archetype.xml.lastUpdated=1322583833635
+maven-metadata-eap6-repo.xml.lastUpdated=1322576888221
+maven-metadata-wfk2-repo.xml.lastUpdated=1322576888221
maven-metadata-archetype.xml.error=
Modified: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/maven-metadata-local.xml
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/maven-metadata-local.xml 2011-11-30 14:52:28 UTC (rev 36783)
+++ workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/maven-metadata-local.xml 2011-11-30 14:54:24 UTC (rev 36784)
@@ -7,6 +7,6 @@
<version>7.1.0-SNAPSHOT</version>
<version>7.0.2-SNAPSHOT</version>
</versions>
- <lastUpdated>20111116104251</lastUpdated>
+ <lastUpdated>20111130145043</lastUpdated>
</versioning>
</metadata>
Modified: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/_maven.repositories
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/_maven.repositories 2011-11-30 14:52:28 UTC (rev 36783)
+++ workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/_maven.repositories 2011-11-30 14:54:24 UTC (rev 36784)
@@ -1,5 +1,5 @@
#NOTE: This is an internal implementation file, its format can be changed without prior notice.
-#Mon Nov 21 12:52:51 CET 2011
+#Wed Nov 30 15:49:48 CET 2011
jboss-javaee6-html5-mobile-archetype-7.0.2-SNAPSHOT-sources.jar>=
jboss-javaee6-html5-mobile-archetype-7.0.2-SNAPSHOT.jar>=
jboss-javaee6-html5-mobile-archetype-7.0.2-SNAPSHOT.pom>=
Modified: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/jboss-javaee6-html5-mobile-archetype-7.0.2-SNAPSHOT-sources.jar
===================================================================
(Binary files differ)
Modified: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/jboss-javaee6-html5-mobile-archetype-7.0.2-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/jboss-javaee6-html5-mobile-archetype-7.0.2-SNAPSHOT.pom
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/jboss-javaee6-html5-mobile-archetype-7.0.2-SNAPSHOT.pom 2011-11-30 14:52:28 UTC (rev 36783)
+++ workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/jboss-javaee6-html5-mobile-archetype-7.0.2-SNAPSHOT.pom 2011-11-30 14:54:24 UTC (rev 36784)
@@ -57,22 +57,6 @@
</developer>
</developers>
- <repositories>
- <repository>
- <id>jboss-public-repository</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/nexus/content/groups/public</url>
- <!-- These optional flags are designed to speed up your builds by
- reducing remote server calls -->
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<build>
<extensions>
<extension>
Modified: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/maven-metadata-local.xml
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/maven-metadata-local.xml 2011-11-30 14:52:28 UTC (rev 36783)
+++ workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/maven-metadata-local.xml 2011-11-30 14:54:24 UTC (rev 36784)
@@ -7,23 +7,23 @@
<snapshot>
<localCopy>true</localCopy>
</snapshot>
- <lastUpdated>20111121115251</lastUpdated>
+ <lastUpdated>20111130144948</lastUpdated>
<snapshotVersions>
<snapshotVersion>
<classifier>sources</classifier>
<extension>jar</extension>
<value>7.0.2-SNAPSHOT</value>
- <updated>20111121115251</updated>
+ <updated>20111130144948</updated>
</snapshotVersion>
<snapshotVersion>
<extension>jar</extension>
<value>7.0.2-SNAPSHOT</value>
- <updated>20111121115251</updated>
+ <updated>20111130144948</updated>
</snapshotVersion>
<snapshotVersion>
<extension>pom</extension>
<value>7.0.2-SNAPSHOT</value>
- <updated>20111121115251</updated>
+ <updated>20111130144948</updated>
</snapshotVersion>
</snapshotVersions>
</versioning>
Modified: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/maven-metadata-local.xml
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/maven-metadata-local.xml 2011-11-30 14:52:28 UTC (rev 36783)
+++ workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/maven-metadata-local.xml 2011-11-30 14:54:24 UTC (rev 36784)
@@ -6,6 +6,6 @@
<versions>
<version>7.0.2-SNAPSHOT</version>
</versions>
- <lastUpdated>20111115194434</lastUpdated>
+ <lastUpdated>20111130144948</lastUpdated>
</versioning>
</metadata>
Added: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/_maven.repositories
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/_maven.repositories (rev 0)
+++ workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/_maven.repositories 2011-11-30 14:54:24 UTC (rev 36784)
@@ -0,0 +1,5 @@
+#NOTE: This is an internal implementation file, its format can be changed without prior notice.
+#Wed Nov 30 15:50:12 CET 2011
+jboss-javaee6-webapp-7.0.2-SNAPSHOT.jar>=
+jboss-javaee6-webapp-7.0.2-SNAPSHOT.pom>=
+jboss-javaee6-webapp-7.0.2-SNAPSHOT-sources.jar>=
Added: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/jboss-javaee6-webapp-7.0.2-SNAPSHOT-sources.jar
===================================================================
(Binary files differ)
Property changes on: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/jboss-javaee6-webapp-7.0.2-SNAPSHOT-sources.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/jboss-javaee6-webapp-7.0.2-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/jboss-javaee6-webapp-7.0.2-SNAPSHOT.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/jboss-javaee6-webapp-7.0.2-SNAPSHOT.pom
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/jboss-javaee6-webapp-7.0.2-SNAPSHOT.pom (rev 0)
+++ workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/jboss-javaee6-webapp-7.0.2-SNAPSHOT.pom 2011-11-30 14:54:24 UTC (rev 36784)
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>6-beta-2</version>
+ </parent>
+
+ <groupId>org.jboss.spec.archetypes</groupId>
+ <artifactId>jboss-javaee6-webapp</artifactId>
+ <version>7.0.2-SNAPSHOT</version>
+ <packaging>maven-archetype</packaging>
+
+ <name>Java EE 6 Webapp</name>
+
+ <description>An archetype that generates a starter Java EE 6 webapp project for JBoss AS 7 (by default) or EAP 6 (if the "enterprise" property is true)</description>
+
+ <url>http://jboss.org/jbossas</url>
+
+ <developers>
+ <developer>
+ <name>Steven Boscarine</name>
+ <email>stevenboscarine(a)gmail.com</email>
+ </developer>
+ <developer>
+ <id>fbricon</id>
+ <name>Fred Bricon</name>
+ <email>fbricon(a)gmail.com</email>
+ <organization>Red Hat, Inc.</organization>
+ <organizationUrl>http://redhat.com/jboss</organizationUrl>
+ <url>http://community.jboss.org/people/fbricon</url>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <name>Dan Allen</name>
+ <email>dan.j.allen(a)gmail.com</email>
+ <organization>JBoss, by Red Hat</organization>
+ <organizationUrl>http://redhat.com/jboss</organizationUrl>
+ <url>http://community.jboss.org/people/dan.j.allen</url>
+ </developer>
+ <developer>
+ <name>Pete Muir</name>
+ <email>pete.muir(a)jboss.org</email>
+ <organization>Red Hat, Inc.</organization>
+ <organizationUrl>http://redhat.com/jboss</organizationUrl>
+ <url>http://in.relation.to/Bloggers/Pete</url>
+ </developer>
+ </developers>
+
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>2.1</version>
+ </extension>
+ </extensions>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>2.1</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+</project>
Added: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/m2e-lastUpdated.properties
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/m2e-lastUpdated.properties (rev 0)
+++ workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/m2e-lastUpdated.properties 2011-11-30 14:54:24 UTC (rev 36784)
@@ -0,0 +1,6 @@
+#Wed Nov 30 15:39:58 CET 2011
+eap6-repo|file\://D\:/Dev/maven/jboss-eap-6.0.0.Alpha2-maven-repository|null=1322663998032
+archetypeRepo|http\://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/snapshot/|null=1322663965769
+central|http\://repo1.maven.org/maven2|null=1322663998032
+wfk2-repo|file\://D\:/Dev/maven/jboss-wfk-2.0.0-DR04-repository|null=1322663998032
+archetype|http\://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/snapshot/|null=1322663998032
Added: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/maven-metadata-local.xml
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/maven-metadata-local.xml (rev 0)
+++ workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/maven-metadata-local.xml 2011-11-30 14:54:24 UTC (rev 36784)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata modelVersion="1.1.0">
+ <groupId>org.jboss.spec.archetypes</groupId>
+ <artifactId>jboss-javaee6-webapp</artifactId>
+ <version>7.0.2-SNAPSHOT</version>
+ <versioning>
+ <snapshot>
+ <localCopy>true</localCopy>
+ </snapshot>
+ <lastUpdated>20111130145012</lastUpdated>
+ <snapshotVersions>
+ <snapshotVersion>
+ <classifier>sources</classifier>
+ <extension>jar</extension>
+ <value>7.0.2-SNAPSHOT</value>
+ <updated>20111130145012</updated>
+ </snapshotVersion>
+ <snapshotVersion>
+ <extension>jar</extension>
+ <value>7.0.2-SNAPSHOT</value>
+ <updated>20111130145012</updated>
+ </snapshotVersion>
+ <snapshotVersion>
+ <extension>pom</extension>
+ <value>7.0.2-SNAPSHOT</value>
+ <updated>20111130145012</updated>
+ </snapshotVersion>
+ </snapshotVersions>
+ </versioning>
+</metadata>
Added: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/resolver-status.properties
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/resolver-status.properties (rev 0)
+++ workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/7.0.2-SNAPSHOT/resolver-status.properties 2011-11-30 14:54:24 UTC (rev 36784)
@@ -0,0 +1,10 @@
+#NOTE: This is an internal implementation file, its format can be changed without prior notice.
+#Wed Nov 30 15:39:58 CET 2011
+maven-metadata-eap6-repo.xml.error=
+maven-metadata-wfk2-repo.xml.error=
+maven-metadata-archetypeRepo.xml.error=
+maven-metadata-archetypeRepo.xml.lastUpdated=1322663965653
+maven-metadata-eap6-repo.xml.lastUpdated=1322663965262
+maven-metadata-archetype.xml.lastUpdated=1322663998022
+maven-metadata-wfk2-repo.xml.lastUpdated=1322663965262
+maven-metadata-archetype.xml.error=
Added: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/maven-metadata-local.xml
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/maven-metadata-local.xml (rev 0)
+++ workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp/maven-metadata-local.xml 2011-11-30 14:54:24 UTC (rev 36784)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.jboss.spec.archetypes</groupId>
+ <artifactId>jboss-javaee6-webapp</artifactId>
+ <versioning>
+ <versions>
+ <version>7.0.2-SNAPSHOT</version>
+ </versions>
+ <lastUpdated>20111130145012</lastUpdated>
+ </versioning>
+</metadata>
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r36783 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-11-30 09:52:28 -0500 (Wed, 30 Nov 2011)
New Revision: 36783
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviourDelegate.java
Log:
[JBIDE-10286] disabling "Stop" on the server adapter
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviourDelegate.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviourDelegate.java 2011-11-30 14:37:03 UTC (rev 36782)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviourDelegate.java 2011-11-30 14:52:28 UTC (rev 36783)
@@ -66,7 +66,7 @@
@Override
public IStatus canChangeState(String launchMode) {
- return Status.OK_STATUS;
+ return Status.CANCEL_STATUS;
}
@Override
12 years, 4 months
- 1
- 0