You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ke...@apache.org on 2005/08/03 13:29:54 UTC
svn commit: r227198 - in /maven/components/trunk/maven-plugins:
maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/
maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/
Author: kenney
Date: Wed Aug 3 04:29:36 2005
New Revision: 227198
URL: http://svn.apache.org/viewcvs?rev=227198&view=rev
Log:
o Resolved MNG-692, although I think a more general solution is required;
o Fixed another boolean-logic error in the ear plugin.
Stephane: (x != a) || (x != b) is always true, unless a == b.. ;-)
Modified:
maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
maven/components/trunk/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Modified: maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java?rev=227198&r1=227197&r2=227198&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java Wed Aug 3 04:29:36 2005
@@ -47,7 +47,7 @@
* @required
* @readonly
*/
- private MavenProject project;
+ protected MavenProject project;
/**
* The ear modules configuration.
@@ -106,9 +106,9 @@
// Artifact is not yet registered and it has neither test, nor a
// provided scope
- if ( !isArtifactRegistered( artifact, earModules ) && (
- !Artifact.SCOPE_TEST.equals( artifact.getScope() ) ||
- !Artifact.SCOPE_PROVIDED.equals( artifact.getScope() ) ) )
+ if ( !isArtifactRegistered( artifact, earModules ) &&
+ !Artifact.SCOPE_TEST.equals( artifact.getScope() ) &&
+ !Artifact.SCOPE_PROVIDED.equals( artifact.getScope() )
{
EarModule module = EarModuleFactory.newEarModule( artifact );
earModules.add( module );
Modified: maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java?rev=227198&r1=227197&r2=227198&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java Wed Aug 3 04:29:36 2005
@@ -119,6 +119,15 @@
EarModule module = (EarModule) iter.next();
getLog().info( "Copying artifact[" + module + "] to[" + module.getUri() + "]" );
File destinationFile = buildDestinationFile( getBuildDir(), module.getUri() );
+
+ File sourceFile = module.getArtifact().getFile();
+
+ if ( !sourceFile.isFile() )
+ {
+ throw new MojoExecutionException( "Cannot copy a directory: " + sourceFile.getAbsolutePath() +
+ "; Did you package/install " + module.getArtifact().getId() + "?" );
+ }
+
FileUtils.copyFile( module.getArtifact().getFile(), destinationFile );
}
}
@@ -158,6 +167,8 @@
archiver.getArchiver().addDirectory( getBuildDir() );
archiver.createArchive( getProject(), archive );
+
+ project.getArtifact().setFile( earFile );
}
catch ( Exception e )
{
@@ -169,4 +180,4 @@
{
return new File( buildDir, uri );
}
-}
\ No newline at end of file
+}
Modified: maven/components/trunk/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java?rev=227198&r1=227197&r2=227198&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java Wed Aug 3 04:29:36 2005
@@ -112,6 +112,8 @@
// create archive
archiver.createArchive( project, archive );
+ project.getArtifact().setFile( jarFile );
+
if ( new Boolean( generateClient ).booleanValue() )
{
getLog().info( "Building ejb client " + jarName + "-client" );
@@ -145,4 +147,4 @@
}
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org