Extract basic target platform handling into a dedicated maven-module

Currently different Tycho concerns are scattered around and only loosely
structured, also because of the recent refactoring and merges of code
into the maven space and mostly because of technical reasons.

This is the first attempt to restructure Tycho a bit more semantically
by introducing a tycho-targetplatform module that should host things
related to target platform parsing and handling that is not specific to
the rest of tycho and might be used by other plugins or modules as well.

Relates to #1615

pom.xml

@@ -493,6 +493,7 @@
 		<module>tycho-extras</module>
 		<module>tycho-build</module>
 		<module>tycho-apitools-plugin</module>
+		<module>tycho-targetplatform</module>
 	</modules>
 
 	<profiles>

tycho-bundles/org.eclipse.tycho.core.shared/pom.xml

@@ -31,6 +31,11 @@
 			<artifactId>org.eclipse.tycho.embedder.shared</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.tycho</groupId>
+			<artifactId>tycho-targetplatform</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.eclipse.platform</groupId>
 			<artifactId>org.eclipse.equinox.p2.metadata</artifactId>

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/resolver/target/MavenBundleInfo.java

@@ -14,7 +14,7 @@
 
 import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor;
-import org.eclipse.tycho.p2.metadata.IArtifactFacade;
+import org.eclipse.tycho.IArtifactFacade;
 
 public class MavenBundleInfo {
 

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/resolver/target/MavenBundlesArtifactRepository.java

@@ -21,8 +21,8 @@
 import org.eclipse.core.runtime.AssertionFailedException;
 import org.eclipse.equinox.p2.metadata.IArtifactKey;
 import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor;
+import org.eclipse.tycho.IArtifactFacade;
 import org.eclipse.tycho.core.shared.MavenContext;
-import org.eclipse.tycho.p2.metadata.IArtifactFacade;
 import org.eclipse.tycho.p2.repository.ArtifactRepositoryBaseImpl;
 import org.eclipse.tycho.p2.repository.ArtifactTransferPolicies;
 import org.eclipse.tycho.p2.repository.GAVArtifactDescriptor;

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/resolver/target/P2TargetPlatform.java

@@ -24,10 +24,10 @@
 import org.eclipse.equinox.p2.metadata.VersionRange;
 import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
 import org.eclipse.tycho.DependencyResolutionException;
+import org.eclipse.tycho.IArtifactFacade;
 import org.eclipse.tycho.IllegalArtifactReferenceException;
 import org.eclipse.tycho.ReactorProjectIdentities;
 import org.eclipse.tycho.TargetPlatform;
-import org.eclipse.tycho.p2.metadata.IArtifactFacade;
 import org.eclipse.tycho.p2.util.resolution.ExecutionEnvironmentResolutionHints;
 
 /**

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/resolver/target/TargetPlatformBundlePublisher.java

@@ -33,11 +33,11 @@
 import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
 import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor;
 import org.eclipse.osgi.service.resolver.BundleDescription;
+import org.eclipse.tycho.IArtifactFacade;
 import org.eclipse.tycho.ReactorProject;
 import org.eclipse.tycho.core.shared.MavenContext;
 import org.eclipse.tycho.core.shared.MavenLogger;
 import org.eclipse.tycho.p2.artifact.provider.IRawArtifactFileProvider;
-import org.eclipse.tycho.p2.metadata.IArtifactFacade;
 import org.eclipse.tycho.p2.publisher.MavenPropertiesAdvice;
 import org.eclipse.tycho.p2.publisher.TransientArtifactRepository;
 import org.eclipse.tycho.p2.repository.MavenRepositoryCoordinates;

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenDependenciesResolver.java

@@ -16,6 +16,8 @@
 import java.io.IOException;
 import java.util.Collection;
 
+import org.eclipse.tycho.MavenArtifactRepositoryReference;
+
 public interface MavenDependenciesResolver {
     /**
      * Only the specified artifact will be resolved

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/p2/metadata/ArtifactFacadeProxy.java

@@ -16,6 +16,8 @@
 import java.io.File;
 import java.util.Objects;
 
+import org.eclipse.tycho.IArtifactFacade;
+
 /**
  * Abstract proxy class for implementors who wish to modify some aspects of a facade. implementor
  * should consider the following:

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/p2/metadata/DependencyMetadataGenerator.java

@@ -14,6 +14,7 @@
 
 import java.util.List;
 
+import org.eclipse.tycho.IArtifactFacade;
 import org.eclipse.tycho.IDependencyMetadata;
 import org.eclipse.tycho.OptionalResolutionAction;
 import org.eclipse.tycho.TargetEnvironment;

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/p2/metadata/P2Generator.java

@@ -17,6 +17,8 @@
 import java.util.List;
 import java.util.Map;
 
+import org.eclipse.tycho.IArtifactFacade;
+
 public interface P2Generator {
     /**
      * @param artifacts

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/p2/metadata/ReactorProjectFacade.java

@@ -12,6 +12,7 @@
  *******************************************************************************/
 package org.eclipse.tycho.p2.metadata;
 
+import org.eclipse.tycho.IArtifactFacade;
 import org.eclipse.tycho.ReactorProject;
 
 /**

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/p2/publisher/AbstractMetadataGenerator.java

@@ -37,12 +37,12 @@
 import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository;
 import org.eclipse.tycho.BuildProperties;
 import org.eclipse.tycho.BuildPropertiesParser;
+import org.eclipse.tycho.IArtifactFacade;
 import org.eclipse.tycho.IDependencyMetadata.DependencyMetadataType;
 import org.eclipse.tycho.Interpolator;
 import org.eclipse.tycho.OptionalResolutionAction;
 import org.eclipse.tycho.TargetEnvironment;
 import org.eclipse.tycho.TychoConstants;
-import org.eclipse.tycho.p2.metadata.IArtifactFacade;
 import org.eclipse.tycho.p2.metadata.PublisherOptions;
 import org.eclipse.tycho.repository.util.StatusTool;
 

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/p2/publisher/MavenPropertiesAdvice.java

@@ -22,9 +22,9 @@
 import org.eclipse.equinox.p2.publisher.actions.IPropertyAdvice;
 import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor;
 import org.eclipse.equinox.p2.repository.artifact.spi.ArtifactDescriptor;
+import org.eclipse.tycho.IArtifactFacade;
 import org.eclipse.tycho.TychoConstants;
 import org.eclipse.tycho.core.shared.MavenContext;
-import org.eclipse.tycho.p2.metadata.IArtifactFacade;
 
 public class MavenPropertiesAdvice implements IPropertyAdvice {
 

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/p2/publisher/rootfiles/FeatureRootAdvice.java

@@ -26,9 +26,9 @@
 import org.eclipse.equinox.p2.publisher.actions.IFeatureRootAdvice;
 import org.eclipse.tycho.BuildProperties;
 import org.eclipse.tycho.BuildPropertiesParser;
+import org.eclipse.tycho.IArtifactFacade;
 import org.eclipse.tycho.Interpolator;
 import org.eclipse.tycho.PackagingType;
-import org.eclipse.tycho.p2.metadata.IArtifactFacade;
 import org.eclipse.tycho.p2.metadata.ReactorProjectFacade;
 
 /**

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/p2/resolver/ClassifiedArtifactKey.java

@@ -16,7 +16,7 @@
 
 import org.eclipse.tycho.ArtifactKey;
 import org.eclipse.tycho.DefaultArtifactKey;
-import org.eclipse.tycho.p2.metadata.IArtifactFacade;
+import org.eclipse.tycho.IArtifactFacade;
 
 public class ClassifiedArtifactKey {
     public final ArtifactKey artifactKey;

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/p2/resolver/ClassifiedLocation.java

@@ -15,7 +15,7 @@
 import java.io.File;
 import java.util.Objects;
 
-import org.eclipse.tycho.p2.metadata.IArtifactFacade;
+import org.eclipse.tycho.IArtifactFacade;
 
 public class ClassifiedLocation {
     public final File location;

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/p2/resolver/FileTargetDefinitionContent.java

@@ -38,8 +38,8 @@
 import org.eclipse.tycho.core.resolver.target.FileArtifactRepository;
 import org.eclipse.tycho.core.resolver.target.SupplierMetadataRepository;
 import org.eclipse.tycho.core.resolver.target.TargetDefinitionContent;
-import org.eclipse.tycho.p2.target.facade.TargetDefinitionResolutionException;
 import org.eclipse.tycho.p2.util.resolution.ResolverException;
+import org.eclipse.tycho.targetplatform.TargetDefinitionResolutionException;
 import org.osgi.framework.BundleException;
 
 public class FileTargetDefinitionContent implements TargetDefinitionContent {

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/p2/resolver/InstallableUnitResolver.java

@@ -39,11 +39,6 @@
 import org.eclipse.tycho.TargetEnvironment;
 import org.eclipse.tycho.core.resolver.shared.IncludeSourceMode;
 import org.eclipse.tycho.core.shared.MavenLogger;
-import org.eclipse.tycho.p2.target.facade.TargetDefinition.IncludeMode;
-import org.eclipse.tycho.p2.target.facade.TargetDefinition.InstallableUnitLocation;
-import org.eclipse.tycho.p2.target.facade.TargetDefinition.Unit;
-import org.eclipse.tycho.p2.target.facade.TargetDefinitionResolutionException;
-import org.eclipse.tycho.p2.target.facade.TargetDefinitionSyntaxException;
 import org.eclipse.tycho.p2.util.resolution.AbstractResolutionStrategy;
 import org.eclipse.tycho.p2.util.resolution.ExecutionEnvironmentResolutionHints;
 import org.eclipse.tycho.p2.util.resolution.ProjectorResolutionStrategy;
@@ -52,6 +47,11 @@
 import org.eclipse.tycho.p2.util.resolution.ResolverException;
 import org.eclipse.tycho.p2.util.resolution.SlicerResolutionStrategy;
 import org.eclipse.tycho.repository.util.DuplicateFilteringLoggingProgressMonitor;
+import org.eclipse.tycho.targetplatform.TargetDefinitionResolutionException;
+import org.eclipse.tycho.targetplatform.TargetDefinitionSyntaxException;
+import org.eclipse.tycho.targetplatform.TargetDefinition.IncludeMode;
+import org.eclipse.tycho.targetplatform.TargetDefinition.InstallableUnitLocation;
+import org.eclipse.tycho.targetplatform.TargetDefinition.Unit;
 
 public class InstallableUnitResolver {
 

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/p2/resolver/MavenTargetDefinitionContent.java

@@ -52,6 +52,7 @@
 import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository;
 import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
 import org.eclipse.osgi.service.resolver.BundleDescription;
+import org.eclipse.tycho.IArtifactFacade;
 import org.eclipse.tycho.core.resolver.shared.IncludeSourceMode;
 import org.eclipse.tycho.core.resolver.target.FileArtifactRepository;
 import org.eclipse.tycho.core.resolver.target.SupplierMetadataRepository;
@@ -61,16 +62,15 @@
 import org.eclipse.tycho.core.shared.MavenDependenciesResolver;
 import org.eclipse.tycho.core.shared.MavenLogger;
 import org.eclipse.tycho.core.shared.MavenModelFacade;
-import org.eclipse.tycho.p2.metadata.IArtifactFacade;
 import org.eclipse.tycho.p2.publisher.MavenChecksumAdvice;
 import org.eclipse.tycho.p2.publisher.MavenPropertiesAdvice;
 import org.eclipse.tycho.p2.repository.GAV;
-import org.eclipse.tycho.p2.target.facade.TargetDefinition.BNDInstructions;
-import org.eclipse.tycho.p2.target.facade.TargetDefinition.MavenDependency;
-import org.eclipse.tycho.p2.target.facade.TargetDefinition.MavenGAVLocation;
-import org.eclipse.tycho.p2.target.facade.TargetDefinition.MavenGAVLocation.DependencyDepth;
-import org.eclipse.tycho.p2.target.facade.TargetDefinition.MavenGAVLocation.MissingManifestStrategy;
-import org.eclipse.tycho.p2.target.facade.TargetDefinitionResolutionException;
+import org.eclipse.tycho.targetplatform.TargetDefinitionResolutionException;
+import org.eclipse.tycho.targetplatform.TargetDefinition.BNDInstructions;
+import org.eclipse.tycho.targetplatform.TargetDefinition.MavenDependency;
+import org.eclipse.tycho.targetplatform.TargetDefinition.MavenGAVLocation;
+import org.eclipse.tycho.targetplatform.TargetDefinition.MavenGAVLocation.DependencyDepth;
+import org.eclipse.tycho.targetplatform.TargetDefinition.MavenGAVLocation.MissingManifestStrategy;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.Constants;
 import org.w3c.dom.Element;

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/p2/resolver/URITargetDefinitionContent.java

@@ -28,7 +28,7 @@
 import org.eclipse.tycho.core.resolver.target.TargetDefinitionContent;
 import org.eclipse.tycho.p2.repository.LazyArtifactRepository;
 import org.eclipse.tycho.p2.repository.RepositoryArtifactProvider;
-import org.eclipse.tycho.p2.target.facade.TargetDefinitionResolutionException;
+import org.eclipse.tycho.targetplatform.TargetDefinitionResolutionException;
 
 public class URITargetDefinitionContent implements TargetDefinitionContent {
 

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/p2/resolver/WrappedArtifact.java

@@ -20,8 +20,8 @@
 import java.util.Properties;
 import java.util.jar.Manifest;
 
+import org.eclipse.tycho.IArtifactFacade;
 import org.eclipse.tycho.p2.metadata.ArtifactFacadeProxy;
-import org.eclipse.tycho.p2.metadata.IArtifactFacade;
 
 import aQute.bnd.osgi.Analyzer;
 import aQute.bnd.osgi.Jar;

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/p2/target/facade/PomDependencyCollector.java

@@ -17,7 +17,7 @@
 import java.util.Map;
 import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.tycho.ArtifactKey;
-import org.eclipse.tycho.p2.metadata.IArtifactFacade;
+import org.eclipse.tycho.IArtifactFacade;
 
 /**
  * Object that allows to collect POM dependency artifacts and their p2 metadata.

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/p2/target/facade/TargetPlatformConfigurationStub.java

@@ -23,6 +23,7 @@
 import org.eclipse.tycho.TargetEnvironment;
 import org.eclipse.tycho.artifacts.TargetPlatformFilter;
 import org.eclipse.tycho.core.resolver.shared.IncludeSourceMode;
+import org.eclipse.tycho.targetplatform.TargetDefinition;
 
 // TODO 412416 add an TargetPlatformConfiguration interface with only getters, and add implementation backed by the POM configuration
 public class TargetPlatformConfigurationStub {

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/p2/metadata/IArtifactFacade.java → tycho-bundles/org.eclipse.tycho.embedder.shared/src/main/java/org/eclipse/tycho/IArtifactFacade.java

@@ -11,7 +11,7 @@
  *     SAP AG - initial API and implementation
  *     Christoph Läubrich - enhance Javadoc
  *******************************************************************************/
-package org.eclipse.tycho.p2.metadata;
+package org.eclipse.tycho;
 
 import java.io.File;
 import java.util.Collections;

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenArtifactRepositoryReference.java → tycho-bundles/org.eclipse.tycho.embedder.shared/src/main/java/org/eclipse/tycho/MavenArtifactRepositoryReference.java

@@ -10,7 +10,7 @@
  * Contributors:
  *    Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tycho.core.shared;
+package org.eclipse.tycho;
 
 public interface MavenArtifactRepositoryReference {
 

tycho-core/src/main/java/org/eclipse/tycho/core/TargetPlatformConfiguration.java

@@ -31,7 +31,7 @@
 import org.eclipse.tycho.artifacts.TargetPlatformFilter;
 import org.eclipse.tycho.core.resolver.shared.IncludeSourceMode;
 import org.eclipse.tycho.core.resolver.shared.PomDependencies;
-import org.eclipse.tycho.p2.target.facade.TargetDefinitionFile;
+import org.eclipse.tycho.targetplatform.TargetDefinitionFile;
 
 public class TargetPlatformConfiguration implements DependencyResolverConfiguration {
 

tycho-core/src/main/java/org/eclipse/tycho/core/maven/MavenArtifactFacade.java

@@ -23,7 +23,7 @@
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.eclipse.tycho.p2.metadata.IArtifactFacade;
+import org.eclipse.tycho.IArtifactFacade;
 
 public final class MavenArtifactFacade implements IArtifactFacade {
 

tycho-core/src/main/java/org/eclipse/tycho/core/maven/MavenDependencyInjector.java

@@ -44,6 +44,7 @@
 import org.eclipse.tycho.ArtifactKey;
 import org.eclipse.tycho.ArtifactType;
 import org.eclipse.tycho.BuildProperties;
+import org.eclipse.tycho.MavenArtifactRepositoryReference;
 import org.eclipse.tycho.MavenDependencyDescriptor;
 import org.eclipse.tycho.PackagingType;
 import org.eclipse.tycho.ReactorProject;
@@ -52,7 +53,6 @@
 import org.eclipse.tycho.core.osgitools.BundleReader;
 import org.eclipse.tycho.core.osgitools.DefaultReactorProject;
 import org.eclipse.tycho.core.osgitools.OsgiManifestParserException;
-import org.eclipse.tycho.core.shared.MavenArtifactRepositoryReference;
 
 public final class MavenDependencyInjector {
 

tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/AbstractTychoProject.java

@@ -28,7 +28,7 @@
 import org.eclipse.tycho.core.ee.shared.ExecutionEnvironmentConfiguration;
 import org.eclipse.tycho.core.osgitools.targetplatform.MultiEnvironmentDependencyArtifacts;
 import org.eclipse.tycho.core.utils.TychoProjectUtils;
-import org.eclipse.tycho.p2.target.facade.TargetDefinition;
+import org.eclipse.tycho.targetplatform.TargetDefinition;
 
 public abstract class AbstractTychoProject extends AbstractLogEnabled implements TychoProject {