mcconnell 2003/10/28 04:53:49
Modified:
merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
DefaultAppliance.java
merlin/composition/api/src/java/org/apache/avalon/composition/data
CategoriesDirective.java ClassLoaderDirective.java
ClasspathDirective.java ContainmentProfile.java
DeploymentProfile.java ImportDirective.java
Parameter.java Profile.java
RepositoryDirective.java
merlin/composition/api/src/java/org/apache/avalon/composition/model
ContainmentModel.java DeploymentContext.java
DeploymentModel.java EntryModel.java
ModelFactory.java ModelSelector.java
ProfileUnknownException.java
merlin/kernel/loader/src/java/org/apache/avalon/merlin
KernelDefaults.java
merlin/kernel/unit project.xml
Log:
Housekeeping.
Revision Changes Path
1.10 +7 -1
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java
Index: DefaultAppliance.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultAppliance.java 22 Oct 2003 01:45:37 -0000 1.9
+++ DefaultAppliance.java 28 Oct 2003 12:53:48 -0000 1.10
@@ -431,6 +431,12 @@
}
}
+ /**
+ * Return the set of appliances assigned as deployment and runtime providers.
+ * @return the extenernal providers consumed by the appliance
+ * @exception IllegalStateException if invoked prior to
+ * the completion of the assembly phase
+ */
public Appliance[] getProviders()
{
final ArrayList list = new ArrayList();
1.2 +1 -3
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/CategoriesDirective.java
Index: CategoriesDirective.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/CategoriesDirective.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CategoriesDirective.java 24 Sep 2003 09:31:02 -0000 1.1
+++ CategoriesDirective.java 28 Oct 2003 12:53:48 -0000 1.2
@@ -52,8 +52,6 @@
import java.io.Serializable;
-import org.apache.avalon.meta.info.Type;
-
/**
* Description of a set of categories.
1.2 +1 -4
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ClassLoaderDirective.java
Index: ClassLoaderDirective.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ClassLoaderDirective.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClassLoaderDirective.java 24 Sep 2003 09:31:02 -0000 1.1
+++ ClassLoaderDirective.java 28 Oct 2003 12:53:48 -0000 1.2
@@ -50,10 +50,7 @@
package org.apache.avalon.composition.data;
-import java.io.File;
-import java.io.IOException;
import java.io.Serializable;
-import java.util.ArrayList;
/**
* Description of classloader.
1.2 +1 -4
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ClasspathDirective.java
Index: ClasspathDirective.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ClasspathDirective.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClasspathDirective.java 24 Sep 2003 09:31:03 -0000 1.1
+++ ClasspathDirective.java 28 Oct 2003 12:53:48 -0000 1.2
@@ -50,10 +50,7 @@
package org.apache.avalon.composition.data;
-import java.io.File;
-import java.io.IOException;
import java.io.Serializable;
-import java.util.ArrayList;
/**
* Description of classpath.
1.2 +1 -5
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ContainmentProfile.java
Index: ContainmentProfile.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ContainmentProfile.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContainmentProfile.java 24 Sep 2003 09:31:04 -0000 1.1
+++ ContainmentProfile.java 28 Oct 2003 12:53:48 -0000 1.2
@@ -57,11 +57,7 @@
import java.util.ArrayList;
-import org.apache.avalon.meta.info.DependencyDescriptor;
-import org.apache.avalon.meta.info.ReferenceDescriptor;
import org.apache.avalon.meta.info.ServiceDescriptor;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.configuration.Configuration;
/**
* A containment profile describes a containment context including
1.5 +1 -10
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/DeploymentProfile.java
Index: DeploymentProfile.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/DeploymentProfile.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DeploymentProfile.java 19 Oct 2003 10:31:01 -0000 1.4
+++ DeploymentProfile.java 28 Oct 2003 12:53:48 -0000 1.5
@@ -50,17 +50,8 @@
package org.apache.avalon.composition.data;
-import java.io.Serializable;
-
-import org.apache.avalon.framework.Version;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.meta.info.DependencyDescriptor;
-import org.apache.avalon.meta.info.ReferenceDescriptor;
-import org.apache.avalon.meta.info.ServiceDescriptor;
import org.apache.avalon.meta.info.InfoDescriptor;
/**
1.2 +1 -3
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ImportDirective.java
Index: ImportDirective.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ImportDirective.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ImportDirective.java 24 Sep 2003 09:31:07 -0000 1.1
+++ ImportDirective.java 28 Oct 2003 12:53:48 -0000 1.2
@@ -50,8 +50,6 @@
package org.apache.avalon.composition.data;
-import java.io.Serializable;
-
/**
* An inport directive used within a context directive to request a container
scoped values.
*
1.2 +1 -3
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/Parameter.java
Index: Parameter.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/Parameter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Parameter.java 24 Sep 2003 09:31:09 -0000 1.1
+++ Parameter.java 28 Oct 2003 12:53:48 -0000 1.2
@@ -51,8 +51,6 @@
package org.apache.avalon.composition.data;
import java.io.Serializable;
-import java.lang.reflect.Constructor;
-import java.util.Map;
/**
* A <code>Parameter</code> represents a single constructor typed argument value.
A parameter
1.2 +1 -8
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/Profile.java
Index: Profile.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/Profile.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Profile.java 24 Sep 2003 09:31:09 -0000 1.1
+++ Profile.java 28 Oct 2003 12:53:48 -0000 1.2
@@ -52,13 +52,6 @@
import java.io.Serializable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.meta.info.DependencyDescriptor;
-import org.apache.avalon.meta.info.ReferenceDescriptor;
-import org.apache.avalon.meta.info.ServiceDescriptor;
-
/**
* Abstract base class for DeploymentProfile and ContainmentProfile.
*
1.2 +1 -4
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/RepositoryDirective.java
Index: RepositoryDirective.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/RepositoryDirective.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RepositoryDirective.java 24 Sep 2003 09:31:10 -0000 1.1
+++ RepositoryDirective.java 28 Oct 2003 12:53:48 -0000 1.2
@@ -50,10 +50,7 @@
package org.apache.avalon.composition.data;
-import java.io.File;
-import java.io.IOException;
import java.io.Serializable;
-import java.util.ArrayList;
/**
* Description of repository requests.
1.4 +1 -3
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java
Index: ContainmentModel.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContainmentModel.java 13 Oct 2003 01:28:26 -0000 1.3
+++ ContainmentModel.java 28 Oct 2003 12:53:48 -0000 1.4
@@ -52,8 +52,6 @@
import java.net.URL;
-import org.apache.avalon.composition.data.ContainmentProfile;
-import org.apache.avalon.composition.data.DeploymentProfile;
import org.apache.avalon.composition.data.Profile;
import org.apache.avalon.composition.data.ServiceDirective;
import org.apache.avalon.composition.data.CategoriesDirective;
1.2 +1 -2
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/DeploymentContext.java
Index: DeploymentContext.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/DeploymentContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DeploymentContext.java 24 Sep 2003 09:31:17 -0000 1.1
+++ DeploymentContext.java 28 Oct 2003 12:53:48 -0000 1.2
@@ -53,7 +53,6 @@
import java.io.File;
import org.apache.avalon.meta.info.ContextDescriptor;
-import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.meta.info.Type;
1.5 +1 -3
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/DeploymentModel.java
Index: DeploymentModel.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/DeploymentModel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DeploymentModel.java 19 Oct 2003 10:31:01 -0000 1.4
+++ DeploymentModel.java 28 Oct 2003 12:53:48 -0000 1.5
@@ -50,8 +50,6 @@
package org.apache.avalon.composition.model;
-import java.util.Map;
-
import org.apache.avalon.composition.data.CategoriesDirective;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.parameters.Parameters;
1.2 +1 -6
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/EntryModel.java
Index: EntryModel.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/EntryModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EntryModel.java 24 Sep 2003 09:31:17 -0000 1.1
+++ EntryModel.java 28 Oct 2003 12:53:48 -0000 1.2
@@ -50,11 +50,6 @@
package org.apache.avalon.composition.model;
-import java.util.Map;
-
-import org.apache.avalon.framework.context.Context;
-
-
/**
* <p>Specification of a context enty model from which a
* a context value can be established.</p>
1.2 +1 -3
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ModelFactory.java
Index: ModelFactory.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ModelFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ModelFactory.java 24 Sep 2003 09:31:18 -0000 1.1
+++ ModelFactory.java 28 Oct 2003 12:53:48 -0000 1.2
@@ -50,10 +50,8 @@
package org.apache.avalon.composition.model;
-import java.io.File;
import java.net.URL;
-import org.apache.avalon.repository.Repository;
import org.apache.avalon.composition.data.ContainmentProfile;
/**
1.2 +1 -2
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ModelSelector.java
Index: ModelSelector.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ModelSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ModelSelector.java 24 Sep 2003 09:31:19 -0000 1.1
+++ ModelSelector.java 28 Oct 2003 12:53:48 -0000 1.2
@@ -52,7 +52,6 @@
import org.apache.avalon.meta.info.DependencyDescriptor;
import org.apache.avalon.meta.info.StageDescriptor;
-import org.apache.avalon.composition.data.Profile;
/**
* Interface implemented by a service selection implementation mechanism. Classes
1.2 +1 -3
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ProfileUnknownException.java
Index: ProfileUnknownException.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ProfileUnknownException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProfileUnknownException.java 24 Sep 2003 09:31:21 -0000 1.1
+++ ProfileUnknownException.java 28 Oct 2003 12:53:48 -0000 1.2
@@ -50,8 +50,6 @@
package org.apache.avalon.composition.model;
-import org.apache.avalon.framework.CascadingException;
-
/**
* Exception to indicate that a profile is unknown.
*
1.5 +70 -28
avalon/merlin/kernel/loader/src/java/org/apache/avalon/merlin/KernelDefaults.java
Index: KernelDefaults.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/kernel/loader/src/java/org/apache/avalon/merlin/KernelDefaults.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- KernelDefaults.java 28 Oct 2003 10:34:26 -0000 1.4
+++ KernelDefaults.java 28 Oct 2003 12:53:49 -0000 1.5
@@ -80,6 +80,9 @@
*/
public class KernelDefaults
{
+ private static final String MERLIN_HOME_ENV = "MERLIN_HOME";
+ private static final String MERLIN_REPO_LOCAL_ENV = "MERLIN_REPO_LOCAL";
+
private static final String [] s_keys =
{
"merlin.policy.server",
@@ -164,28 +167,7 @@
// Stage II - get some properties from the environment.
//
- File l_merlinHome = null ;
- try
- {
- final String merlinHomeEnv = Env.getVariable( "MERLIN_HOME" );
- if( merlinHomeEnv != null )
- {
- l_merlinHome = new File( merlinHomeEnv ) ;
- }
- else
- {
- final String userHome = System.getProperty( "user.home" );
- if( userHome != null )
- {
- File userDir = new File( userHome );
- l_merlinHome = new File( userDir, ".merlin" ) ;
- }
- }
- }
- catch( EnvAccessException e )
- {
- e.printStackTrace( System.err ) ;
- }
+ File l_merlinHome = getMerlinHome();
if ( null != l_merlinHome && l_merlinHome.exists() )
{
@@ -196,12 +178,8 @@
l_sysRepo.getAbsolutePath() ) ;
}
- //
- // TODO need to provide support for an env supplied
- // user repository override value
- //
+ File l_userRepo = getMerlinUserRepository( l_merlinHome );
- File l_userRepo = new File( l_merlinHome, "repository" ) ;
if ( l_userRepo.exists() )
{
s_defaults.setProperty( USER_REPO_KEY,
@@ -458,6 +436,70 @@
}
return false ;
+ }
+
+ /**
+ * Return the default value of the merlin installation home. The
+ * value returned corresponds to the environment variable MERLIN_HOME.
+ * If the env variable is undefined, return ${user.home}/.merlin
+ * @return the default merlin install path
+ */
+ private static File getMerlinHome()
+ {
+ File l_merlinHome = null ;
+ try
+ {
+ final String merlinHomeEnv = Env.getVariable( MERLIN_HOME_ENV );
+ if( merlinHomeEnv != null )
+ {
+ return new File( merlinHomeEnv ) ;
+ }
+ else
+ {
+ final String userHome = System.getProperty( "user.home" );
+ if( userHome != null )
+ {
+ File userDir = new File( userHome );
+ return new File( userDir, ".merlin" ) ;
+ }
+ else
+ {
+ return null;
+ }
+ }
+ }
+ catch( EnvAccessException e )
+ {
+ e.printStackTrace( System.err ) ;
+ return null;
+ }
+ }
+
+ /**
+ * Return the default value of the merlin local user repository. The
+ * value returned corresponds to the environment variable MERLIN_REPO_LOCAL.
+ * If the env variable is undefined, return ${merlin.home}/repository
+ * @return the default merlin local user repository path
+ */
+ private static File getMerlinUserRepository( File home )
+ {
+ try
+ {
+ final String userRepoEnv = Env.getVariable( MERLIN_REPO_LOCAL_ENV );
+ if( userRepoEnv != null )
+ {
+ return new File( userRepoEnv ) ;
+ }
+ else
+ {
+ return new File( home, "repository" );
+ }
+ }
+ catch( EnvAccessException e )
+ {
+ e.printStackTrace( System.err ) ;
+ return null;
+ }
}
}
1.10 +1 -1 avalon/merlin/kernel/unit/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/unit/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 19 Oct 2003 06:12:59 -0000 1.9
+++ project.xml 28 Oct 2003 12:53:49 -0000 1.10
@@ -6,7 +6,7 @@
<groupId>merlin</groupId>
<id>merlin-unit</id>
<name>Merlin Unit</name>
- <currentVersion>3.2-dev</currentVersion>
+ <currentVersion>3.2.1-dev</currentVersion>
<package>org.apache.avalon.merlin.unit</package>
<inceptionYear>2003</inceptionYear>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
