Author: jvanzyl
Date: Fri Nov 3 18:17:08 2006
New Revision: 471098
URL: http://svn.apache.org/viewvc?view=rev&rev=471098
Log:
o create an executable JAR, assembly doesn't seem to want to let you make a JAR
with a custom manifest ...
Added:
maven/archiva/trunk/archiva-cli/src/main/assembly/
maven/archiva/trunk/archiva-cli/src/main/assembly/archiva-cli-assembly.xml
(with props)
maven/archiva/trunk/archiva-cli/src/main/resources/
maven/archiva/trunk/archiva-cli/src/main/resources/META-INF/
maven/archiva/trunk/archiva-cli/src/main/resources/META-INF/MANIFEST.MF
Modified:
maven/archiva/trunk/archiva-cli/pom.xml
maven/archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/Cli.java
maven/archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/CliManager.java
Modified: maven/archiva/trunk/archiva-cli/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-cli/pom.xml?view=diff&rev=471098&r1=471097&r2=471098
==============================================================================
--- maven/archiva/trunk/archiva-cli/pom.xml (original)
+++ maven/archiva/trunk/archiva-cli/pom.xml Fri Nov 3 18:17:08 2006
@@ -47,4 +47,34 @@
<version>2.6.7</version>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptor>src/main/assembly/archiva-cli-assembly.xml</descriptor>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>integration-test</phase>
+ <configuration>
+ <sourceRoot>target/generated/src/main/java</sourceRoot>
+ <tasks>
+ <jar
destfile="${basedir}/target/archiva-cli-1.0-SNAPSHOT-cli.jar"
+ basedir="${basedir}/target/archiva-cli-1.0-SNAPSHOT-cli"
+
manifest="${basedir}/src/main/resources/META-INF/MANIFEST.MF"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Added:
maven/archiva/trunk/archiva-cli/src/main/assembly/archiva-cli-assembly.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-cli/src/main/assembly/archiva-cli-assembly.xml?view=auto&rev=471098
==============================================================================
--- maven/archiva/trunk/archiva-cli/src/main/assembly/archiva-cli-assembly.xml
(added)
+++ maven/archiva/trunk/archiva-cli/src/main/assembly/archiva-cli-assembly.xml
Fri Nov 3 18:17:08 2006
@@ -0,0 +1,39 @@
+<assembly>
+ <id>cli</id>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <fileSets>
+ <!--
+ <fileSet>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+ -->
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ <!--
+ <excludes>
+ <exclude>junit:junit</exclude>
+ <exclude>com.training.killerapp:killerapp-store-xstream</exclude>
+ </excludes>
+ -->
+ </dependencySet>
+ </dependencySets>
+</assembly>
Propchange:
maven/archiva/trunk/archiva-cli/src/main/assembly/archiva-cli-assembly.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/archiva/trunk/archiva-cli/src/main/assembly/archiva-cli-assembly.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified:
maven/archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/Cli.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/Cli.java?view=diff&rev=471098&r1=471097&r2=471098
==============================================================================
---
maven/archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/Cli.java
(original)
+++
maven/archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/Cli.java
Fri Nov 3 18:17:08 2006
@@ -158,6 +158,8 @@
File newRepositoryPath = new File( cli.getOptionValue(
CliManager.NEW_REPOSITORY_PATH ) );
+ System.out.println( "Converting " + oldRepositoryPath + "
to " + newRepositoryPath );
+
try
{
archiva.convertLegacyRepository( oldRepositoryPath,
newRepositoryPath, true );
Modified:
maven/archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/CliManager.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/CliManager.java?view=diff&rev=471098&r1=471097&r2=471098
==============================================================================
---
maven/archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/CliManager.java
(original)
+++
maven/archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/CliManager.java
Fri Nov 3 18:17:08 2006
@@ -48,10 +48,10 @@
options.addOption( OptionBuilder.withLongOpt( "convert"
).withDescription(
"Convert a legacy Maven 1.x repository to a Maven 2.x repository."
).create( CONVERT ) );
- options.addOption( OptionBuilder.withLongOpt( "old-repo"
).withDescription(
+ options.addOption( OptionBuilder.withLongOpt( "old-repo"
).hasArg().withDescription(
"Path to Maven 1.x legacy repository to convert." ).create(
OLD_REPOSITORY_PATH ) );
- options.addOption( OptionBuilder.withLongOpt( "new-repo"
).withDescription(
+ options.addOption( OptionBuilder.withLongOpt( "new-repo"
).hasArg().withDescription(
"Path to newly created Maven 2.x repository." ).create(
NEW_REPOSITORY_PATH ) );
}
Added: maven/archiva/trunk/archiva-cli/src/main/resources/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-cli/src/main/resources/META-INF/MANIFEST.MF?view=auto&rev=471098
==============================================================================
--- maven/archiva/trunk/archiva-cli/src/main/resources/META-INF/MANIFEST.MF
(added)
+++ maven/archiva/trunk/archiva-cli/src/main/resources/META-INF/MANIFEST.MF Fri
Nov 3 18:17:08 2006
@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+Archiver-Version: Plexus Archiver
+Created-By: 1.4.2-66 ("Apple Computer, Inc.")
+Main-Class: org.apache.maven.archiva.cli.Cli
