mcconnell 2004/04/04 16:33:56
Modified: merlin/activation/impl/src/java/org/apache/avalon/activation/impl
AbstractAppliance.java
AbstractLifestyleManager.java DefaultBlock.java
DefaultRuntime.java
merlin/composition/api/src/java/org/apache/avalon/composition/model
Resolver.java
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
DefaultDeploymentModel.java
DefaultSystemContext.java
merlin/composition/impl/src/test/org/apache/avalon/composition/model/impl
SimpleDeploymentModel.java
merlin/composition/spi/src/java/org/apache/avalon/composition/provider
Runtime.java SystemContext.java
merlin/platform/xdocs/merlin/systems composition.xml
meta.xml repository.xml
Added: merlin/platform/xdocs/images logic.gif
Log:
Expose resolve( boolean proxy ) on the Resolver interface.
Revision Changes Path
1.4 +9 -1
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/AbstractAppliance.java
Index: AbstractAppliance.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/AbstractAppliance.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractAppliance.java 17 Mar 2004 10:30:07 -0000 1.3
+++ AbstractAppliance.java 4 Apr 2004 23:33:56 -0000 1.4
@@ -82,6 +82,14 @@
*/
public abstract Object resolve() throws Exception;
+ /**
+ * Request resolution of an object from the runtime.
+ * @param proxy if TRUE the return value will be proxied if the
+ * underlying component typoe suppports proxy representation
+ * @exception Exception if a deployment error occurs
+ */
+ public abstract Object resolve( boolean proxy ) throws Exception;
+
/**
* Release an object
*
1.8 +12 -1
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/AbstractLifestyleManager.java
Index: AbstractLifestyleManager.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/AbstractLifestyleManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractLifestyleManager.java 17 Mar 2004 10:30:07 -0000 1.7
+++ AbstractLifestyleManager.java 4 Apr 2004 23:33:56 -0000 1.8
@@ -117,6 +117,17 @@
}
/**
+ * Resolve a object to a value.
+ *
+ * @return the resolved object
+ * @throws Exception if an error occurs
+ */
+ public Object resolve( boolean proxy ) throws Exception
+ {
+ return resolve();
+ }
+
+ /**
* Release an object
*
* @param instance the object to be released
1.5 +12 -1
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultBlock.java
Index: DefaultBlock.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultBlock.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultBlock.java 17 Mar 2004 10:30:07 -0000 1.4
+++ DefaultBlock.java 4 Apr 2004 23:33:56 -0000 1.5
@@ -154,6 +154,17 @@
}
/**
+ * Resolve a object to a value.
+ *
+ * @return the resolved object
+ * @throws Exception if an error occurs
+ */
+ public Object resolve( boolean proxy ) throws Exception
+ {
+ return resolve();
+ }
+
+ /**
* Release an object
*
* @param instance the object to be released
1.5 +13 -1
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultRuntime.java
Index: DefaultRuntime.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultRuntime.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultRuntime.java 17 Mar 2004 10:30:07 -0000 1.4
+++ DefaultRuntime.java 4 Apr 2004 23:33:56 -0000 1.5
@@ -108,6 +108,18 @@
}
/**
+ * Request resolution of an object from the runtime.
+ * @param model the deployment model
+ * @param proxy if TRUE the return value will be proxied if the
+ * underlying component typoe suppports proxy representation
+ * @exception Exception if a deployment error occurs
+ */
+ public Object resolve( DeploymentModel model, boolean proxy ) throws Exception
+ {
+ return getRuntimeFactory().getRuntime( model ).resolve( proxy );
+ }
+
+ /**
* Request the release of an object from the runtime.
* @param model the deployment model
* @param instance the object to release
1.2 +11 -1
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/Resolver.java
Index: Resolver.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/Resolver.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Resolver.java 10 Feb 2004 16:23:33 -0000 1.1
+++ Resolver.java 4 Apr 2004 23:33:56 -0000 1.2
@@ -35,6 +35,16 @@
Object resolve() throws Exception;
/**
+ * Resolve a object to a value.
+ *
+ * @param proxy if TRUE ruturn a proxied reference if the underlying component
+ * suppports proxied representation otherwise return the raw component
instance
+ * @return the resolved object
+ * @throws Exception if an error occurs
+ */
+ Object resolve( boolean proxy ) throws Exception;
+
+ /**
* Release an object
*
* @param instance the object to be released
1.22 +14 -1
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java
Index: DefaultDeploymentModel.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- DefaultDeploymentModel.java 17 Mar 2004 10:39:10 -0000 1.21
+++ DefaultDeploymentModel.java 4 Apr 2004 23:33:56 -0000 1.22
@@ -147,6 +147,19 @@
}
/**
+ * Resolve a object to a value.
+ *
+ * @param proxy if TRUE ruturn a proxied reference if the underlying component
+ * suppports proxied representation otherwise return the raw component
instance
+ * @return the resolved object
+ * @throws Exception if an error occurs
+ */
+ public Object resolve( boolean proxy ) throws Exception
+ {
+ return m_context.getSystemContext().resolve( this, proxy );
+ }
+
+ /**
* Release an object
*
* @param instance the object to be released
1.31 +13 -1
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContext.java
Index: DefaultSystemContext.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContext.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- DefaultSystemContext.java 1 Apr 2004 04:06:52 -0000 1.30
+++ DefaultSystemContext.java 4 Apr 2004 23:33:56 -0000 1.31
@@ -384,6 +384,18 @@
}
/**
+ * Request resolution of an object from the runtime.
+ * @param model the deployment model
+ * @param proxy if TRUE the return value will be proxied if the
+ * underlying component typoe suppports proxy representation
+ * @exception Exception if a deployment error occurs
+ */
+ public Object resolve( DeploymentModel model, boolean proxy ) throws Exception
+ {
+ return getRuntime().resolve( model, proxy );
+ }
+
+ /**
* Request the release of an object from the runtime.
* @param model the deployment model
* @param instance the object to release
1.6 +1 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/impl/SimpleDeploymentModel.java
Index: SimpleDeploymentModel.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/impl/SimpleDeploymentModel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SimpleDeploymentModel.java 29 Feb 2004 22:25:26 -0000 1.5
+++ SimpleDeploymentModel.java 4 Apr 2004 23:33:56 -0000 1.6
@@ -226,6 +226,7 @@
}
public Object resolve() throws Exception{ return null; }
+ public Object resolve( boolean proxy ) throws Exception{ return null; }
public void release( Object object ){};
public void commission() throws Exception
1.2 +10 -1
avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/Runtime.java
Index: Runtime.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/Runtime.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Runtime.java 10 Feb 2004 16:23:35 -0000 1.1
+++ Runtime.java 4 Apr 2004 23:33:56 -0000 1.2
@@ -55,6 +55,15 @@
Object resolve( DeploymentModel model ) throws Exception;
/**
+ * Request resolution of an object from the runtime.
+ * @param model the deployment model
+ * @param proxy if TRUE the return value will be proxied if the
+ * underlying component typoe suppports proxy representation
+ * @exception Exception if a deployment error occurs
+ */
+ Object resolve( DeploymentModel model, boolean proxy ) throws Exception;
+
+ /**
* Request the release of an object from the runtime.
* @param model the deployment model
* @param instance the object to release
1.7 +10 -1
avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/SystemContext.java
Index: SystemContext.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/SystemContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SystemContext.java 1 Apr 2004 04:06:52 -0000 1.6
+++ SystemContext.java 4 Apr 2004 23:33:56 -0000 1.7
@@ -158,6 +158,15 @@
Object resolve( DeploymentModel model ) throws Exception;
/**
+ * Request resolution of an object from the runtime.
+ * @param model the deployment model
+ * @param proxy if TRUE the return value will be proxied if the
+ * underlying component typoe suppports proxy representation
+ * @exception Exception if a deployment error occurs
+ */
+ Object resolve( DeploymentModel model, boolean proxy ) throws Exception;
+
+ /**
* Request the release of an object from the runtime.
* @param model the deployment model
* @param instance the object to release
1.2 +60 -2 avalon/merlin/platform/xdocs/merlin/systems/composition.xml
Index: composition.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/merlin/systems/composition.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- composition.xml 3 Apr 2004 04:34:08 -0000 1.1
+++ composition.xml 4 Apr 2004 23:33:56 -0000 1.2
@@ -28,8 +28,66 @@
<section name="Avalon Composition Subsystem">
- <subsection name="Introduction">
- </subsection>
+ <p>
+ The composition model is the essential fabric that ties together the
+ Merlin model-drive architecture.
+ </p>
+
+ <table>
+ <tr>
+ <th>Feature</th><th>Description</th>
+ </tr>
+ <tr>
+ <td>Model Integration</td>
+ <td>
+ Avalon Composition ties together component and underlying
+ <a href="meta.html">component type model</a>, component and
+ container deployment directives, and the <a href="activation.html">
+ runtime environment</a>.
+ </td>
+ </tr>
+ <tr>
+ <td>Model Driven</td>
+ <td>
+ The <a
href="../../api/org/apache/avalon/composition/model/package-summary.html">
+ composition model API</a> provides support for dynamic management of the
+ containment model - enabling full model-driven control.
+ </td>
+ </tr>
+ <tr>
+ <td>Context Management</td>
+ <td>
+ The composition package provides comprehensive support for the defintion
+ of domain specific context handling - eliminating dependency on classic
+ Avalon deployment solutions. Context entry handling supports custom
object
+ creation patterns and multiple context entry creation semantics.
+ </td>
+ </tr>
+ <tr>
+ <td>Configuration Management</td>
+ <td>
+ The multi-tired configuration model covering static type based defaults,
+ packaged configuration profiles, explicit deployment configurations, and
+ overridding configurations.
+ </td>
+ </tr>
+ <tr>
+ <td>Dependency Management</td>
+ <td>
+ Support for automatic assembly, assembly directive overrides, and
plugabble
+ candidate selection semantics.
+ </td>
+ </tr>
+ <tr>
+ <td>Classloader Management</td>
+ <td>
+ Leveraging the <a href="repository.html">Avalon Repository</a> resource
+ management facilities, the composition package provides support for
+ logical artifacts that are independent of a particular physical url,
+ including system and application cache management
+ </td>
+ </tr>
+ </table>
</section>
1.2 +42 -9 avalon/merlin/platform/xdocs/merlin/systems/meta.xml
Index: meta.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/merlin/systems/meta.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- meta.xml 3 Apr 2004 04:34:08 -0000 1.1
+++ meta.xml 4 Apr 2004 23:33:56 -0000 1.2
@@ -18,23 +18,56 @@
-->
<document>
-
<properties>
<author email="[EMAIL PROTECTED]">Stephen McConnell</author>
<title>Avalon Meta Subsystem</title>
</properties>
-
<body>
-
<section name="Avalon Meta Subsystem">
-
- <subsection name="Introduction">
- </subsection>
-
+ <p>
+ The <a href="http://avalon.apache.org/meta";>Avalon Meta</a> system
+ provides Merlin's foundation for the management of component
+ type defintions. It is used extensively withing the
+ <a href="composition.html">Avalon Composition Framework</a> as the
+ underlying meta-info layer within the overall container meta-model.
+ </p>
+ <table>
+ <tr>
+ <th>Feature</th><th>Description</th>
+ </tr>
+ <tr>
+ <td>Type Model</td>
+ <td>
+ The Avalon Meta Model defines the functional structure
+ of component types and services. A Type definition contains
+ information about deployment and runtime dependencies together
+ with information about the services that a component type can
+ provide.
+ </td>
+ </tr>
+ <tr>
+ <td>Developer Tools</td>
+ <td>
+ Avalon Meta provides a set of tools that automate the process
+ of generating meta-info descriptors. These tools provide
+ support for the generation of serializable and XML based
+ descriptors that are collocated with class files. Tool
+ support is available for Ant and Maven.
+ </td>
+ </tr>
+ <tr>
+ <td>Type Management APIs</td>
+ <td>
+ Type and service meta models are established as
+ immutable objects that complement the classic information
+ available about a class. Using the Type and Service
+ descriptor classes, developers can be assured of greater
+ portability and interoperability of container-side applications.
+ </td>
+ </tr>
+ </table>
</section>
-
</body>
-
</document>
1.2 +16 -1 avalon/merlin/platform/xdocs/merlin/systems/repository.xml
Index: repository.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/merlin/systems/repository.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- repository.xml 3 Apr 2004 04:34:08 -0000 1.1
+++ repository.xml 4 Apr 2004 23:33:56 -0000 1.2
@@ -28,7 +28,22 @@
<section name="Avalon Repository Subsystem">
- <subsection name="Introduction">
+ <p>
+ The <a href="http://avalon.apache.org/repository";>Avalon Repository</a>
+ system provides the Merlin platform with a complete resource management
+ framework.
+ </p>
+
+ <subsection name="Overview">
+
+ <p>
+ The Avalon Repository is a Java <a href="about/api/index.html">API</a>,
+ <a href="about/spi.html">SPI</a>, <a href="about/reference.html">reference
+ implementation</a> and <a href="about/bootstrap.html">bootstrap
platform</a>
+ that provides support for the dynamic artifact loading, classloader chain
+ creation, and generic application bootstrapping.
+ </p>
+
</subsection>
</section>
1.1 avalon/merlin/platform/xdocs/images/logic.gif
<<Binary file>>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
