You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/12/08 10:31:55 UTC
cvs commit: avalon/util/xdocs/exception navigation.xml
mcconnell 2003/12/08 01:31:55
Modified: util maven.xml
util/criteria/src/java/org/apache/avalon/util/criteria
PackedParameter.java
util/xdocs navigation.xml
util/xdocs/criteria navigation.xml
util/xdocs/defaults navigation.xml
util/xdocs/env navigation.xml
util/xdocs/exception navigation.xml
Added: util/plugin .cvsignore maven.xml plugin.jelly
plugin.properties project.xml
Log:
Move artifact plugin from repository to utilites.
Revision Changes Path
1.3 +2 -3 avalon/util/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/util/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 4 Dec 2003 21:01:32 -0000 1.2
+++ maven.xml 8 Dec 2003 09:31:54 -0000 1.3
@@ -7,7 +7,7 @@
<maven:reactor basedir="${basedir}"
includes="**/project.xml"
excludes="**/target/**,project.xml"
- goals="jar:install"
+ goals=""
banner="Building:"
ignoreFailures="false" />
</goal>
@@ -48,8 +48,7 @@
<sourcepath path="${basedir}/defaults/src/java"/>
<sourcepath path="${basedir}/env/src/java"/>
<sourcepath path="${basedir}/exception/src/java"/>
- <sourcepath path="${basedir}/factory/api/src/java"/>
- <sourcepath path="${basedir}/factory/impl/src/java"/>
+ <sourcepath path="${basedir}/criteria/src/java"/>
<classpath>
<path refid="maven.dependency.classpath"/>
</classpath>
1.2 +9 -3 avalon/util/criteria/src/java/org/apache/avalon/util/criteria/PackedParameter.java
Index: PackedParameter.java
===================================================================
RCS file: /home/cvs/avalon/util/criteria/src/java/org/apache/avalon/util/criteria/PackedParameter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PackedParameter.java 6 Dec 2003 22:05:07 -0000 1.1
+++ PackedParameter.java 8 Dec 2003 09:31:55 -0000 1.2
@@ -76,8 +76,9 @@
/**
* Transform a string to a string array.
- * @param object the value to transform
- * @return the transformed object
+ * @param key the parameter key
+ * @param delimiter the delimiter character
+ * @param defaults the default string array
*/
public PackedParameter(
final String key, final String delimiter, String[] defaults )
@@ -86,6 +87,11 @@
m_delimiter = delimiter;
}
+ /**
+ * Resolve a supplied string or string array to a sttring array value.
+ * @param value the value to resolve
+ * @exception CriteriaException if an error occurs
+ */
public Object resolve( Object value )
throws CriteriaException
{
1.1 avalon/util/plugin/.cvsignore
Index: .cvsignore
===================================================================
maven.log
velocity.log
target
.classpath
.project
build.xml
1.1 avalon/util/plugin/maven.xml
Index: maven.xml
===================================================================
<project default="plugin:install">
</project>
1.1 avalon/util/plugin/plugin.jelly
Index: plugin.jelly
===================================================================
<?xml version="1.0"?>
<project xmlns:j="jelly:core"
xmlns:define="jelly:define"
xmlns:util="jelly:util"
xmlns:maven="jelly:maven"
xmlns:ant="jelly:ant"
xmlns:avalon="avalon">
<!--
#
# Write out an artifact descriptor for the projects jar file.
# The goal writes out general information including meta domain
# and classification following by dependency information.
#
-->
<goal name="avalon:artifact">
<maven:snapshot project="${pom}"/>
<ant:property name="filename"
value="${maven.build.dir}/${pom.artifactId}-${pom.currentVersion}.jar.meta"/>
<ant:echo message="Artifact: ${filename}"/>
<j:set var="offset" value="${pom.artifactId.length()}"/>
<j:set var="scrap"
value="${snapshotSignature.substring(offset,snapshotSignature.length())}"/>
<j:set var="signature" value="${scrap.substring(1,scrap.length())}"/>
<ant:echo file="${filename}">
#
# Meta classifier.
#
meta.domain = avalon
meta.version = 1.0
#
# Artifact descriptor.
#
avalon.artifact.group = ${pom.groupId}
avalon.artifact.name = ${pom.artifactId}
avalon.artifact.version = ${pom.currentVersion}
avalon.artifact.signature = ${signature}
</ant:echo>
<j:set var="index" value="0"/>
<j:forEach var="dep" items="${pom.dependencies}">
<j:set var="key" value="${dep.groupId}:${dep.artifactId};${dep.version}"/>
<j:if test="${dep.getProperty('avalon.classloader')=='api'}">
<j:if test="${dep.getType()=='jar'}">
<j:if test="${index==0}">
<ant:echo file="${filename}" append="true">
#
# API dependencies.
#
</ant:echo>
</j:if>
<ant:echo file="${filename}" append="true">
avalon.artifact.dependency.api.${index} = ${key}</ant:echo>
<j:set var="index" value="${index+1}"/>
</j:if>
</j:if>
</j:forEach>
<j:set var="index" value="0"/>
<j:forEach var="dep" items="${pom.dependencies}">
<j:set var="key" value="${dep.groupId}:${dep.artifactId};${dep.version}"/>
<j:if test="${dep.getProperty('avalon.classloader')=='spi'}">
<j:if test="${dep.getType()=='jar'}">
<j:if test="${index==0}">
<ant:echo file="${filename}" append="true">
#
# SPI dependencies.
#
</ant:echo>
</j:if>
</j:if>
<ant:echo file="${filename}" append="true">
avalon.artifact.dependency.spi.${index} = ${key}</ant:echo>
<j:set var="index" value="${index+1}"/>
</j:if>
</j:forEach>
<j:set var="index" value="0"/>
<j:forEach var="dep" items="${pom.dependencies}">
<j:set var="key" value="${dep.groupId}:${dep.artifactId};${dep.version}"/>
<j:if test="${dep.getProperty('avalon.classloader')==null}">
<j:if test="${dep.getType()=='jar'}">
<j:if test="${index==0}">
<ant:echo file="${filename}" append="true">
#
# Implementation dependencies.
#
</ant:echo>
</j:if>
<ant:echo file="${filename}" append="true">
avalon.artifact.dependency.${index} = ${key}</ant:echo>
<j:set var="index" value="${index+1}"/>
</j:if>
</j:if>
</j:forEach>
<j:if test="${context.getVariable('avalon.artifact.factory') != null}">
<ant:echo file="${filename}" append="true">
#
# Factory.
#
avalon.artifact.factory = ${context.getVariable('avalon.artifact.factory')}
</ant:echo>
</j:if>
<ant:echo file="${filename}" append="true">
#
# EOF
#
</ant:echo>
<ant:property name="avalonArtifactDestination"
value="${maven.repo.local}/${pom.artifactDirectory}/jars"/>
<ant:mkdir dir="${avalonArtifactDestination}"/>
<ant:copy
file="${filename}"
todir="${avalonArtifactDestination}"
overwrite="true"
/>
</goal>
</project>
1.1 avalon/util/plugin/plugin.properties
Index: plugin.properties
===================================================================
# ------------------------------------------------------------------
# P L U G I N P R O P E R T I E S
# -------------------------------------------------------------------
# Avalon Artifact plugin.
# -------------------------------------------------------------------
1.1 avalon/util/plugin/project.xml
Index: project.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<project>
<extend>${basedir}/../project.xml</extend>
<pomVersion>3</pomVersion>
<groupId>avalon-util</groupId>
<id>avalon-plugin</id>
<name>Avalon Plugin</name>
<currentVersion>1.2.1-dev</currentVersion>
<description>Avalon Plugin for Maven</description>
<shortDescription>Avalon Plugin</shortDescription>
<package>org.apache.avalon</package>
<build>
<resources>
<resource>
<directory>${basedir}/src/plugin-resources</directory>
<targetPath>plugin-resources</targetPath>
</resource>
<resource>
<directory>${basedir}</directory>
<includes>
<include>plugin.jelly</include>
<include>plugin.properties</include>
<include>project.properties</include>
<include>project.xml</include>
</includes>
</resource>
</resources>
</build>
</project>
1.3 +1 -0 avalon/util/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/util/xdocs/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 6 Dec 2003 22:14:20 -0000 1.2
+++ navigation.xml 8 Dec 2003 09:31:55 -0000 1.3
@@ -68,6 +68,7 @@
<item name="Defaults" href="/defaults/index.html"/>
<item name="Environment" href="/env/index.html"/>
<item name="Exception" href="/exception/index.html"/>
+ <item name="Plugin" href="/plugin/index.html"/>
</menu>
<menu name="Resources">
1.2 +1 -0 avalon/util/xdocs/criteria/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/util/xdocs/criteria/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 6 Dec 2003 22:14:20 -0000 1.1
+++ navigation.xml 8 Dec 2003 09:31:55 -0000 1.2
@@ -68,6 +68,7 @@
<item name="Defaults" href="/defaults/index.html"/>
<item name="Environment" href="/env/index.html"/>
<item name="Exception" href="/exception/index.html"/>
+ <item name="Plugin" href="/plugin/index.html"/>
</menu>
<menu name="Resources">
1.3 +1 -0 avalon/util/xdocs/defaults/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/util/xdocs/defaults/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 6 Dec 2003 22:14:21 -0000 1.2
+++ navigation.xml 8 Dec 2003 09:31:55 -0000 1.3
@@ -68,6 +68,7 @@
<item name="Defaults" href="/defaults/index.html"/>
<item name="Environment" href="/env/index.html"/>
<item name="Exception" href="/exception/index.html"/>
+ <item name="Plugin" href="/plugin/index.html"/>
</menu>
<menu name="Resources">
1.3 +1 -0 avalon/util/xdocs/env/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/util/xdocs/env/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 6 Dec 2003 22:14:21 -0000 1.2
+++ navigation.xml 8 Dec 2003 09:31:55 -0000 1.3
@@ -68,6 +68,7 @@
<item name="Defaults" href="/defaults/index.html"/>
<item name="Environment" href="/env/index.html"/>
<item name="Exception" href="/exception/index.html"/>
+ <item name="Plugin" href="/plugin/index.html"/>
</menu>
<menu name="Resources">
1.3 +1 -0 avalon/util/xdocs/exception/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/util/xdocs/exception/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 6 Dec 2003 22:14:21 -0000 1.2
+++ navigation.xml 8 Dec 2003 09:31:55 -0000 1.3
@@ -68,6 +68,7 @@
<item name="Defaults" href="/defaults/index.html"/>
<item name="Environment" href="/env/index.html"/>
<item name="Exception" href="/exception/index.html"/>
+ <item name="Plugin" href="/plugin/index.html"/>
</menu>
<menu name="Resources">
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org