Skip to content

Commit

Permalink
Rename plug-in o.e.m2e.pde to o.e.m2e.pde.target
Browse files Browse the repository at this point in the history
  • Loading branch information
HannesWell committed May 13, 2022
1 parent bcffba8 commit c4bbb3e
Show file tree
Hide file tree
Showing 52 changed files with 108 additions and 109 deletions.
4 changes: 2 additions & 2 deletions org.eclipse.m2e.pde.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.m2e.pde.feature"
label="%featureName"
version="1.20.100.qualifier"
version="2.0.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.m2e.core"
license-feature="org.eclipse.license"
Expand Down Expand Up @@ -40,7 +40,7 @@
unpack="false"/>

<plugin
id="org.eclipse.m2e.pde"
id="org.eclipse.m2e.pde.target"
download-size="0"
install-size="0"
version="0.0.0"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.m2e.pde</name>
<name>org.eclipse.m2e.pde.target</name>
<comment></comment>
<projects>
</projects>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: M2E PDE Integration
Bundle-SymbolicName: org.eclipse.m2e.pde;singleton:=true
Bundle-SymbolicName: org.eclipse.m2e.pde.target;singleton:=true
Bundle-Version: 2.0.0.qualifier
Automatic-Module-Name: org.eclipse.m2e.pde
Automatic-Module-Name: org.eclipse.m2e.pde.target
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.19.0",
org.eclipse.pde.ui;bundle-version="3.12.0",
Expand All @@ -12,8 +12,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.19.0",
org.eclipse.m2e.maven.runtime,
org.eclipse.m2e.core,
org.eclipse.core.resources
Export-Package: org.eclipse.m2e.pde;x-friends:="org.eclipse.m2e.pde.ui"
Bundle-Activator: org.eclipse.m2e.pde.Activator
Export-Package: org.eclipse.m2e.pde.target;x-friends:="org.eclipse.m2e.pde.ui"
Bundle-Activator: org.eclipse.m2e.pde.target.Activator
Bundle-ActivationPolicy: lazy
Import-Package: org.apache.commons.codec.digest;version="1.14.0",
org.apache.commons.io;version="2.6.0",
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
point="org.eclipse.pde.core.targetLocations">
<targetLocation
canUpdate="true"
locationFactory="org.eclipse.m2e.pde.MavenTargetLocationFactory"
locationFactory="org.eclipse.m2e.pde.target.MavenTargetLocationFactory"
type="Maven">
</targetLocation>
</extension>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Contributors:
* Christoph Läubrich - initial API and implementation
*******************************************************************************/
package org.eclipse.m2e.pde;
package org.eclipse.m2e.pde.target;

import java.util.concurrent.TimeUnit;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Contributors:
* Christoph Läubrich - initial API and implementation
*******************************************************************************/
package org.eclipse.m2e.pde;
package org.eclipse.m2e.pde.target;

import java.io.IOException;
import java.io.InputStreamReader;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Contributors:
* Christoph Läubrich - initial API and implementation
*******************************************************************************/
package org.eclipse.m2e.pde;
package org.eclipse.m2e.pde.target;

import java.io.File;
import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Contributors:
* Christoph Läubrich - initial API and implementation
*******************************************************************************/
package org.eclipse.m2e.pde;
package org.eclipse.m2e.pde.target;

public enum DependencyDepth {
NONE, DIRECT, INFINITE;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Contributors:
* Christoph Läubrich - initial API and implementation
*******************************************************************************/
package org.eclipse.m2e.pde;
package org.eclipse.m2e.pde.target;

import java.util.Collection;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Contributors:
* Christoph Läubrich - initial API and implementation
*******************************************************************************/
package org.eclipse.m2e.pde;
package org.eclipse.m2e.pde.target;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.pde.internal.core.NLResourceHelper;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Contributors:
* Christoph Läubrich - initial API and implementation
*******************************************************************************/
package org.eclipse.m2e.pde;
package org.eclipse.m2e.pde.target;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Contributors:
* Christoph Läubrich - initial API and implementation
*******************************************************************************/
package org.eclipse.m2e.pde;
package org.eclipse.m2e.pde.target;

import java.io.File;
import java.io.FileInputStream;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Contributors:
* Christoph Läubrich - initial API and implementation
*******************************************************************************/
package org.eclipse.m2e.pde;
package org.eclipse.m2e.pde.target;

import java.io.File;
import java.io.FileOutputStream;
Expand All @@ -27,7 +27,7 @@

import org.eclipse.aether.artifact.Artifact;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.m2e.pde.CacheManager.CacheConsumer;
import org.eclipse.m2e.pde.target.CacheManager.CacheConsumer;
import org.eclipse.pde.core.target.TargetBundle;
import org.osgi.framework.Constants;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Contributors:
* Christoph Läubrich - initial API and implementation
*******************************************************************************/
package org.eclipse.m2e.pde;
package org.eclipse.m2e.pde.target;

import java.io.File;
import java.io.FileInputStream;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Contributors:
* Christoph Läubrich - initial API and implementation
*******************************************************************************/
package org.eclipse.m2e.pde;
package org.eclipse.m2e.pde.target;

import java.util.List;
import java.util.Objects;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Contributors:
* Christoph Läubrich - initial API and implementation
*******************************************************************************/
package org.eclipse.m2e.pde;
package org.eclipse.m2e.pde.target;

import static org.apache.maven.artifact.Artifact.SCOPE_COMPILE;
import static org.apache.maven.artifact.Artifact.SCOPE_PROVIDED;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Christoph Läubrich - initial API and implementation
*******************************************************************************/

package org.eclipse.m2e.pde;
package org.eclipse.m2e.pde.target;

import org.eclipse.pde.core.target.TargetFeature;
import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Christoph Läubrich - initial API and implementation
* Patrick Ziegler - Support contribution of Eclipse features via Maven repositories
*******************************************************************************/
package org.eclipse.m2e.pde;
package org.eclipse.m2e.pde.target;

import java.io.File;
import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Contributors:
* Christoph Läubrich - initial API and implementation
*******************************************************************************/
package org.eclipse.m2e.pde;
package org.eclipse.m2e.pde.target;

import java.io.ByteArrayInputStream;
import java.nio.charset.StandardCharsets;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Contributors:
* Christoph Läubrich - initial API and implementation
*******************************************************************************/
package org.eclipse.m2e.pde;
package org.eclipse.m2e.pde.target;

import org.apache.maven.model.Repository;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Contributors:
* Christoph Läubrich - initial API and implementation
*******************************************************************************/
package org.eclipse.m2e.pde;
package org.eclipse.m2e.pde.target;

public enum MissingMetadataMode {
IGNORE, ERROR, GENERATE;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Contributors:
* Christoph Läubrich - initial API and implementation
*******************************************************************************/
package org.eclipse.m2e.pde;
package org.eclipse.m2e.pde.target;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Contributors:
* Christoph Läubrich - initial API and implementation
*******************************************************************************/
package org.eclipse.m2e.pde;
package org.eclipse.m2e.pde.target;

import java.io.ByteArrayInputStream;
import java.io.PrintWriter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Contributors:
* Christoph Läubrich - initial API and implementation
*******************************************************************************/
package org.eclipse.m2e.pde;
package org.eclipse.m2e.pde.target;

import java.io.File;

Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.19.0",
biz.aQute.bndlib;bundle-version="5.1.2",
org.eclipse.m2e.maven.runtime,
org.eclipse.m2e.core,
org.eclipse.m2e.pde,
org.eclipse.m2e.pde.target,
org.eclipse.pde;bundle-version="3.13.300",
org.eclipse.core.databinding;bundle-version="1.10.100",
org.eclipse.core.databinding.observable;bundle-version="1.10.0",
Expand Down
16 changes: 8 additions & 8 deletions org.eclipse.m2e.pde.ui/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<extension
point="org.eclipse.pde.ui.targetLocationProvisioners">
<locationProvider
class="org.eclipse.m2e.pde.ui.editor.MavenTargetLocationWizard"
class="org.eclipse.m2e.pde.ui.target.editor.MavenTargetLocationWizard"
icon="icons/m2.gif"
id="org.eclipse.m2e.pde.ui.editor.MavenTargetLocationWizard"
name="Maven">
Expand All @@ -18,8 +18,8 @@
<extension
point="org.eclipse.core.runtime.adapters">
<factory
adaptableType="org.eclipse.m2e.pde.MavenTargetLocation"
class="org.eclipse.m2e.pde.ui.adapter.MavenTargetAdapterFactory">
adaptableType="org.eclipse.m2e.pde.target.MavenTargetLocation"
class="org.eclipse.m2e.pde.ui.target.adapter.MavenTargetAdapterFactory">
<adapter
type="org.eclipse.jface.viewers.ILabelProvider">
</adapter>
Expand All @@ -34,8 +34,8 @@
<extension
point="org.eclipse.core.runtime.adapters">
<factory
adaptableType="org.eclipse.m2e.pde.MavenTargetBundle"
class="org.eclipse.m2e.pde.ui.adapter.MavenTargetBundleAdapterFactory">
adaptableType="org.eclipse.m2e.pde.target.MavenTargetBundle"
class="org.eclipse.m2e.pde.ui.target.adapter.MavenTargetBundleAdapterFactory">
<adapter
type="org.eclipse.jface.viewers.ILabelProvider">
</adapter>
Expand All @@ -45,7 +45,7 @@
point="org.eclipse.core.runtime.adapters">
<factory
adaptableType="org.eclipse.aether.graph.DependencyNode"
class="org.eclipse.m2e.pde.ui.adapter.DependencyNodeAdapterFactory">
class="org.eclipse.m2e.pde.ui.target.adapter.DependencyNodeAdapterFactory">
<adapter
type="org.eclipse.jface.viewers.ITreeContentProvider">
</adapter>
Expand All @@ -60,8 +60,8 @@
<extension
point="org.eclipse.core.runtime.adapters">
<factory
adaptableType="org.eclipse.m2e.pde.MavenTargetDependency"
class="org.eclipse.m2e.pde.ui.adapter.MavenTargetDependencyAdapterFactory">
adaptableType="org.eclipse.m2e.pde.target.MavenTargetDependency"
class="org.eclipse.m2e.pde.ui.target.adapter.MavenTargetDependencyAdapterFactory">
<adapter
type="org.eclipse.jface.viewers.ILabelProvider">
</adapter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
*******************************************************************************/
package org.eclipse.m2e.pde.ui;

import org.eclipse.m2e.pde.ui.adapter.DependencyNodeAdapterFactory;
import org.eclipse.m2e.pde.ui.adapter.MavenTargetAdapterFactory;
import org.eclipse.m2e.pde.ui.adapter.MavenTargetBundleAdapterFactory;
import org.eclipse.m2e.pde.ui.adapter.MavenTargetDependencyAdapterFactory;
import org.eclipse.m2e.pde.ui.target.adapter.DependencyNodeAdapterFactory;
import org.eclipse.m2e.pde.ui.target.adapter.MavenTargetAdapterFactory;
import org.eclipse.m2e.pde.ui.target.adapter.MavenTargetBundleAdapterFactory;
import org.eclipse.m2e.pde.ui.target.adapter.MavenTargetDependencyAdapterFactory;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
* Contributors:
* Christoph Läubrich - initial API and implementation
*******************************************************************************/
package org.eclipse.m2e.pde.ui.adapter;
package org.eclipse.m2e.pde.ui.target.adapter;

import org.eclipse.aether.graph.DependencyNode;
import org.eclipse.core.runtime.IAdapterFactory;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.m2e.pde.ui.editor.MavenTargetLocationEditor;
import org.eclipse.m2e.pde.ui.provider.DependencyNodeLabelProvider;
import org.eclipse.m2e.pde.ui.provider.MavenTargetTreeContentProvider;
import org.eclipse.m2e.pde.ui.target.editor.MavenTargetLocationEditor;
import org.eclipse.m2e.pde.ui.target.provider.DependencyNodeLabelProvider;
import org.eclipse.m2e.pde.ui.target.provider.MavenTargetTreeContentProvider;
import org.eclipse.pde.ui.target.ITargetLocationHandler;

public class DependencyNodeAdapterFactory implements IAdapterFactory {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
* Contributors:
* Christoph Läubrich - initial API and implementation
*******************************************************************************/
package org.eclipse.m2e.pde.ui.adapter;
package org.eclipse.m2e.pde.ui.target.adapter;

import org.eclipse.core.runtime.IAdapterFactory;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.m2e.pde.MavenTargetLocation;
import org.eclipse.m2e.pde.ui.editor.MavenTargetLocationEditor;
import org.eclipse.m2e.pde.ui.provider.MavenTargetLocationLabelProvider;
import org.eclipse.m2e.pde.ui.provider.MavenTargetTreeContentProvider;
import org.eclipse.m2e.pde.target.MavenTargetLocation;
import org.eclipse.m2e.pde.ui.target.editor.MavenTargetLocationEditor;
import org.eclipse.m2e.pde.ui.target.provider.MavenTargetLocationLabelProvider;
import org.eclipse.m2e.pde.ui.target.provider.MavenTargetTreeContentProvider;
import org.eclipse.pde.ui.target.ITargetLocationHandler;

public class MavenTargetAdapterFactory implements IAdapterFactory {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
* Contributors:
* Christoph Läubrich - initial API and implementation
*******************************************************************************/
package org.eclipse.m2e.pde.ui.adapter;
package org.eclipse.m2e.pde.ui.target.adapter;

import org.eclipse.core.runtime.IAdapterFactory;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.m2e.pde.MavenTargetBundle;
import org.eclipse.m2e.pde.ui.provider.MavenTargetBundleLabelProvider;
import org.eclipse.m2e.pde.target.MavenTargetBundle;
import org.eclipse.m2e.pde.ui.target.provider.MavenTargetBundleLabelProvider;

public class MavenTargetBundleAdapterFactory implements IAdapterFactory {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
* Contributors:
* Christoph Läubrich - initial API and implementation
*******************************************************************************/
package org.eclipse.m2e.pde.ui.adapter;
package org.eclipse.m2e.pde.ui.target.adapter;

import org.eclipse.core.runtime.IAdapterFactory;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.m2e.pde.MavenTargetDependency;
import org.eclipse.m2e.pde.ui.editor.MavenTargetLocationEditor;
import org.eclipse.m2e.pde.ui.provider.MavenTargetDependencyLabelProvider;
import org.eclipse.m2e.pde.ui.provider.MavenTargetTreeContentProvider;
import org.eclipse.m2e.pde.target.MavenTargetDependency;
import org.eclipse.m2e.pde.ui.target.editor.MavenTargetLocationEditor;
import org.eclipse.m2e.pde.ui.target.provider.MavenTargetDependencyLabelProvider;
import org.eclipse.m2e.pde.ui.target.provider.MavenTargetTreeContentProvider;
import org.eclipse.pde.ui.target.ITargetLocationHandler;

public class MavenTargetDependencyAdapterFactory implements IAdapterFactory {
Expand Down
Loading

0 comments on commit c4bbb3e

Please sign in to comment.