Author: olamy
Date: Thu Aug 2 18:21:29 2012
New Revision: 1368635
URL: http://svn.apache.org/viewvc?rev=1368635&view=rev
Log:
code formatting
Modified:
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarArtifactStub.java
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub.java
Modified:
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java?rev=1368635&r1=1368634&r2=1368635&view=diff
==============================================================================
---
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
(original)
+++
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
Thu Aug 2 18:21:29 2012
@@ -160,8 +160,8 @@ public class RarMojo
Artifact artifact = (Artifact) iter.next();
ScopeArtifactFilter filter = new ScopeArtifactFilter(
Artifact.SCOPE_RUNTIME );
- if ( !artifact.isOptional() && filter.include( artifact ) &&
artifact.getArtifactHandler()
- .isAddedToClasspath() )
+ if ( !artifact.isOptional() && filter.include( artifact )
+ && artifact.getArtifactHandler().isAddedToClasspath() )
{
getLog().info( "Copying artifact[" + artifact.getGroupId()
+ ", " + artifact.getId() + ", " +
artifact.getScope() + "]" );
Modified:
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarArtifactStub.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarArtifactStub.java?rev=1368635&r1=1368634&r2=1368635&view=diff
==============================================================================
---
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarArtifactStub.java
(original)
+++
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarArtifactStub.java
Thu Aug 2 18:21:29 2012
@@ -19,12 +19,12 @@ package org.apache.maven.plugin.rar.stub
* under the License.
*/
-import java.io.File;
-
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.plugin.testing.stubs.ArtifactStub;
+import java.io.File;
+
/**
* @author <a href="mailto:arami...@apache.org";>Allan Ramirez</a>
*/
@@ -32,15 +32,15 @@ public class RarArtifactStub
extends ArtifactStub
{
private String groupId;
-
+
private String artifactId;
-
+
private String version;
-
+
private String scope;
-
+
private boolean optional;
-
+
private File file;
private ArtifactHandler artifactHandler;
@@ -109,7 +109,7 @@ public class RarArtifactStub
{
return getGroupId() + ":" + getArtifactId() + ":" + getVersion();
}
-
+
public String getBaseVersion()
{
return getVersion();
@@ -124,37 +124,37 @@ public class RarArtifactStub
{
return new ArtifactHandler()
{
-
+
public boolean isIncludesDependencies()
{
return false;
}
-
+
public boolean isAddedToClasspath()
{
return true;
}
-
+
public String getPackaging()
{
return null;
}
-
+
public String getLanguage()
{
return null;
}
-
+
public String getExtension()
{
return null;
}
-
+
public String getDirectory()
{
return null;
}
-
+
public String getClassifier()
{
return null;
@@ -166,6 +166,6 @@ public class RarArtifactStub
{
return "rar";
}
-
-
+
+
}
Modified:
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub.java?rev=1368635&r1=1368634&r2=1368635&view=diff
==============================================================================
---
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub.java
(original)
+++
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub.java
Thu Aug 2 18:21:29 2012
@@ -19,13 +19,6 @@ package org.apache.maven.plugin.rar.stub
* under the License.
*/
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Model;
@@ -33,6 +26,13 @@ import org.apache.maven.model.Organizati
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.PlexusTestCase;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
/**
* @author <a href="mailto:arami...@apache.org";>Allan Ramirez</a>
*/
@@ -40,11 +40,11 @@ public class RarMavenProjectStub
extends MavenProject
{
private List attachedArtifacts;
-
+
public RarMavenProjectStub()
{
super( new Model() );
-
+
super.setGroupId( getGroupId() );
super.setArtifactId( getArtifactId() );
super.setVersion( getVersion() );
@@ -53,7 +53,7 @@ public class RarMavenProjectStub
Organization org = new Organization();
org.setName( "organization" );
org.setUrl( "http://www.some.org"; );
-
+
super.setOrganization( org );
super.setFile( getFile() );
super.setPluginArtifacts( Collections.EMPTY_SET );
@@ -64,61 +64,61 @@ public class RarMavenProjectStub
super.setPluginArtifactRepositories( Collections.EMPTY_LIST );
super.setCollectedProjects( Collections.EMPTY_LIST );
super.setActiveProfiles( Collections.EMPTY_LIST );
-
+
super.addCompileSourceRoot( getBasedir() +
"/src/test/resources/unit/basic-rar-test/src/main/java" );
super.addTestCompileSourceRoot( getBasedir() +
"/src/test/resources/unit/basic-rar-test/src/test/java" );
-
+
super.setExecutionRoot( false );
}
-
+
public String getGroupId()
{
return "org.apache.maven.test";
}
-
+
public String getArtifactId()
{
return "maven-rar-test";
}
-
+
public String getVersion()
{
return "1.0-SNAPSHOT";
}
-
+
public File getFile()
{
return new File( getBasedir(),
"src/test/resources/unit/basic-rar-test/plugin-config.xml" );
}
-
+
public File getBasedir()
{
return new File( PlexusTestCase.getBasedir() );
}
-
+
public Artifact getArtifact()
{
Artifact artifact = new RarArtifactStub();
-
+
artifact.setGroupId( getGroupId() );
-
+
artifact.setArtifactId( getArtifactId() );
-
+
artifact.setVersion( getVersion() );
-
+
return artifact;
}
-
+
public Set getArtifacts()
- {
+ {
Set artifacts = new HashSet();
-
+
artifacts.add( createArtifact( "org.apache.maven.test",
"maven-artifact01", "1.0-SNAPSHOT", false ) );
artifacts.add( createArtifact( "org.apache.maven.test",
"maven-artifact02", "1.0-SNAPSHOT", false ) );
-
+
return artifacts;
}
-
+
public List getAttachedArtifacts()
{
if ( attachedArtifacts == null )
@@ -126,29 +126,30 @@ public class RarMavenProjectStub
attachedArtifacts = new ArrayList();
}
return attachedArtifacts;
- }
-
+ }
+
protected Artifact createArtifact( String groupId, String artifactId,
String version, boolean optional )
{
Artifact artifact = new RarArtifactStub();
-
+
artifact.setGroupId( groupId );
-
+
artifact.setArtifactId( artifactId );
-
+
artifact.setVersion( version );
-
+
artifact.setOptional( optional );
-
+
artifact.setVersionRange( VersionRange.createFromVersion( "1.0" ) );
-
- artifact.setFile( new File ( getBasedir() + "/src/test/remote-repo/" +
artifact.getGroupId().replace( '.', '/' ) +
- "/" + artifact.getArtifactId() + "/" +
artifact.getVersion() +
- "/" + artifact.getArtifactId() + "-" +
artifact.getVersion() + ".jar" ) ) ;
-
- artifact.setArtifactHandler(new ArtifactHandlerStub());
+
+ artifact.setFile(
+ new File( getBasedir() + "/src/test/remote-repo/" +
artifact.getGroupId().replace( '.', '/' ) +
+ "/" + artifact.getArtifactId() + "/" +
artifact.getVersion() +
+ "/" + artifact.getArtifactId() + "-" +
artifact.getVersion() + ".jar" ) );
+
+ artifact.setArtifactHandler( new ArtifactHandlerStub() );
return artifact;
}
-
-
+
+
}
