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/09/14 15:09:33 UTC
cvs commit: avalon-sandbox/merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools MerlinBean.java
mcconnell 2003/09/14 06:09:33
Modified: merlin/kernel/plugin plugin.jelly
merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools
MerlinBean.java
Log:
Update the plugin to support seperation of system and user repositories.
Revision Changes Path
1.2 +3 -3 avalon-sandbox/merlin/kernel/plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/kernel/plugin/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 10 Sep 2003 00:32:27 -0000 1.1
+++ plugin.jelly 14 Sep 2003 13:09:32 -0000 1.2
@@ -70,12 +70,12 @@
<j:set var="merlin.repo.local" value="${maven.home.local}"/>
<util:file var="repo" name="${merlin.repo.local}"/>
<j:if test="${repo.exists()}">
- <j:set var="merlin.repository.local" value="${merlin.repo.local}"/>
+ <j:set var="merlin.repository.local" value="${merlin.repo.local}/repository"/>
</j:if>
<j:if test="${!repo.exists()}">
- <j:set var="merlin.repository.local" value="${user.dir}/.maven"/>
+ <j:set var="merlin.repository.local" value="${user.dir}/.maven/repository"/>
</j:if>
- <echo>merlin.repository.local/2 = ${merlin.repository.local}</echo>
+ <echo>merlin.repository.local = ${merlin.repository.local}</echo>
<!--
If a kernel configuration has been declared the use it otherwise
1.2 +7 -4 avalon-sandbox/merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java
Index: MerlinBean.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MerlinBean.java 10 Sep 2003 00:32:28 -0000 1.1
+++ MerlinBean.java 14 Sep 2003 13:09:33 -0000 1.2
@@ -79,6 +79,11 @@
//-----------------------------------------------------
/**
+ * The merlin system directory.
+ */
+ private File m_system;
+
+ /**
* The target jar file, simulated deployment directory or
* block file to be deployed.
*/
@@ -133,7 +138,6 @@
*/
private int m_wait = 0; // not used
-
//-----------------------------------------------------
// bean pattern setters
//-----------------------------------------------------
@@ -229,7 +233,7 @@
}
/**
- * Get the repository directory fiile.
+ * Get the repository directory file.
* @return the repository directory
*/
private File getRepositoryDirectory()
@@ -324,8 +328,7 @@
DefaultKernelContext context = null;
try
{
- File repo = new File( m_repository, "repository" );
- Repository repository = new DefaultFileRepository( repo );
+ Repository repository = new DefaultFileRepository( m_repository );
context =
new DefaultKernelContext(
repository,
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org