You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/08/29 22:01:24 UTC
svn commit: r264622 - in /geronimo/trunk/plugins/maven-geronimo-plugin:
plugin.jelly plugin.properties project.properties
Author: djencks
Date: Mon Aug 29 13:01:21 2005
New Revision: 264622
URL: http://svn.apache.org/viewcvs?rev=264622&view=rev
Log:
GERONIMO-942. copy jar overrides, copy config.xml and config.list
Added:
geronimo/trunk/plugins/maven-geronimo-plugin/plugin.properties
Modified:
geronimo/trunk/plugins/maven-geronimo-plugin/plugin.jelly
geronimo/trunk/plugins/maven-geronimo-plugin/project.properties
Modified: geronimo/trunk/plugins/maven-geronimo-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/maven-geronimo-plugin/plugin.jelly?rev=264622&r1=264621&r2=264622&view=diff
==============================================================================
--- geronimo/trunk/plugins/maven-geronimo-plugin/plugin.jelly (original)
+++ geronimo/trunk/plugins/maven-geronimo-plugin/plugin.jelly Mon Aug 29 13:01:21 2005
@@ -63,33 +63,22 @@
<unjar src="${maven.repo.local}/${geronimoName}/jars/${geronimoName}-assembly-${geronimoVersion}.jar" dest="${targetDir}"/>
<!--copy stuff for this project into new geronimo repository-->
- <ant:copy todir="${targetDir}/repository">
- <ant:fileset dir="${maven.repo.local}">
- <j:set var="docopy" value="false"/>
- <j:forEach var="artifact" items="${pom.artifacts}">
- <j:set var="dependency" value="${artifact.dependency}"/>
- <j:if test="${dependency.getProperty('repository') == 'true'}">
- <j:set var="docopy" value="true"/>
- <ant:include name="${dependency.getArtifactDirectory()}/${dependency.getType()}s/${dependency.getArtifact()}"/>
- </j:if>
- </j:forEach>
- <j:if test="${docopy == false}">
- <ant:exclude name="**/*"/>
- </j:if>
- </ant:fileset>
- </ant:copy>
- <!-- this version doesn't seem to work. Why not?-->
- <!--ant:copy todir="${targetDir}/repository">
- <mapper type="glob" from="${maven.repo.local}*" to="*"/>
- <ant:fileset dir="${maven.repo.local}">
- <j:forEach var="artifact" items="${pom.artifacts}">
- <j:set var="dependency" value="${artifact.dependency}"/>
- <j:if test="${dependency.getProperty('repository') == 'true'}">
- <ant:fileset include="${artifact.path}"/>
- </j:if>
- </j:forEach>
- </ant:fileset>
- </ant:copy-->
+ <!-- this code deals with jar overrides correctly -->
+ <j:forEach var="artifact" items="${pom.artifacts}">
+ <j:set var="dependency" value="${artifact.dependency}"/>
+ <j:if test="${dependency.getProperty('repository') == 'true'}">
+ <j:set var="depDir" value="${geronimo.home}/repository/${dependency.getArtifactDirectory()}/${dependency.getType()}s"/>
+ <ant:mkdir dir="${depDir}"/>
+ <ant:copy tofile="${depDir}/${dependency.getArtifact()}" file="${artifact.path}"/>
+ </j:if>
+ </j:forEach>
+ <copy todir="${targetDir}/var/config" overwrite="true">
+ <fileset dir="${basedir}/${geronimo.var.config.source}">
+ <include name="config.xml"/>
+ <include name="config.list"/>
+ </fileset>
+ </copy>
+
</define:tag>
Added: geronimo/trunk/plugins/maven-geronimo-plugin/plugin.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/maven-geronimo-plugin/plugin.properties?rev=264622&view=auto
==============================================================================
--- geronimo/trunk/plugins/maven-geronimo-plugin/plugin.properties (added)
+++ geronimo/trunk/plugins/maven-geronimo-plugin/plugin.properties Mon Aug 29 13:01:21 2005
@@ -0,0 +1,23 @@
+##
+##
+## Copyright 2005 The Apache Software Foundation
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+
+##
+## $Rev: 45927 $ $Date: 2004-09-11 16:29:34 -0700 (Sat, 11 Sep 2004) $
+##
+
+
+geronimo.var.config.source=src/config
Modified: geronimo/trunk/plugins/maven-geronimo-plugin/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/maven-geronimo-plugin/project.properties?rev=264622&r1=264621&r2=264622&view=diff
==============================================================================
--- geronimo/trunk/plugins/maven-geronimo-plugin/project.properties (original)
+++ geronimo/trunk/plugins/maven-geronimo-plugin/project.properties Mon Aug 29 13:01:21 2005
@@ -28,3 +28,4 @@
maven.junit.jvmargs=-ea
maven.multiproject.type=plugin
+