cvs commit: maven/src/plugins-build/artifact/src/plugin-resources/templates manifest.vm
dion2003/08/18 22:06:09
Modified:src/plugins-build/artifact/src/plugin-resources/templates
manifest.vm
Log:
Ascii
Revision ChangesPath
1.2 +56 -56
maven/src/plugins-build/artifact/src/plugin-resources/templates/manifest.vm
Index: manifest.vm
===
RCS file:
/home/cvs/maven/src/plugins-build/artifact/src/plugin-resources/templates/manifest.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- manifest.vm 16 Jun 2003 14:26:02 - 1.1
+++ manifest.vm 19 Aug 2003 05:06:09 - 1.2
@@ -1,56 +1,56 @@
-Built-By: ${jellyContext.getVarable("user.name")}
-Created-By: Apache Jakarta Maven
-#if (${pom.Package})
-Package: ${pom.Package}
-#end
-Build-Jdk: ${jellyContext.getVarable("java.version")}
-#if (${pom.ArtifactId})
-Extension-Name: ${pom.ArtifactId}
-#end
-#if (${pom.SpecificationVersion})
-Specification-Version: ${pom.SpecificationVersion}
-#end
-#if (${pom.Organization.Name})
-Specification-Vendor: ${pom.Organization.Name}
-#end
-#if (${pom.ShortDescription})
-Specification-Title: ${pom.ShortDescription}
-#end
-#if (${pom.CurrentVersion})
-Implementation-Version: ${pom.CurrentVersion}
-#end
-#if (${pom.Organization.Name})
-Implementation-Vendor: ${pom.Organization.Name}
-Implementation-Vendor-Id: ${pom.Organization.Name}
-#end
-
-#if(${mainclass})
-Main-Class=${mainclass}
-#end
-
-
-#if( ${addExtensions})
- #set($extensionList = "")
- #foreach($artifact in $pom.Artifacts)
- #set ($dep= $artifact.Dependency )
- #if( $dep.Type == "jar" )
- #set($extensionList = "$extensionList $artifact.Dependency.ArtifactId")
- #end
- #end
-
-Extension-List: ${extensionList}
-
- #foreach($artifact in $pom.Artifacts)
-#set ($dep= $artifact.Dependency )
-#if( $dep.Type == "jar" )
-
-${dep.ArtifactId}-Extension-Name: ${dep.ArtifactId}
-${dep.ArtifactId}-Implementation-Version: ${dep.Version}
-#if($dep.Url)
-${dep.ArtifactId}-Implementation-URL: ${dep.Url}
-#else
-${dep.ArtifactId}-Implementation-URL: http://www.ibiblio.org/maven/
-#end
-#end
- #end
-#end
+Built-By: ${jellyContext.getVarable("user.name")}
+Created-By: Apache Jakarta Maven
+#if (${pom.Package})
+Package: ${pom.Package}
+#end
+Build-Jdk: ${jellyContext.getVarable("java.version")}
+#if (${pom.ArtifactId})
+Extension-Name: ${pom.ArtifactId}
+#end
+#if (${pom.SpecificationVersion})
+Specification-Version: ${pom.SpecificationVersion}
+#end
+#if (${pom.Organization.Name})
+Specification-Vendor: ${pom.Organization.Name}
+#end
+#if (${pom.ShortDescription})
+Specification-Title: ${pom.ShortDescription}
+#end
+#if (${pom.CurrentVersion})
+Implementation-Version: ${pom.CurrentVersion}
+#end
+#if (${pom.Organization.Name})
+Implementation-Vendor: ${pom.Organization.Name}
+Implementation-Vendor-Id: ${pom.Organization.Name}
+#end
+
+#if(${mainclass})
+Main-Class=${mainclass}
+#end
+
+
+#if( ${addExtensions})
+ #set($extensionList = "")
+ #foreach($artifact in $pom.Artifacts)
+ #set ($dep= $artifact.Dependency )
+ #if( $dep.Type == "jar" )
+ #set($extensionList = "$extensionList $artifact.Dependency.ArtifactId")
+ #end
+ #end
+
+Extension-List: ${extensionList}
+
+ #foreach($artifact in $pom.Artifacts)
+#set ($dep= $artifact.Dependency )
+#if( $dep.Type == "jar" )
+
+${dep.ArtifactId}-Extension-Name: ${dep.ArtifactId}
+${dep.ArtifactId}-Implementation-Version: ${dep.Version}
+#if($dep.Url)
+${dep.ArtifactId}-Implementation-URL: ${dep.Url}
+#else
+${dep.ArtifactId}-Implementation-URL: http://www.ibiblio.org/maven/
+#end
+#end
+ #end
+#end
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: maven/src/plugins-build/artifact/src/plugin-resources/templates manifest.vm
> -Original Message-
> From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
> Sent: Tuesday, June 17, 2003 6:18 AM
> To: [EMAIL PROTECTED]
> Subject: Re: cvs commit: maven/src/plugins-build/artifact/src/plugin-
> resources/templates manifest.vm
>
> > Generic code for:
> >
> >- deployment of artifact to remote repositry
> >
> > - installaton of artifact to local repository
> >
> This seems like code that is duplicating the repository and deploy
> plugins. Why do we want a third way of doing this
>
This one is developed in pure Java + supports deployment to various types
of repositories. Soon it will support deployment to multiple repositories.
And I think it is easier to use it then other ones + the code is more
centralized. I hope to test it with junit. This was rather hard in case of
"old" plugins.
> Can you please change the others to use this code if it works?
It is not yet fully finished. Once I will be sure that it works I am
planning to change other plugins.
For the moment I use war plugin as demonstration how this is supposed
to work from the point of other plugins, so if any body has some remarks...
let me know.
FYI:
package org.apache.maven.artifact.deployer.deploy;
is meant to be refactored. I think the best will be to make a "sister"
component of "fetch" in maven-new.
This code is not depending on any maven apis, and can be possibly reused
like does "fetch" component.
Package org.apache.maven.artifact.deployer;
Contains higher level API, which uses maven API and it is supposed to be
used in plugins.
[OT]
I am thinking about deploying java sources and javadocs to repository.
Any idea about naming convention of those artifacts? With maven-new it
will be easy to control, with maven-old it is not so easy.
I am thinking about:
/${groupId}/apis/${artitifactId}_api-${version}.jar (for javadocs)
/${groupId}/srcs/${artitifactId}_src-${version}.jar (for sources).
Any better ideas?
Other question is where is the best place for such functionality?
I think for javadoc it is javadoc plugin. But for sources?
Any hints what else can we deploy?
Other idea:
We have;
jar:jar
war:war
ear:ear
etc..
Wouldn't it be more consistent to have:
jar:archive
war:archive
ear:archive
javadoc:archive
java:src-archive
etc?
regards
Michal
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven/src/plugins-build/artifact/src/plugin-resources/templates manifest.vm
michal 2003/06/16 07:26:02
Added: src/plugins-build/artifact project.properties
plugin.properties .cvsignore project.xml
plugin.jelly
src/plugins-build/artifact/src/main/org/apache/maven/artifact/deployer
MavenAuthenticationInfo.java
DefaultArtifactDeployer.java DeployBean.java
ArtifactDeployer.java
src/plugins-build/artifact/src/main/org/apache/maven/artifact/deployer/deploy
SshDeployer.java HttpDeployer.java
AbstractDeployer.java Deployer.java
GenericAuthenticationInfo.java
AuthenticationInfo.java FtpDeployer.java
src/plugins-build/artifact/src/plugin-resources/templates
manifest.vm
Log:
Generic code for:
- deployment of artifact to remote repositry
- installaton of artifact to local repository
- manifest generation
Revision ChangesPath
1.1 maven/src/plugins-build/artifact/project.properties
Index: project.properties
===
# ---
# P R O J E C T P R O P E R T I E S
# ---
1.1 maven/src/plugins-build/artifact/plugin.properties
Index: plugin.properties
===
# ---
# P L U G I N P R O P E R T I E S
# ---
maven.artifact.manifest.extensions.add=false
maven.artifact.manifest.basedir=${plugin.dir}/plugin-resources/templates
maven.artifact.manifest.template=manifest.vm
1.1 maven/src/plugins-build/artifact/.cvsignore
Index: .cvsignore
===
target
velocity.log
maven.log
1.1 maven/src/plugins-build/artifact/project.xml
Index: project.xml
===
${basedir}/../project.xml
3
maven-artifact-plugin
Maven Artifact Plug-in
1.0
Java Project Management Tools
http://maven.apache.org/reference/plugins/artifact/
/www/maven.apache.org/reference/plugins/artifact/
scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:maven/src/plugins-build/artifact/
http://cvs.apache.org/viewcvs/maven/src/plugins-build/artifact/
maven
maven
SNAPSHOT
jar
commons-io
commons-io
20030203.000550
jar
commons-net
commons-net
1.0.0
jar
commons-httpclient
commons-httpclient
2.0-beta1
jar
jsch
jsch
0.0.9
jar
commons-jelly
commons-jelly
20030310.073407
http://jakarta.apache.org/commons/jelly/
jar
commons-jelly
commons-jelly-tags-velocity
20030303.205659
jar
velocity
velocity
1.3
jar
1.1 maven/src/plugins-build/artifact/plugin.jelly
Index: plugin.jelly
===
Creating MANIFEST file:${filename}
Mainclass: ${mainclass}
addExtensions ${addExtensions}
1.1
maven/src/plugins-build/artifact/src/main/org/apache/maven/artifact/deployer/MavenAuthenticationInfo.java
Index: MavenAuthenticationInfo.java
===
package org.apache.maven.artifact.deployer;
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following
