You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2008/03/26 23:42:47 UTC
svn commit: r641616 - in
/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse:
EclipsePlugin.java writers/EclipseManifestWriter.java
writers/EclipseOSGiManifestWriter.java writers/EclipseWriterConfig.java
Author: aheritier
Date: Wed Mar 26 15:42:42 2008
New Revision: 641616
URL: http://svn.apache.org/viewvc?rev=641616&view=rev
Log:
MECLIPSE-411 : manifest property usage is only for ogsi manifests
Patch by Richard van Nieuwenhoven
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseManifestWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=641616&r1=641615&r2=641616&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java Wed Mar 26 15:42:42 2008
@@ -1085,7 +1085,7 @@
config.setDeps( deps );
config.setEclipseProjectDirectory( eclipseProjectDir );
config.setLocalRepository( localRepository );
- config.setManifestFile( manifest );
+ config.setOSGIManifestFile( manifest );
config.setPde( pde );
config.setProject( project );
config.setProjectBaseDir( projectBaseDir );
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseManifestWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseManifestWriter.java?rev=641616&r1=641615&r2=641616&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseManifestWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseManifestWriter.java Wed Mar 26 15:42:42 2008
@@ -145,29 +145,19 @@
throws MojoExecutionException
{
File manifestFile = null;
- if ( config.getManifestFile() == null )
- {
-
- String metaInfBaseDirectory = getMetaInfBaseDirectory( this.config.getProject() );
-
- if ( metaInfBaseDirectory == null )
- {
- // TODO: if this really is an error, shouldn't we stop the build??
- throw new MojoExecutionException(
- Messages.getString(
- "EclipseCleanMojo.nofilefound",
- new Object[] { EclipseManifestWriter.META_INF_DIRECTORY } ) );
- }
- manifestFile =
- new File( metaInfBaseDirectory + File.separatorChar + EclipseManifestWriter.META_INF_DIRECTORY
- + File.separatorChar + EclipseManifestWriter.MANIFEST_MF_FILENAME );
+ String metaInfBaseDirectory = getMetaInfBaseDirectory( this.config.getProject() );
- }
- else
+ if ( metaInfBaseDirectory == null )
{
- manifestFile = config.getManifestFile();
+ // TODO: if this really is an error, shouldn't we stop the build??
+ throw new MojoExecutionException(
+ Messages.getString(
+ "EclipseCleanMojo.nofilefound",
+ new Object[] { EclipseManifestWriter.META_INF_DIRECTORY } ) );
}
-
+ manifestFile =
+ new File( metaInfBaseDirectory + File.separatorChar + EclipseManifestWriter.META_INF_DIRECTORY
+ + File.separatorChar + EclipseManifestWriter.MANIFEST_MF_FILENAME );
Manifest manifest = createNewManifest();
log.info( "MANIFEST LOCATION: " + manifestFile );
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java?rev=641616&r1=641615&r2=641616&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java Wed Mar 26 15:42:42 2008
@@ -85,29 +85,29 @@
throws MojoExecutionException
{
// check for existence
- if ( !config.getManifestFile().exists() )
+ if ( !config.getOSGIManifestFile().exists() )
{
log.warn( Messages.getString( "EclipseOSGiManifestWriter.nomanifestfile",
- config.getManifestFile().getAbsolutePath() ) );
+ config.getOSGIManifestFile().getAbsolutePath() ) );
return;
}
- StringBuffer manifestSb = rewriteManifest( config.getManifestFile() );
+ StringBuffer manifestSb = rewriteManifest( config.getOSGIManifestFile() );
Writer out = null;
try
{
- out = new OutputStreamWriter( new FileOutputStream( config.getManifestFile() ), "UTF-8" );
+ out = new OutputStreamWriter( new FileOutputStream( config.getOSGIManifestFile() ), "UTF-8" );
out.write( manifestSb.toString() );
}
catch ( FileNotFoundException e )
{
throw new MojoExecutionException( Messages.getString( "cantwritetofile",
- config.getManifestFile().getAbsolutePath() ) );
+ config.getOSGIManifestFile().getAbsolutePath() ) );
}
catch ( IOException e )
{
throw new MojoExecutionException( Messages.getString( "cantwritetofile",
- config.getManifestFile().getAbsolutePath() ), e );
+ config.getOSGIManifestFile().getAbsolutePath() ), e );
}
finally
{
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java?rev=641616&r1=641615&r2=641616&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java Wed Mar 26 15:42:42 2008
@@ -90,7 +90,7 @@
/**
* Manifest file.
*/
- private File manifestFile;
+ private File osgiManifestFile;
/**
* PDE mode.
@@ -344,9 +344,9 @@
*
* @return Returns the manifestFile.
*/
- public File getManifestFile()
+ public File getOSGIManifestFile()
{
- return manifestFile;
+ return osgiManifestFile;
}
/**
@@ -354,9 +354,9 @@
*
* @param manifestFile The manifestFile to set.
*/
- public void setManifestFile( File manifestFile )
+ public void setOSGIManifestFile( File manifestFile )
{
- this.manifestFile = manifestFile;
+ this.osgiManifestFile = manifestFile;
}
/**