Attachment #196285 for bug #346703

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 346703
Collapse All | Expand All

Lines 28-33 Export-Package: org.eclipse.m2e.internal.discovery;x-internal:=true, Link Here

(-)a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF (+1 lines)
28	org.eclipse.m2e.internal.discovery.handlers;x-internal:=true,	28	org.eclipse.m2e.internal.discovery.handlers;x-internal:=true,
29	org.eclipse.m2e.internal.discovery.markers;x-internal:=true,	29	org.eclipse.m2e.internal.discovery.markers;x-internal:=true,
30	org.eclipse.m2e.internal.discovery.operation;x-internal:=true,	30	org.eclipse.m2e.internal.discovery.operation;x-internal:=true,
		31	org.eclipse.m2e.internal.discovery.preferences;x-internal:=true,
31	org.eclipse.m2e.internal.discovery.startup;x-internal:=true,	32	org.eclipse.m2e.internal.discovery.startup;x-internal:=true,
32	org.eclipse.m2e.internal.discovery.strategy;x-internal:=true,	33	org.eclipse.m2e.internal.discovery.strategy;x-internal:=true,
33	org.eclipse.m2e.internal.discovery.wizards;x-internal:=true	34	org.eclipse.m2e.internal.discovery.wizards;x-internal:=true

Lines 9-12 Link Here

(-)a/org.eclipse.m2e.discovery/plugin.properties (-1 / +3 lines)
9	Bundle-Vendor = Eclipse.org - m2e	9	Bundle-Vendor = Eclipse.org - m2e
10	Bundle-Name = m2e Marketplace	10	Bundle-Name = m2e Marketplace
11	Maven.discovery = m2e Marketplace	11	Maven.discovery = m2e Marketplace
12	Maven.discovery.mnemonic = m	12	Maven.discovery.mnemonic = m
		13
		14	preferecepage.discovery.name=Discovery




-->
<?eclipse version="3.4"?>
<plugin>
   <extension point="org.eclipse.ui.menus">
      <menuContribution allPopups="false" locationURI="menu:help?after=additions">
         <command
               commandId="org.eclipse.m2e.discovery.ui"
               id="org.eclipse.m2e.discovery.ui"
               mnemonic="%Maven.discovery.mnemonic">
         </command>
      </menuContribution>
   </extension>
   <extension point="org.eclipse.ui.commands">
      <command id="org.eclipse.m2e.discovery.ui"
               name="%Maven.discovery">

          class="org.eclipse.m2e.internal.discovery.MavenDiscoveryLauncher">
    </launcher>
 </extension>
 <extension
       point="org.eclipse.ui.preferencePages">
    <page
          category="org.eclipse.m2e.core.preferences.Maven2PreferencePage"
          class="org.eclipse.m2e.discovery.internal.preferences.DiscoveryPreferencePage"
          id="org.eclipse.m2e.discovery.internal.preferences.DiscoveryPreferencePage"
          name="%preferecepage.discovery.name">
    </page>
 </extension>
</plugin>

Lines 59-65 public class MavenDiscovery { Link Here

(-)a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscovery.java (-1 / +1 lines)
59		59
60	private static final Tag MAVEN_TAG = new Tag("maven", Messages.MavenDiscovery_Wizard_MavenTag); //$NON-NLS-1$	60	private static final Tag MAVEN_TAG = new Tag("maven", Messages.MavenDiscovery_Wizard_MavenTag); //$NON-NLS-1$
61		61
62	private static final String PATH = "http://download.eclipse.org/technology/m2e/discovery/directory.xml"; //$NON-NLS-1$	62	public static final String PATH = "http://download.eclipse.org/technology/m2e/discovery/directory.xml"; //$NON-NLS-1$
63		63
64	public static final String LIFECYCLE_PATH = "lifecycle/"; //$NON-NLS-1$	64	public static final String LIFECYCLE_PATH = "lifecycle/"; //$NON-NLS-1$
65		65

Lines 67-72 public class Messages extends NLS { Link Here

(-)a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/Messages.java (+7 lines)
67		67
68	public static String UpdateConfigurationStartup_MarkerError;	68	public static String UpdateConfigurationStartup_MarkerError;
69		69
		70	public static String DiscoveryPreferencePage_title;
		71
		72	public static String DiscoveryPreferencePage_catalogUrl;
		73
		74	public static String DiscoveryPreferencePage_openCatalog;
		75	public static String DiscoveryPreferencePage_link_text;
		76
70	static {	77	static {
71	// initialize resource bundle	78	// initialize resource bundle
72	NLS.initializeMessages(BUNDLE_NAME, Messages.class);	79	NLS.initializeMessages(BUNDLE_NAME, Messages.class);




#Eclipse modern messages class
#Sat May 21 23:55:49 EDT 2011
BundleDiscoveryStrategy_3={0}\: {1}
BundleDiscoveryStrategy_categoryDisallowed=Cannot create category ''{0}'' with id ''{1}'' from {2}\: disallowed
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
#
BundleDiscoveryStrategy_3={0}: {1}
BundleDiscoveryStrategy_categoryDisallowed=Cannot create category ''{0}'' with id ''{1}'' from {2}: disallowed
BundleDiscoveryStrategy_task_processing_extensions=Processing extensions
BundleDiscoveryStrategy_unexpected_element=unexpected element ''{0}''
ConnectorDiscoveryExtensionReader_unexpected_element_icon=Unexpected element icon
ConnectorDiscoveryExtensionReader_unexpected_element_overview=Unexpected element overview
ConnectorDiscoveryExtensionReader_unexpected_value_kind=Unexpected value for kind
DiscoveryPreferencePage_catalogUrl=Catalog URL
DiscoveryPreferencePage_link_text=<a>See also</a>
DiscoveryPreferencePage_openCatalog=Open Catalog
DiscoveryPreferencePage_title=m2e marketplace discovery
DiscoveryWizardProposal_Label=Discover new m2e connectors
DiscoveryWizardProposal_description=Opens the m2e Marketplace dialog and lets you find the appropriate m2e connectors
MavenCatalogPage_Descripton=Select updates and extensions to install. Press Finish to proceed with installation.\nPress the information button to see a detailed overview and a link to more information.
MavenCatalogPage_Title=Install m2e connectors
MavenCatalogViewer_Error_loading_lifecycle=An error occurred loading lifecycle data for catalog item\: {0}
MavenCatalogViewer_allInstalled=All available entries are installed.
MavenCatalogViewer_Error_loading_lifecycle=An error occurred loading lifecycle data for catalog item: {0}
MavenCatalogViewer_noApplicableMarketplaceItems=No marketplace items are applicable.
MavenCatalogViewer_unexpectedException=Unexpected exception
MavenDiscoveryInstallOperation_Configuring=Configuring installation selection
MavenDiscoveryInstallOperation_ErrorMessage=Error(s) occurred gathering items for installation
MavenDiscoveryInstallOperation_missingIU=Error installing {0} unable to locate installable unit {1}
MavenDiscoveryInstallOperation_missingRepository=Error installing {0} contacting repository {1}
MavenDiscoveryWizard_Title=m2e Marketplace
MavenDiscovery_Wizard_Applicable_Tag=Applicable
MavenDiscovery_Wizard_ExtrasTag=Extras
MavenDiscovery_Wizard_LifecyclesTag=Lifecycles
MavenDiscovery_Wizard_MavenTag=Maven
MavenDiscoveryInstallOperation_Configuring=Configuring installation selection
MavenDiscoveryInstallOperation_ErrorMessage=Error(s) occurred gathering items for installation
MavenDiscoveryInstallOperation_missingIU=Error installing {0} unable to locate installable unit {1}
MavenDiscoveryInstallOperation_missingRepository=Error installing {0} contacting repository {1}
UpdateConfigurationStartup_MarkerError=Error(s) collecting projects




/*******************************************************************************
 * Copyright (c) 2011 Sonatype, Inc.
 * All rights reserved. This program and the accompanying materials
 * are 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
 *
 * Contributors:
 *      Sonatype, Inc. - initial API and implementation
 *******************************************************************************/

package org.eclipse.m2e.internal.discovery.preferences;

import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.m2e.internal.discovery.MavenDiscovery;
import org.eclipse.m2e.internal.discovery.Messages;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;


public class DiscoveryPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {

  IWorkbench workbench;

  public DiscoveryPreferencePage() {
    super(Messages.DiscoveryPreferencePage_title);
    noDefaultAndApplyButton();
  }

  public void init(IWorkbench workbench) {
    this.workbench = workbench;
  }

  @Override
  protected Control createContents(Composite parent) {
    Composite composite = new Composite(parent, SWT.NULL);
    composite.setLayout(new GridLayout(2, false));

    Label lblCatalogUrl = new Label(composite, SWT.NONE);
    lblCatalogUrl.setText(Messages.DiscoveryPreferencePage_catalogUrl);

    Text catalogUrl = new Text(composite, SWT.BORDER);
    catalogUrl.setEditable(false);
    catalogUrl.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
    catalogUrl.setText(MavenDiscovery.PATH);

    Button btnOpenCatalog = new Button(composite, SWT.NONE);
    btnOpenCatalog.addSelectionListener(new SelectionAdapter() {
      @Override
      public void widgetSelected(SelectionEvent e) {
        MavenDiscovery.launchWizard(workbench.getModalDialogShellProvider().getShell());
      }
    });
    btnOpenCatalog.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
    btnOpenCatalog.setSize(92, 29);
    btnOpenCatalog.setText(Messages.DiscoveryPreferencePage_openCatalog);
    new Label(composite, SWT.NONE);
    return composite;
  }
}

Return to bug 346703

Lines 7-21 Link Here

(-)a/org.eclipse.m2e.discovery/plugin.xml (-9 / +9 lines)
7	-->	7	-->
8	<?eclipse version="3.4"?>	8	<?eclipse version="3.4"?>
9	<plugin>	9	<plugin>
10	<extension point="org.eclipse.ui.menus">
11	<menuContribution allPopups="false" locationURI="menu:help?after=additions">
12	<command
13	commandId="org.eclipse.m2e.discovery.ui"
14	id="org.eclipse.m2e.discovery.ui"
15	mnemonic="%Maven.discovery.mnemonic">
16	</command>
17	</menuContribution>
18	</extension>
19	<extension point="org.eclipse.ui.commands">	10	<extension point="org.eclipse.ui.commands">
20	<command id="org.eclipse.m2e.discovery.ui"	11	<command id="org.eclipse.m2e.discovery.ui"
21	name="%Maven.discovery">	12	name="%Maven.discovery">
Lines 55-58 Link Here
55	class="org.eclipse.m2e.internal.discovery.MavenDiscoveryLauncher">	46	class="org.eclipse.m2e.internal.discovery.MavenDiscoveryLauncher">
56	</launcher>	47	</launcher>
57	</extension>	48	</extension>
		49	<extension
		50	point="org.eclipse.ui.preferencePages">
		51	<page
		52	category="org.eclipse.m2e.core.preferences.Maven2PreferencePage"
		53	class="org.eclipse.m2e.discovery.internal.preferences.DiscoveryPreferencePage"
		54	id="org.eclipse.m2e.discovery.internal.preferences.DiscoveryPreferencePage"
		55	name="%preferecepage.discovery.name">
		56	</page>
		57	</extension>
58	</plugin>	58	</plugin>

Lines 1-32 Link Here

(-)a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/messages.properties (-15 / +14 lines)
1	#	1	#Eclipse modern messages class
2	# Copyright (c) 2011 Sonatype, Inc.	2	#Sat May 21 23:55:49 EDT 2011
3	# All rights reserved. This program and the accompanying materials	3	BundleDiscoveryStrategy_3={0}\: {1}
4	# are made available under the terms of the Eclipse Public License v1.0	4	BundleDiscoveryStrategy_categoryDisallowed=Cannot create category ''{0}'' with id ''{1}'' from {2}\: disallowed
5	# which accompanies this distribution, and is available at
6	# http://www.eclipse.org/legal/epl-v10.html
7	#
8	BundleDiscoveryStrategy_3={0}: {1}
9	BundleDiscoveryStrategy_categoryDisallowed=Cannot create category ''{0}'' with id ''{1}'' from {2}: disallowed
10	BundleDiscoveryStrategy_task_processing_extensions=Processing extensions	5	BundleDiscoveryStrategy_task_processing_extensions=Processing extensions
11	BundleDiscoveryStrategy_unexpected_element=unexpected element ''{0}''	6	BundleDiscoveryStrategy_unexpected_element=unexpected element ''{0}''
12	ConnectorDiscoveryExtensionReader_unexpected_element_icon=Unexpected element icon	7	ConnectorDiscoveryExtensionReader_unexpected_element_icon=Unexpected element icon
13	ConnectorDiscoveryExtensionReader_unexpected_element_overview=Unexpected element overview	8	ConnectorDiscoveryExtensionReader_unexpected_element_overview=Unexpected element overview
14	ConnectorDiscoveryExtensionReader_unexpected_value_kind=Unexpected value for kind	9	ConnectorDiscoveryExtensionReader_unexpected_value_kind=Unexpected value for kind
15	DiscoveryWizardProposal_description=Opens the m2e Marketplace dialog and lets you find the appropriate m2e connectors	10	DiscoveryPreferencePage_catalogUrl=Catalog URL
		11	DiscoveryPreferencePage_link_text=<a>See also</a>
		12	DiscoveryPreferencePage_openCatalog=Open Catalog
		13	DiscoveryPreferencePage_title=m2e marketplace discovery
16	DiscoveryWizardProposal_Label=Discover new m2e connectors	14	DiscoveryWizardProposal_Label=Discover new m2e connectors
		15	DiscoveryWizardProposal_description=Opens the m2e Marketplace dialog and lets you find the appropriate m2e connectors
17	MavenCatalogPage_Descripton=Select updates and extensions to install. Press Finish to proceed with installation.\nPress the information button to see a detailed overview and a link to more information.	16	MavenCatalogPage_Descripton=Select updates and extensions to install. Press Finish to proceed with installation.\nPress the information button to see a detailed overview and a link to more information.
18	MavenCatalogPage_Title=Install m2e connectors	17	MavenCatalogPage_Title=Install m2e connectors
		18	MavenCatalogViewer_Error_loading_lifecycle=An error occurred loading lifecycle data for catalog item\: {0}
19	MavenCatalogViewer_allInstalled=All available entries are installed.	19	MavenCatalogViewer_allInstalled=All available entries are installed.
20	MavenCatalogViewer_Error_loading_lifecycle=An error occurred loading lifecycle data for catalog item: {0}
21	MavenCatalogViewer_noApplicableMarketplaceItems=No marketplace items are applicable.	20	MavenCatalogViewer_noApplicableMarketplaceItems=No marketplace items are applicable.
22	MavenCatalogViewer_unexpectedException=Unexpected exception	21	MavenCatalogViewer_unexpectedException=Unexpected exception
		22	MavenDiscoveryInstallOperation_Configuring=Configuring installation selection
		23	MavenDiscoveryInstallOperation_ErrorMessage=Error(s) occurred gathering items for installation
		24	MavenDiscoveryInstallOperation_missingIU=Error installing {0} unable to locate installable unit {1}
		25	MavenDiscoveryInstallOperation_missingRepository=Error installing {0} contacting repository {1}
23	MavenDiscoveryWizard_Title=m2e Marketplace	26	MavenDiscoveryWizard_Title=m2e Marketplace
24	MavenDiscovery_Wizard_Applicable_Tag=Applicable	27	MavenDiscovery_Wizard_Applicable_Tag=Applicable
25	MavenDiscovery_Wizard_ExtrasTag=Extras	28	MavenDiscovery_Wizard_ExtrasTag=Extras
26	MavenDiscovery_Wizard_LifecyclesTag=Lifecycles	29	MavenDiscovery_Wizard_LifecyclesTag=Lifecycles
27	MavenDiscovery_Wizard_MavenTag=Maven	30	MavenDiscovery_Wizard_MavenTag=Maven
28	MavenDiscoveryInstallOperation_Configuring=Configuring installation selection
29	MavenDiscoveryInstallOperation_ErrorMessage=Error(s) occurred gathering items for installation
30	MavenDiscoveryInstallOperation_missingIU=Error installing {0} unable to locate installable unit {1}
31	MavenDiscoveryInstallOperation_missingRepository=Error installing {0} contacting repository {1}
32	UpdateConfigurationStartup_MarkerError=Error(s) collecting projects	31	UpdateConfigurationStartup_MarkerError=Error(s) collecting projects

Added Link Here

(-)a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/preferences/DiscoveryPreferencePage.java (-1 / +70 lines)
0	-	1	/*******************************************************************************
		2	* Copyright (c) 2011 Sonatype, Inc.
		3	* All rights reserved. This program and the accompanying materials
		4	* are made available under the terms of the Eclipse Public License v1.0
		5	* which accompanies this distribution, and is available at
		6	* http://www.eclipse.org/legal/epl-v10.html
		7	*
		8	* Contributors:
		9	* Sonatype, Inc. - initial API and implementation
		10	*******************************************************************************/
		11
		12	package org.eclipse.m2e.internal.discovery.preferences;
		13
		14	import org.eclipse.jface.preference.PreferencePage;
		15	import org.eclipse.m2e.internal.discovery.MavenDiscovery;
		16	import org.eclipse.m2e.internal.discovery.Messages;
		17	import org.eclipse.swt.SWT;
		18	import org.eclipse.swt.events.SelectionAdapter;
		19	import org.eclipse.swt.events.SelectionEvent;
		20	import org.eclipse.swt.layout.GridData;
		21	import org.eclipse.swt.layout.GridLayout;
		22	import org.eclipse.swt.widgets.Button;
		23	import org.eclipse.swt.widgets.Composite;
		24	import org.eclipse.swt.widgets.Control;
		25	import org.eclipse.swt.widgets.Label;
		26	import org.eclipse.swt.widgets.Text;
		27	import org.eclipse.ui.IWorkbench;
		28	import org.eclipse.ui.IWorkbenchPreferencePage;
		29
		30
		31	public class DiscoveryPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
		32
		33	IWorkbench workbench;
		34
		35	public DiscoveryPreferencePage() {
		36	super(Messages.DiscoveryPreferencePage_title);
		37	noDefaultAndApplyButton();
		38	}
		39
		40	public void init(IWorkbench workbench) {
		41	this.workbench = workbench;
		42	}
		43
		44	@Override
		45	protected Control createContents(Composite parent) {
		46	Composite composite = new Composite(parent, SWT.NULL);
		47	composite.setLayout(new GridLayout(2, false));
		48
		49	Label lblCatalogUrl = new Label(composite, SWT.NONE);
		50	lblCatalogUrl.setText(Messages.DiscoveryPreferencePage_catalogUrl);
		51
		52	Text catalogUrl = new Text(composite, SWT.BORDER);
		53	catalogUrl.setEditable(false);
		54	catalogUrl.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
		55	catalogUrl.setText(MavenDiscovery.PATH);
		56
		57	Button btnOpenCatalog = new Button(composite, SWT.NONE);
		58	btnOpenCatalog.addSelectionListener(new SelectionAdapter() {
		59	@Override
		60	public void widgetSelected(SelectionEvent e) {
		61	MavenDiscovery.launchWizard(workbench.getModalDialogShellProvider().getShell());
		62	}
		63	});
		64	btnOpenCatalog.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
		65	btnOpenCatalog.setSize(92, 29);
66	btnOpenCatalog.setText(Messages.DiscoveryPreferencePage_openCatalog);
67	new Label(composite, SWT.NONE);
68	return composite;
69	}
70	}