You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2003/05/05 17:12:18 UTC
cvs commit: maven/src/plugins-build/runner/src/plugin-resources/templates classworlds.vm plexus.vm
jvanzyl 2003/05/05 08:12:18
Modified: src/plugins-build/runner plugin.jelly
src/plugins-build/runner/src/plugin-resources/templates
classworlds.vm plexus.vm
Log:
o Cleanup I did last night which was sitting in my live maven/plugins
directory.
Revision Changes Path
1.2 +17 -78 maven/src/plugins-build/runner/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/runner/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 5 May 2003 15:07:20 -0000 1.1
+++ plugin.jelly 5 May 2003 15:12:17 -0000 1.2
@@ -6,7 +6,7 @@
xmlns:deploy="deploy"
xmlns:sea="sea"
xmlns:velocity="jelly:org.apache.commons.jelly.tags.velocity.VelocityTagLibrary"
- xmlns:plexus="runner">
+ xmlns:runner="runner">
<!-- ===================================================================== -->
<!-- D E P L O Y P L E X U S -->
@@ -45,8 +45,8 @@
| @conf
| @confDir
| @modelPom
- | @plexusPomFile
- | @configurationProperties
+ | @main
+ | @options
|
-->
@@ -54,7 +54,7 @@
<j:set
var="templatePath"
- value="${pom.getPluginContext('maven-plexus-plugin').getVariable('plugin.dir')}/plugin-resources/templates"/>
+ value="${pom.getPluginContext('maven-runner-plugin').getVariable('plugin.dir')}/plugin-resources/templates"/>
<j:set
var="launcherConfiguration"
@@ -67,12 +67,13 @@
<runner:create-directory-structure
base="${base}"/>
- <runner:assemble-plexus-dependencies
+ <runner:assemble-dependencies
plexusPomFile="${plexusPomFile}"
plexusCoreLibDirectory="${base}/lib"/>
<runner:create-classworlds-configuration
- plexusPom="${plexusPomFile}"
+ main="${main}"
+ options="${options}"
templatePath="${templatePath}"
classWorldsConfiguration="${base}/conf/${launcherConfiguration}"
classWorldsConfigurationTemplate="${launcherConfigurationTemplate}"/>
@@ -93,81 +94,24 @@
<mkdir dir="${base}/bin"/>
<mkdir dir="${base}/conf"/>
- <mkdir dir="${base}/components"/>
<mkdir dir="${base}/lib"/>
- <mkdir dir="${base}/app-lib"/>
- <mkdir dir="${base}/work"/>
</define:tag>
- <!--
- |
- | Copy any Plexus/Application configuration files.
- |
- -->
- <define:tag name="process-configurations">
-
- <util:properties
- file="${configurationProperties}"
- var="appProperties"/>
-
- <copy
- todir="${destinationDirectory}"
- overwrite="true"
- filtering="on">
- <fileset dir="${sourceDirectory}"/>
- <filterset>
- <j:forEach var="appProperty" items="${appProperties.keys()}">
- <util:replace var="token" oldChar="." newChar="_" value="${appProperty}"/>
- <j:set var="token" value="${token.toUpperCase()}"/>
- <j:set var="propertyName" value="${appProperty}" />
- <j:set var="propertyValue" value="${appProperties.getProperty(propertyName)}"/>
- <filter token="${token}" value="${propertyValue}"/>
- </j:forEach>
- </filterset>
- </copy>
-
- </define:tag>
-
- <define:tag name="assemble-plexus-dependencies">
+ <define:tag name="assemble-dependencies">
- <maven:pom
- projectDescriptor="${plexusPomFile}"
- var="plexusPom"/>
-
- <j:set
- var="plexusJar"
- value="${maven.repo.local}/plexus/jars/${plexusPom.artifactId}-${plexusPom.currentVersion}.jar"/>
-
- <util:available file="${plexusJar}">
- <j:set var="plexusJarPresent" value="true"/>
- <copy file="${plexusJar}" todir="${plexusCoreLibDirectory}"/>
- </util:available>
-
- <j:if test="${plexusJarPresent != 'true'}">
- <get
- src="http://www.ibiblio.org/maven/plexus/jars/${plexusPom.artifactId}-${plexusPom.currentVersion}.jar"
- dest="${plexusCoreLibDirectory}"/>
- </j:if>
-
- <!--
- |
- | Now we need to pull down Plexus' dependencies to satisfy runtime
- | requirements.
- |
- -->
-
- <echo>Retrieving any missing Plexus dependencies ... </echo>
-
- ${plexusPom.verifyDependencies()}
-
- <!-- Copy the plexus dependencies into the runtime lib/. -->
-
<deploy:copy-deps
- projectDescriptor="${plexusPomFile}"
todir="${plexusCoreLibDirectory}"
excludes="junit"/>
-
+
+ <copy
+ file="${maven.repo.local}/classworlds/jars/classworlds-1.0-beta-5.jar"
+ todir="${plexusCoreLibDirectory}"/>
+
+ <copy
+ file="${basedir}/target/${maven.final.name}.jar"
+ todir="${plexusCoreLibDirectory}"/>
+
</define:tag>
<!--
@@ -181,16 +125,11 @@
<define:tag name="create-classworlds-configuration">
<echo>
- @plexusPom = ${plexusPom}
@templatePath = ${templatePath}
@classWorldsConfiguration = ${classWorldsConfiguration}
@classWorldsConfigurationTemplate = ${classWorldsConfigurationTemplate}
</echo>
- <maven:pom
- projectDescriptor="${plexusPom}"
- var="project"/>
-
<velocity:merge
name="${classWorldsConfiguration}"
basedir="${templatePath}"
1.2 +1 -1 maven/src/plugins-build/runner/src/plugin-resources/templates/classworlds.vm
Index: classworlds.vm
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/runner/src/plugin-resources/templates/classworlds.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- classworlds.vm 5 May 2003 15:07:20 -0000 1.1
+++ classworlds.vm 5 May 2003 15:12:18 -0000 1.2
@@ -1,4 +1,4 @@
-main is org.apache.plexus.PlexusContainerHost from core
+main is ${main} from core
[core]
load ${lib}/*.jar
1.2 +7 -8 maven/src/plugins-build/runner/src/plugin-resources/templates/plexus.vm
Index: plexus.vm
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/runner/src/plugin-resources/templates/plexus.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plexus.vm 5 May 2003 15:07:20 -0000 1.1
+++ plexus.vm 5 May 2003 15:12:18 -0000 1.2
@@ -109,19 +109,18 @@
echo "Using PLEXUS_TMPDIR: $PLEXUS_TMPDIR"
echo "Using JAVA_HOME: $JAVA_HOME"
-if [ "$1" = "" ]
-then
- CONF=${PLEXUS_CONF}/plexus.conf
-else
- CONF=$1
-fi
+for i in ${PLEXUS_HOME}/lib/*.jar
+do
+ CP=$CP:$i
+done
+
$JAVACMD \
$PLEXUS_OPTS \
- -classpath ${PLEXUS_HOME}/lib/classworlds-${CLASSWORLDS_VERSION}.jar \
+ -classpath $CP \
-Dclassworlds.conf=${PLEXUS_HOME}/conf/classworlds.conf \
-Dlib=${PLEXUS_HOME}/lib \
-Djava.io.tmpdir=${PLEXUS_TMPDIR} \
-Dtools.jar=$TOOLS_JAR \
-Dplexus.home=${PLEXUS_HOME} \
- $MAIN_CLASS ${CONF}
+ ${main} ${options}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org