mcconnell 2003/12/08 04:48:48
Modified: repository README.TXT maven.xml
repository/impl maven.xml
repository/main/src/java/org/apache/avalon/repository/main
DefaultBuilder.java DefaultInitialContext.java
Log:
Housekeeping.
Revision Changes Path
1.2 +4 -12 avalon/repository/README.TXT
Index: README.TXT
===================================================================
RCS file: /home/cvs/avalon/repository/README.TXT,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.TXT 4 Dec 2003 19:34:27 -0000 1.1
+++ README.TXT 8 Dec 2003 12:48:48 -0000 1.2
@@ -16,19 +16,11 @@
Build Dependencies: Maven beta10 or later.
-Prerequisites:
+IMPORTANT - before building avalon/repository you must
+checkout and build the avalon/util project.
-Some recent version of the avalon meta plugin included content
-that has been moved to the repository plugin. To ensure that
-you do not have any conflicts you can updated the avalon/meta
-project from cvs and invoke avalon:setup from the avalon/meta
-root directory to update the meta plugin.
-
-Before building the repository project you need to install the
-avalon-repository plugin. A convinience goal is provided:
-
- $ cd /avalon/repository
- $ maven avalon:setup
+The following instructions assume you are working from the
+repository root directory.
The following goal builds the repository project:
1.3 +20 -80 avalon/repository/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/repository/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 5 Dec 2003 02:03:59 -0000 1.2
+++ maven.xml 8 Dec 2003 12:48:48 -0000 1.3
@@ -1,11 +1,5 @@
<project default="avalon:build" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util" xmlns:ant="jelly:ant">
- <ant:property name="repo.plugin.groupId" value="avalon-repository"/>
- <ant:property name="repo.plugin.artifactId" value="avalon-repository-plugin"/>
- <ant:property name="repo.plugin.version" value="1.2.1-dev"/>
- <ant:property name="repo.plugin.jar"
- value="${repo.plugin.artifactId}-${repo.plugin.version}.jar"/>
-
<ant:property name="pom.organization.identifier" value="ASF"/>
<ant:property name="pom.specificationVersion" value="1.2"/>
<ant:property name="maven.docs.src" value="${basedir}/site/xdocs"/>
@@ -14,93 +8,22 @@
<goal name="avalon:build" description="Build the Repository.">
<maven:reactor basedir="${basedir}"
includes="**/project.xml"
- excludes="**/target/**,project.xml"
+ excludes="project.xml"
goals=""
banner="Building:"
ignoreFailures="false" />
</goal>
- <goal name="avalon:clean" prereqs="clean">
+ <goal name="avalon:clean" prereqs="clean" description="Clean all subprojects.">
<maven:reactor
basedir="${basedir}"
includes="**/project.xml"
- excludes="project.xml,**/target/**"
+ excludes="project.xml"
goals="clean:clean"
banner="Cleaning subproject:"
ignoreFailures="false"/>
</goal>
- <postGoal name="java:prepare-filesystem">
- <ant:available file="${maven.home}/plugins/${repo.plugin.jar}"
- property="repoPluginPresent"/>
- <j:if test="${repoPluginPresent != 'true'}">
- <ant:echo>
-#####################################################################
-# #
-# WARNING: #
-# You do not have the required version of the avalon-repository #
-# plugin installed on your system. #
-# Please invoke the following command #
-# #
-# $ maven avalon:setup #
-# #
-#####################################################################</ant:echo>
- <attainGoal name="avalon:repo-plugin-install"/>
- </j:if>
- </postGoal>
-
- <goal name="avalon:setup">
- <echo>
-Initiating download and installation of the Avalon Repository Plugin.
-${repo.plugin.artifactId}-${repo.plugin.version}.jar</echo>
- <j:set var="repoList">${maven.repo.remote}</j:set>
- <util:tokenize var="repos" delim=",">${repoList.trim()}</util:tokenize>
- <j:forEach var="repo" items="${repos}">
- <echo>repository '${repo}'</echo>
- <util:file var="localPlugin"
name="${maven.home}/plugins/${repo.plugin.artifactId}-${repo.plugin.version}.jar" />
- <j:if test="${!localPlugin.exists()}">
- <j:set var="remoteFile"
value="${repo}/${repo.plugin.groupId}/plugins/${repo.plugin.artifactId}-${repo.plugin.version}.jar"
/>
- <echo>trying to download ${remoteFile}</echo>
- <j:catch var="ex">
- <j:invokeStatic var="dummy" method="getFile"
className="org.apache.maven.util.HttpUtils">
- <j:arg type="java.lang.String" value="${remoteFile}" />
- <j:arg type="java.io.File" value="${localPlugin}"/>
- <j:arg type="boolean" value="false"/>
- <j:arg type="boolean" value="true"/>
- <j:arg type="java.lang.String" value="${maven.proxy.host}" />
- <j:arg type="java.lang.String" value="${maven.proxy.port}" />
- <j:arg type="java.lang.String" value="${maven.proxy.username}" />
- <j:arg type="java.lang.String" value="${maven.proxy.password}" />
- <j:arg type="boolean" value="false"/>
- </j:invokeStatic>
- </j:catch>
- </j:if>
- <j:break test="${localPlugin.exists()}"/>
- </j:forEach>
- <j:set var="downloaded" value="${localPlugin.exists()}"/>
- <j:if test="${!downloaded}">
- <ant:fail message="Unable to find plug-in" />
- </j:if>
- <j:if test="${downloaded}">
- <ant:move file="${localPlugin}" toFile="tmp.jar"/>
- <echo>Plugin downloaded, removing other versions</echo>
- <delete verbose="false">
- <fileset dir="${maven.home}/plugins">
- <include name="${repo.plugin.artifactId}-*.jar" />
- <exclude name="${repo.plugin.artifactId}-${repo.plugin.version}.jar" />
- </fileset>
- </delete>
- <delete includeEmptyDirs="true" verbose="false">
- <fileset dir="${maven.plugin.unpacked.dir}">
- <include name="*.cache"/>
- <include name="**/.processed" />
- <include name="${repo.plugin.artifactId}-*/**" />
- </fileset>
- </delete>
- <ant:move file="tmp.jar" toFile="${localPlugin}"/>
- </j:if>
- </goal>
-
<goal name="avalon:site">
<maven:reactor basedir="${basedir}"
includes="platform.xml"
@@ -136,5 +59,22 @@
</ant:javadoc>
</goal>
+ <postGoal name="java:prepare-filesystem">
+ <ant:available file="${maven.home}/plugins/${repo.plugin.jar}"
+ property="repoPluginPresent"/>
+ <j:if test="${repoPluginPresent != 'true'}">
+ <ant:echo>
+#####################################################################
+# #
+# WARNING: #
+# You do not have the required version of the avalon-repository #
+# plugin installed on your system. #
+# Please invoke the following command #
+# #
+# $ maven avalon:setup #
+# #
+#####################################################################</ant:echo>
+ </j:if>
+ </postGoal>
</project>
1.3 +1 -1 avalon/repository/impl/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/repository/impl/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 5 Dec 2003 02:03:59 -0000 1.2
+++ maven.xml 8 Dec 2003 12:48:48 -0000 1.3
@@ -1,5 +1,5 @@
<project default="jar:install" xmlns:ant="jelly:ant">
- <postGoal name="java:prepare-filesystem">
+ <postGoal name="test:test">
<attainGoal name="avalon:artifact"/>
</postGoal>
<postGoal name="jar:install">
1.6 +2 -2
avalon/repository/main/src/java/org/apache/avalon/repository/main/DefaultBuilder.java
Index: DefaultBuilder.java
===================================================================
RCS file:
/home/cvs/avalon/repository/main/src/java/org/apache/avalon/repository/main/DefaultBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultBuilder.java 8 Dec 2003 08:29:18 -0000 1.5
+++ DefaultBuilder.java 8 Dec 2003 12:48:48 -0000 1.6
@@ -136,8 +136,8 @@
* Creates a DefaultBuilder for a specific target application.
*
* @param context the initial repository context
+ * @param classloader the parent classloader
* @param artifact the reference to the application
- * @param args the command line arguments
* @exception Exception if a app factory creation error occurs
*/
public DefaultBuilder(
1.8 +0 -0
avalon/repository/main/src/java/org/apache/avalon/repository/main/DefaultInitialContext.java
Index: DefaultInitialContext.java
===================================================================
RCS file:
/home/cvs/avalon/repository/main/src/java/org/apache/avalon/repository/main/DefaultInitialContext.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
