Author: aadamchik
Date: Mon Dec 25 03:10:25 2006
New Revision: 490129
URL: http://svn.apache.org/viewvc?view=rev&rev=490129
Log:
CAY-719:Finalize Maven assembly scripts for the upcoming 3.0 milestone releases
(refactoring build plugin, pulling common code in the superclass)
Modified:
incubator/cayenne/main/trunk/other/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/AbstractAggregatorMojo.java
incubator/cayenne/main/trunk/other/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/BinAggregatorMojo.java
incubator/cayenne/main/trunk/other/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/SourcesAggregatorMojo.java
Modified:
incubator/cayenne/main/trunk/other/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/AbstractAggregatorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/other/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/AbstractAggregatorMojo.java?view=diff&rev=490129&r1=490128&r2=490129
==============================================================================
---
incubator/cayenne/main/trunk/other/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/AbstractAggregatorMojo.java
(original)
+++
incubator/cayenne/main/trunk/other/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/AbstractAggregatorMojo.java
Mon Dec 25 03:10:25 2006
@@ -127,6 +127,28 @@
private MavenProjectHelper projectHelper;
/**
+ * Name of the generated JAR.
+ *
+ * @parameter expression="${project.build.finalName}"
+ * @required
+ */
+ private String finalName;
+
+ /**
+ * A file that contains excludes patterns.
+ *
+ * @parameter
+ */
+ private File excludesFile;
+
+ /**
+ * A file that contains includes patterns.
+ *
+ * @parameter
+ */
+ private File includesFile;
+
+ /**
* Preprocesses the list of ArtifactItems and unpacks them to the provided
directory.
*/
protected void unpackArtifacts(File unpackDirectory, String classifier)
@@ -151,12 +173,8 @@
/**
* Creates a filtered aggregated jar file from unpacked artifacts.
*/
- protected void packAggregatedArtifact(
- File unpackDirectory,
- String finalName,
- String classifier,
- File excludesFile,
- File includesFile) throws MojoExecutionException {
+ protected void packAggregatedArtifact(File unpackDirectory, String
classifier)
+ throws MojoExecutionException {
if (classifier != null) {
finalName += "-" + classifier;
Modified:
incubator/cayenne/main/trunk/other/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/BinAggregatorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/other/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/BinAggregatorMojo.java?view=diff&rev=490129&r1=490128&r2=490129
==============================================================================
---
incubator/cayenne/main/trunk/other/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/BinAggregatorMojo.java
(original)
+++
incubator/cayenne/main/trunk/other/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/BinAggregatorMojo.java
Mon Dec 25 03:10:25 2006
@@ -23,35 +23,8 @@
*/
private File unpackDirectory;
- /**
- * Name of the generated JAR.
- *
- * @parameter expression="${project.build.finalName}"
- * @required
- */
- private String finalName;
-
- /**
- * A file that contains excludes patterns.
- *
- * @parameter
- */
- private File excludesFile;
-
- /**
- * A file that contains includes patterns.
- *
- * @parameter
- */
- private File includesFile;
-
public void execute() throws MojoExecutionException {
unpackArtifacts(unpackDirectory, null);
- packAggregatedArtifact(
- unpackDirectory,
- finalName,
- null,
- excludesFile,
- includesFile);
+ packAggregatedArtifact(unpackDirectory, null);
}
}
Modified:
incubator/cayenne/main/trunk/other/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/SourcesAggregatorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/other/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/SourcesAggregatorMojo.java?view=diff&rev=490129&r1=490128&r2=490129
==============================================================================
---
incubator/cayenne/main/trunk/other/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/SourcesAggregatorMojo.java
(original)
+++
incubator/cayenne/main/trunk/other/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/SourcesAggregatorMojo.java
Mon Dec 25 03:10:25 2006
@@ -40,35 +40,8 @@
*/
private File unpackDirectory;
- /**
- * Name of the generated JAR.
- *
- * @parameter expression="${project.build.finalName}"
- * @required
- */
- private String finalName;
-
- /**
- * A file that contains excludes patterns.
- *
- * @parameter
- */
- private File excludesFile;
-
- /**
- * A file that contains includes patterns.
- *
- * @parameter
- */
- private File includesFile;
-
public void execute() throws MojoExecutionException, MojoFailureException {
unpackArtifacts(unpackDirectory, "sources");
- packAggregatedArtifact(
- unpackDirectory,
- finalName,
- "sources",
- excludesFile,
- includesFile);
+ packAggregatedArtifact(unpackDirectory, "sources");
}
}
