Author: brett
Date: Wed Jul 9 07:31:47 2014
New Revision: 1609037
URL: http://svn.apache.org/r1609037
Log:
[NPANDAY-622] remove pre-initialization of AssemblyContext
easier to pass the project in when needed
Modified:
incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/AssemblerContext.java
incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/impl/AssemblerContextImpl.java
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AssemblyInfoGeneratorMojo.java
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/ComponentInitializerMojo.java
Modified:
incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/AssemblerContext.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/AssemblerContext.java?rev=1609037&r1=1609036&r2=1609037&view=diff
==============================================================================
---
incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/AssemblerContext.java
(original)
+++
incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/AssemblerContext.java
Wed Jul 9 07:31:47 2014
@@ -19,7 +19,6 @@ package npanday.assembler;
* under the License.
*/
-import npanday.InitializationException;
import npanday.PlatformUnsupportedException;
import org.apache.maven.project.MavenProject;
@@ -41,7 +40,7 @@ public interface AssemblerContext
*
* @return the assembly info associated with this context.
*/
- AssemblyInfo getAssemblyInfo();
+ AssemblyInfo getAssemblyInfo( MavenProject mavenProject );
/**
* Returns the marshaller for the given language
@@ -60,13 +59,4 @@ public interface AssemblerContext
* @throws PlatformUnsupportedException the language is not supported
*/
String getClassExtensionFor( String language ) throws
PlatformUnsupportedException;
-
- /**
- * Initializes the context
- *
- * @param mavenProject the maven project
- * @throws InitializationException if the context cannot be initialized
- */
- void init( MavenProject mavenProject ) throws InitializationException;
-
}
Modified:
incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/impl/AssemblerContextImpl.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/impl/AssemblerContextImpl.java?rev=1609037&r1=1609036&r2=1609037&view=diff
==============================================================================
---
incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/impl/AssemblerContextImpl.java
(original)
+++
incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/impl/AssemblerContextImpl.java
Wed Jul 9 07:31:47 2014
@@ -23,12 +23,13 @@ import npanday.assembler.AssemblerContex
import npanday.assembler.AssemblyInfo;
import npanday.assembler.AssemblyInfoMarshaller;
import npanday.assembler.AssemblyInfoException;
-import npanday.InitializationException;
import npanday.PlatformUnsupportedException;
import npanday.model.assembly.plugins.AssemblyPlugin;
import org.apache.maven.project.MavenProject;
import org.apache.maven.model.Organization;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
+import
org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
@@ -45,7 +46,7 @@ import java.io.*;
* role="npanday.assembler.AssemblerContext"
*/
public final class AssemblerContextImpl
- implements AssemblerContext, LogEnabled
+ implements AssemblerContext, LogEnabled, Initializable
{
private static final String SNAPSHOT_SUFFIX = "SNAPSHOT";
@@ -58,11 +59,6 @@ public final class AssemblerContextImpl
private RepositoryRegistry repositoryRegistry;
/**
- * The maven project
- */
- private MavenProject mavenProject;
-
- /**
* A logger for writing log messages
*/
private Logger logger;
@@ -88,10 +84,7 @@ public final class AssemblerContextImpl
this.logger = logger;
}
- /**
- * @see npanday.assembler.AssemblerContext#getAssemblyInfo()
- */
- public AssemblyInfo getAssemblyInfo()
+ public AssemblyInfo getAssemblyInfo( MavenProject mavenProject )
{
String basedir = mavenProject.getBasedir().toString();
AssemblyInfo assemblyInfo = new AssemblyInfo();
@@ -196,13 +189,7 @@ public final class AssemblerContextImpl
}
}
- /**
- * @see AssemblerContext#init(org.apache.maven.project.MavenProject)
- */
- public void init( MavenProject mavenProject )
- throws InitializationException
- {
- this.mavenProject = mavenProject;
+ public void initialize() throws InitializationException {
repository = (AssemblyPluginsRepository) repositoryRegistry.find(
"assembly-plugins" );
if ( repository == null )
{
Modified:
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AssemblyInfoGeneratorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AssemblyInfoGeneratorMojo.java?rev=1609037&r1=1609036&r2=1609037&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AssemblyInfoGeneratorMojo.java
(original)
+++
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AssemblyInfoGeneratorMojo.java
Wed Jul 9 07:31:47 2014
@@ -180,7 +180,7 @@ public class AssemblyInfoGeneratorMojo
//managed by the framework. I intended to keep vendor info and state
machine processor out of the
// Mojos. Unable to do so for this case. Look at new API.
VendorRequirement vendorRequirement = new VendorRequirement(vendor,
vendorVersion, frameworkVersion);
- AssemblyInfo assemblyInfo = assemblerContext.getAssemblyInfo();
+ AssemblyInfo assemblyInfo = assemblerContext.getAssemblyInfo( project
);
assemblyInfo.setCustomStringAttributes(this.assemblyInfo);
VendorInfo vendorInfo;
Modified:
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/ComponentInitializerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/ComponentInitializerMojo.java?rev=1609037&r1=1609036&r2=1609037&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/ComponentInitializerMojo.java
(original)
+++
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/ComponentInitializerMojo.java
Wed Jul 9 07:31:47 2014
@@ -19,13 +19,9 @@ package npanday.plugin.compile;
* under the License.
*/
-import npanday.InitializationException;
import npanday.LocalRepositoryUtil;
-import npanday.assembler.AssemblerContext;
import npanday.resolver.NPandayDependencyResolution;
-import npanday.resolver.filter.DotnetAssemblyArtifactFilter;
import npanday.resolver.filter.DotnetSymbolsArtifactFilter;
-import npanday.resolver.filter.OrArtifactFilter;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
import org.apache.maven.artifact.resolver.filter.InversionArtifactFilter;
@@ -68,11 +64,6 @@ public class ComponentInitializerMojo
/**
* @component
*/
- private AssemblerContext assemblerContext;
-
- /**
- * @component
- */
private NPandayDependencyResolution dependencyResolution;
public void execute()
@@ -94,16 +85,5 @@ public class ComponentInitializerMojo
"NPANDAY-901-003: Could not satisfy required dependencies for
scope " + "test", e
);
}
-
- try
- {
- assemblerContext.init( project );
- }
- catch ( InitializationException e )
- {
- throw new MojoExecutionException( "NPANDAY-901-002: Failed to
initialize the assembler context", e );
- }
-
- long endTime = System.currentTimeMillis();
}
}
