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/SettingUpTheJBossEnterpriseRe...
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/SettingUpTheJBossEnterpriseR...
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;
}