mcconnell 2004/04/08 01:35:17
Modified: facilities maven.xml
facilities/finder/api/src/java/org/apache/avalon/finder
Finder.java
facilities/finder/impl/src/java/org/apache/avalon/finder/impl
DefaultFinder.java
facilities/finder/impl/src/test/org/apache/avalon/finder/impl/test
DefaultFinderTestCase.java
facilities/finder/site/xdocs api.xml index.xml
facilities/http/api project.xml
facilities/http/impl project.xml
facilities/http/spi project.xml
facilities/http/test project.xml
facilities/http/util project.xml
facilities/jmx/api project.xml
facilities/jmx/handler project.xml
facilities/jmx/handler/conf block.xml
facilities/jmx/handler/src/java/org/apache/avalon/jmx/handler
JmxManagementHandler.java
facilities/jmx/mx4j project.xml
facilities/jmx/mx4j/conf block.xml
facilities/jmx/mx4j/src/java/org/apache/avalon/jmx/mx4j
MX4JComponentRegistrationManager.java
facilities/jmx/site project.xml
facilities/jmx/spi project.xml
facilities/jmx/spi/src/java/org/apache/avalon/jmx/spi
AbstractComponentRegistrationManager.java
facilities/jmx/test project.xml
facilities/jmx/test/src/java/org/apache/avalon/playground/jmxtest
JMXTestComponent.java
facilities/jmx/util project.xml
facilities/jmx/util/src/java/org/apache/avalon/jmx/util
ConfigurationBuilder.java
facilities/mds/impl project.xml
facilities/mds/test project.xml
Added: facilities index.ent version.ent
facilities/finder index.ent
facilities/http index.ent
facilities/http/api index.ent
facilities/http/impl index.ent
facilities/http/spi index.ent
facilities/http/test index.ent
facilities/http/util index.ent
facilities/jmx index.ent
facilities/jmx/api index.ent
facilities/jmx/handler index.ent
facilities/jmx/mx4j index.ent
facilities/jmx/site index.ent
facilities/jmx/spi index.ent
facilities/jmx/test index.ent
facilities/jmx/util index.ent
Log:
Add version index refs.
Revision Changes Path
1.4 +0 -1 avalon-components/facilities/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 5 Apr 2004 18:36:02 -0000 1.3
+++ maven.xml 8 Apr 2004 08:35:15 -0000 1.4
@@ -9,7 +9,6 @@
value="**/project.xml"/>
<preGoal name="java:jar-resources">
- <echo>HELLO FROM FACILITIES</echo>
<ant:filter token="AVALON-FINDER-API-VERSION"
value="&avalon-finder-api-version;"/>
<ant:filter token="AVALON-FINDER-IMPL-VERSION"
value="&avalon-finder-impl-version;"/>
</preGoal>
1.1 avalon-components/facilities/index.ent
Index: index.ent
===================================================================
<!ENTITY % version-entities SYSTEM "file:version.ent"> %version-entities;
<!ENTITY % merlin-entities SYSTEM "file:../../avalon/merlin/version.ent">
%merlin-entities;
1.1 avalon-components/facilities/version.ent
Index: version.ent
===================================================================
<!ENTITY avalon-finder-id "avalon-finder">
<!ENTITY avalon-finder-api-id "avalon-finder-api">
<!ENTITY avalon-finder-api-version "0.9.0">
<!ENTITY avalon-finder-impl-id "avalon-finder-impl">
<!ENTITY avalon-finder-impl-version "0.9.0">
<!ENTITY avalon-http-id "avalon-http">
<!ENTITY avalon-http-api-id "avalon-http-api">
<!ENTITY avalon-http-api-version "0.9.0">
<!ENTITY avalon-http-spi-id "avalon-http-spi">
<!ENTITY avalon-http-spi-version "0.9.0">
<!ENTITY avalon-http-impl-id "avalon-http-impl">
<!ENTITY avalon-http-impl-version "0.9.0">
<!ENTITY avalon-http-util-id "avalon-http-util">
<!ENTITY avalon-http-util-version "0.9.0">
<!ENTITY avalon-http-test-id "avalon-http-test">
<!ENTITY avalon-http-test-version "0.9.0">
<!ENTITY avalon-jmx-id "avalon-jmx">
<!ENTITY avalon-jmx-api-id "avalon-jmx-api">
<!ENTITY avalon-jmx-api-version "0.9.0">
<!ENTITY avalon-jmx-spi-id "avalon-jmx-spi">
<!ENTITY avalon-jmx-spi-version "0.9.0">
<!ENTITY avalon-jmx-handler-id "avalon-jmx-handler">
<!ENTITY avalon-jmx-handler-version "0.9.0">
<!ENTITY avalon-jmx-util-id "avalon-jmx-util">
<!ENTITY avalon-jmx-util-version "0.9.0">
<!ENTITY avalon-jmx-mx4j-id "avalon-jmx-mx4j">
<!ENTITY avalon-jmx-mx4j-version "0.9.0">
<!ENTITY avalon-jmx-test-id "avalon-jmx-test">
<!ENTITY avalon-jmx-test-version "0.9.0">
1.1 avalon-components/facilities/finder/index.ent
Index: index.ent
===================================================================
<!ENTITY % merlin-entities SYSTEM "file:../../../avalon/merlin/version.ent">
%merlin-entities;
<!ENTITY % facility-entities SYSTEM "file:../version.ent"> %facility-entities;
1.2 +15 -1
avalon-components/facilities/finder/api/src/java/org/apache/avalon/finder/Finder.java
Index: Finder.java
===================================================================
RCS file:
/home/cvs/avalon-components/facilities/finder/api/src/java/org/apache/avalon/finder/Finder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Finder.java 4 Apr 2004 15:00:54 -0000 1.1
+++ Finder.java 8 Apr 2004 08:35:15 -0000 1.2
@@ -19,7 +19,21 @@
/**
* Defintion of the Finder service contract.
*/
-public interface Finder
+public interface Finder
{
+ /**
+ * Find an object fullfilling the supplied service class.
+ *
+ * @param service the service class that the returned
+ * object if gauranteed to fulfill
+ * @exception FinderException if a provider could not be found
+ */
Object find( Class service ) throws FinderException;
+
+ /**
+ * Release an object that was resolved using the find operation.
+ *
+ * @param object the object to release
+ */
+ void release( Object object );
}
1.2 +41 -25
avalon-components/facilities/finder/impl/src/java/org/apache/avalon/finder/impl/DefaultFinder.java
Index: DefaultFinder.java
===================================================================
RCS file:
/home/cvs/avalon-components/facilities/finder/impl/src/java/org/apache/avalon/finder/impl/DefaultFinder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultFinder.java 4 Apr 2004 15:00:55 -0000 1.1
+++ DefaultFinder.java 8 Apr 2004 08:35:15 -0000 1.2
@@ -17,6 +17,9 @@
package org.apache.avalon.finder.impl;
+import java.lang.reflect.Proxy;
+import java.lang.reflect.InvocationHandler;
+
import org.apache.avalon.finder.Finder;
import org.apache.avalon.finder.FinderException;
@@ -25,6 +28,7 @@
import org.apache.avalon.composition.model.ComponentModel;
import org.apache.avalon.composition.model.ProviderNotFoundException;
import org.apache.avalon.composition.model.AssemblyException;
+import org.apache.avalon.composition.model.Reclaimer;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.context.Context;
@@ -45,7 +49,7 @@
* @author <a href="mailto:dev@avalon.apache.org";>Avalon Development Team</a>
* @version $Revision$ $Date$
*/
-public class DefaultFinder implements Finder, Contextualizable
+public class DefaultFinder implements Finder
{
//---------------------------------------------------------
// immutable state
@@ -70,32 +74,24 @@
* Creation of a new default finder.
*
* @param logger the container assigned logging channel
+ * @param context the supplied context
+ * @avalon.entry key="urn:composition:containment.model"
+ * type="org.apache.avalon.composition.model.ContainmentModel"
+ * @exception ContextException if a contextualization error occurs
*/
- public DefaultFinder( final Logger logger )
+ public DefaultFinder( final Logger logger, Context context )
+ throws ContextException
{
if( null == logger )
{
throw new NullPointerException( "logger" );
}
+ if( null == context )
+ {
+ throw new NullPointerException( "context" );
+ }
m_logger = logger;
- }
-
- //---------------------------------------------------------
- // Contextualizable
- //---------------------------------------------------------
-
- /**
- * Contextulaization of the facility by the container during
- * which we are supplied with the relative root containment model.
- *
- * @param context the supplied context
- * @avalon.entry key="urn:composition:containment.model"
- * type="org.apache.avalon.composition.model.ContainmentModel"
- * @exception ContextException if a contextualization error occurs
- */
- public void contextualize( Context context ) throws ContextException
- {
m_model =
(ContainmentModel) context.get(
"urn:composition:containment.model" );
@@ -122,7 +118,31 @@
}
}
- public DeploymentModel resolveModel( Class type ) throws FinderException
+ /**
+ * Release an object that was resolved using the find operation.
+ *
+ * @param instance the object to release
+ */
+ public void release( Object instance )
+ {
+ if( Proxy.isProxyClass( instance.getClass() ) )
+ {
+ InvocationHandler handler =
+ Proxy.getInvocationHandler( instance );
+ if( handler instanceof Reclaimer )
+ {
+ Reclaimer source = (Reclaimer) handler;
+ source.release();
+ }
+ }
+ }
+
+ //---------------------------------------------------------
+ // private implementation
+ //---------------------------------------------------------
+
+ private DeploymentModel resolveModel( Class type )
+ throws FinderException
{
ReferenceDescriptor reference =
new ReferenceDescriptor( type.getName() );
@@ -149,10 +169,6 @@
throw new FinderException( error, e );
}
}
-
- //---------------------------------------------------------
- // private implementation
- //---------------------------------------------------------
private Logger getLogger()
{
1.2 +2 -2
avalon-components/facilities/finder/impl/src/test/org/apache/avalon/finder/impl/test/DefaultFinderTestCase.java
Index: DefaultFinderTestCase.java
===================================================================
RCS file:
/home/cvs/avalon-components/facilities/finder/impl/src/test/org/apache/avalon/finder/impl/test/DefaultFinderTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultFinderTestCase.java 4 Apr 2004 15:00:55 -0000 1.1
+++ DefaultFinderTestCase.java 8 Apr 2004 08:35:15 -0000 1.2
@@ -50,7 +50,7 @@
{
try
{
- Finder finder = new DefaultFinder( null );
+ Finder finder = new DefaultFinder( null, null );
}
catch( NullPointerException npe )
{
1.2 +2 -2 avalon-components/facilities/finder/site/xdocs/api.xml
Index: api.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/finder/site/xdocs/api.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- api.xml 4 Apr 2004 15:00:55 -0000 1.1
+++ api.xml 8 Apr 2004 08:35:15 -0000 1.2
@@ -26,8 +26,8 @@
<section name="Finder">
<subsection name="API">
<p>
-A simple and evolving API aimed to meet the operation requirements of
-compoennts requiring a dynamic activation service.
+A simple and evolving API aimed to meet the operational requirements of
+components requiring a dynamic service activation facility.
</p>
</subsection>
</section>
1.2 +0 -7 avalon-components/facilities/finder/site/xdocs/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/finder/site/xdocs/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 4 Apr 2004 15:00:55 -0000 1.1
+++ index.xml 8 Apr 2004 08:35:15 -0000 1.2
@@ -51,13 +51,6 @@
services dynamically.
</td>
</tr>
- <tr>
- <td>ECM</td>
- <td>
- A componet based implementation of the class ECM
- utility based on the finder implementation.
- </td>
- </tr>
</table>
</subsection>
</section>
1.1 avalon-components/facilities/http/index.ent
Index: index.ent
===================================================================
<!ENTITY % merlin-entities SYSTEM "file:../../../avalon/merlin/version.ent">
%merlin-entities;
<!ENTITY % facility-entities SYSTEM "file:../version.ent"> %facility-entities;
1.3 +8 -2 avalon-components/facilities/http/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/http/api/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 4 Apr 2004 17:09:37 -0000 1.2
+++ project.xml 8 Apr 2004 08:35:15 -0000 1.3
@@ -1,10 +1,16 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
- <extend>${basedir}/../common-project.xml</extend>
+ <extend>${basedir}/../../common-project.xml</extend>
+
+ <id>&avalon-http-api-id;</id>
+ <groupId>&avalon-http-api-id;</groupId>
+ <currentVersion>&avalon-http-api-version;</currentVersion>
- <id>avalon-http-api</id>
<name>Avalon HTTP API</name>
<package>org.apache.avalon.http</package>
1.1 avalon-components/facilities/http/api/index.ent
Index: index.ent
===================================================================
<!ENTITY % merlin-entities SYSTEM
"file:../../../../avalon/merlin/version.ent"> %merlin-entities;
<!ENTITY % facility-entities SYSTEM "file:../../version.ent">
%facility-entities;
1.3 +25 -15 avalon-components/facilities/http/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/http/impl/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 4 Apr 2004 17:09:37 -0000 1.2
+++ project.xml 8 Apr 2004 08:35:15 -0000 1.3
@@ -1,32 +1,40 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
- <extend>${basedir}/../common-project.xml</extend>
+ <extend>${basedir}/../../common-project.xml</extend>
- <id>avalon-http-impl</id>
- <name>Avalon HTTP Implementation</name>
+ <groupId>&avalon-http-id;</groupId>
+ <id>&avalon-http-impl-id;</id>
+ <currentVersion>&avalon-http-impl-version;</currentVersion>
+ <name>Avalon HTTP Implementation</name>
<shortDescription>Avalon HTTP Implementation</shortDescription>
<package>org.apache.avalon.http.impl</package>
<dependencies>
<dependency>
- <groupId>avalon-http</groupId>
- <artifactId>avalon-http-api</artifactId>
- <version>${pom.currentVersion}</version>
+ <groupId>&avalon-http-id;</groupId>
+ <artifactId>&avalon-http-api-id;</artifactId>
+ <version>&avalon-http-api-version;</version>
</dependency>
<dependency>
- <groupId>avalon-http</groupId>
- <artifactId>avalon-http-spi</artifactId>
- <version>${pom.currentVersion}</version>
+ <groupId>&avalon-http-id;</groupId>
+ <artifactId>&avalon-http-spi-id;</artifactId>
+ <version>&avalon-http-spi-version;</version>
</dependency>
+
+ <!--
<dependency>
<groupId>avalon-http</groupId>
<artifactId>avalon-http-test</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
+ -->
<dependency>
<groupId>avalon-framework</groupId>
@@ -58,23 +66,25 @@
</dependency>
<dependency>
- <groupId>avalon-composition</groupId>
- <artifactId>avalon-composition-api</artifactId>
- <version>3.3.0</version>
+ <groupId>&avalon-composition-id;</groupId>
+ <artifactId>&avalon-composition-api-id;</artifactId>
+ <version>&avalon-composition-api-version;</version>
</dependency>
<dependency>
- <groupId>merlin</groupId>
- <artifactId>merlin-unit</artifactId>
- <version>3.3.0</version>
+ <groupId>&merlin-id;</groupId>
+ <artifactId>&merlin-unit-id;</artifactId>
+ <version>&merlin-unit-version;</version>
</dependency>
<!-- Generation of Meta info -->
+ <!--
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-plugin</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
+ -->
</dependencies>
1.1 avalon-components/facilities/http/impl/index.ent
Index: index.ent
===================================================================
<!ENTITY % merlin-entities SYSTEM
"file:../../../../avalon/merlin/version.ent"> %merlin-entities;
<!ENTITY % facility-entities SYSTEM "file:../../version.ent">
%facility-entities;
1.3 +14 -7 avalon-components/facilities/http/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/http/spi/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 4 Apr 2004 17:09:37 -0000 1.2
+++ project.xml 8 Apr 2004 08:35:15 -0000 1.3
@@ -1,8 +1,15 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
- <extend>${basedir}/../common-project.xml</extend>
+ <extend>${basedir}/../../common-project.xml</extend>
+
+ <groupId>&avalon-http-id;</groupId>
+ <id>&avalon-http-spi-id;</id>
+ <currentVersion>&avalon-http-spi-version;</currentVersion>
<id>avalon-http-spi</id>
<name>Avalon HTTP SPI</name>
@@ -18,14 +25,14 @@
<version>4.1.5</version>
</dependency>
<dependency>
- <groupId>avalon-http</groupId>
- <artifactId>avalon-http-api</artifactId>
- <version>${pom.currentVersion}</version>
+ <groupId>&avalon-http-id;</groupId>
+ <artifactId>&avalon-http-api-id;</artifactId>
+ <version>&avalon-http-api-version;</version>
</dependency>
<dependency>
- <groupId>avalon-composition</groupId>
- <artifactId>avalon-composition-api</artifactId>
- <version>3.3.0</version>
+ <groupId>&avalon-composition-id;</groupId>
+ <artifactId>&avalon-composition-api-id;</artifactId>
+ <version>&avalon-composition-api-version;</version>
</dependency>
</dependencies>
1.1 avalon-components/facilities/http/spi/index.ent
Index: index.ent
===================================================================
<!ENTITY % merlin-entities SYSTEM
"file:../../../../avalon/merlin/version.ent"> %merlin-entities;
<!ENTITY % facility-entities SYSTEM "file:../../version.ent">
%facility-entities;
1.3 +17 -8 avalon-components/facilities/http/test/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/http/test/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 4 Apr 2004 17:09:37 -0000 1.2
+++ project.xml 8 Apr 2004 08:35:16 -0000 1.3
@@ -1,7 +1,15 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
- <extend>${basedir}/../common-project.xml</extend>
+
+ <extend>${basedir}/../../common-project.xml</extend>
+
+ <groupId>&avalon-http-id;</groupId>
+ <id>&avalon-http-test-id;</id>
+ <currentVersion>&avalon-http-test-version;</currentVersion>
<id>avalon-http-test</id>
<name>Avalon HTTP Test</name>
@@ -17,15 +25,14 @@
</dependency>
<dependency>
- <groupId>avalon-http</groupId>
- <artifactId>avalon-http-api</artifactId>
- <version>${pom.currentVersion}</version>
+ <groupId>&avalon-http-id;</groupId>
+ <artifactId>&avalon-http-api-id;</artifactId>
+ <version>&avalon-http-api-version;</version>
</dependency>
-
<dependency>
- <groupId>avalon-http</groupId>
- <artifactId>avalon-http-util</artifactId>
- <version>${pom.currentVersion}</version>
+ <groupId>&avalon-http-id;</groupId>
+ <artifactId>&avalon-http-util-id;</artifactId>
+ <version>&avalon-http-util-version;</version>
</dependency>
<dependency>
@@ -35,10 +42,12 @@
</dependency>
<!-- Generation of Meta info -->
+ <!--
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-plugin</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
+ -->
</dependencies>
</project>
1.1 avalon-components/facilities/http/test/index.ent
Index: index.ent
===================================================================
<!ENTITY % merlin-entities SYSTEM
"file:../../../../avalon/merlin/version.ent"> %merlin-entities;
<!ENTITY % facility-entities SYSTEM "file:../../version.ent">
%facility-entities;
1.3 +12 -5 avalon-components/facilities/http/util/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/http/util/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 4 Apr 2004 17:09:37 -0000 1.2
+++ project.xml 8 Apr 2004 08:35:16 -0000 1.3
@@ -1,8 +1,16 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
- <extend>${basedir}/../common-project.xml</extend>
+ <extend>${basedir}/../../common-project.xml</extend>
+
+ <groupId>&avalon-http-id;</groupId>
+ <id>&avalon-http-util-id;</id>
+ <currentVersion>&avalon-http-util-version;</currentVersion>
+
<id>avalon-http-util</id>
<name>Avalon HTTP Util</name>
@@ -16,11 +24,10 @@
<artifactId>servletapi</artifactId>
<version>2.3</version>
</dependency>
-
<dependency>
- <groupId>avalon-http</groupId>
- <artifactId>avalon-http-api</artifactId>
- <version>${pom.currentVersion}</version>
+ <groupId>&avalon-http-id;</groupId>
+ <artifactId>&avalon-http-api-id;</artifactId>
+ <version>&avalon-http-api-version;</version>
</dependency>
</dependencies>
1.1 avalon-components/facilities/http/util/index.ent
Index: index.ent
===================================================================
<!ENTITY % merlin-entities SYSTEM
"file:../../../../avalon/merlin/version.ent"> %merlin-entities;
<!ENTITY % facility-entities SYSTEM "file:../../version.ent">
%facility-entities;
1.1 avalon-components/facilities/jmx/index.ent
Index: index.ent
===================================================================
<!ENTITY % merlin-entities SYSTEM "file:../../../avalon/merlin/version.ent">
%merlin-entities;
<!ENTITY % facility-entities SYSTEM "file:../version.ent"> %facility-entities;
1.4 +13 -6 avalon-components/facilities/jmx/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/jmx/api/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 4 Apr 2004 17:09:37 -0000 1.3
+++ project.xml 8 Apr 2004 08:35:16 -0000 1.4
@@ -1,10 +1,17 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
- <extend>${basedir}/../common-project.xml</extend>
- <id>avalon-jmx-management-api</id>
- <name>JMX Management API</name>
+ <extend>${basedir}/../../common-project.xml</extend>
+
+ <groupId>&avalon-jmx-id;</groupId>
+ <id>&avalon-jmx-api-id;</id>
+ <currentVersion>&avalon-jmx-api-version;</currentVersion>
+
+ <name>Avalon JMX API</name>
<package>org.apache.avalon.merlin.jmx</package>
<shortDescription>JMX Management API</shortDescription>
<description>
@@ -19,9 +26,9 @@
<version>4.1.5</version>
</dependency>
<dependency>
- <groupId>avalon-composition</groupId>
- <artifactId>avalon-composition-api</artifactId>
- <version>3.3.0</version>
+ <groupId>&avalon-composition-id;</groupId>
+ <artifactId>&avalon-composition-api-id;</artifactId>
+ <version>&avalon-composition-api-version;</version>
</dependency>
</dependencies>
</project>
1.1 avalon-components/facilities/jmx/api/index.ent
Index: index.ent
===================================================================
<!ENTITY % merlin-entities SYSTEM
"file:../../../../avalon/merlin/version.ent"> %merlin-entities;
<!ENTITY % facility-entities SYSTEM "file:../../version.ent">
%facility-entities;
1.4 +17 -10 avalon-components/facilities/jmx/handler/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/jmx/handler/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 4 Apr 2004 17:09:37 -0000 1.3
+++ project.xml 8 Apr 2004 08:35:16 -0000 1.4
@@ -1,11 +1,18 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
- <extend>${basedir}/../common-project.xml</extend>
- <id>avalon-jmx-handler</id>
- <name>JMX Facility Handler</name>
- <package>org.apache.avalon.merlin.jmx.handler</package>
+ <extend>${basedir}/../../common-project.xml</extend>
+
+ <groupId>&avalon-jmx-id;</groupId>
+ <id>&avalon-jmx-handler-id;</id>
+ <currentVersion>&avalon-jmx-handler-version;</currentVersion>
+
+ <name>Avalon JMX Handler</name>
+ <package>org.apache.avalon.jmx.handler</package>
<shortDescription>JMX Facility Handler Implementation</shortDescription>
<description>
JMX Facility Handler Implementation.
@@ -18,9 +25,9 @@
<version>4.1.5</version>
</dependency>
<dependency>
- <groupId>avalon-composition</groupId>
- <artifactId>avalon-composition-api</artifactId>
- <version>3.3.0</version>
+ <groupId>&avalon-composition-id;</groupId>
+ <artifactId>&avalon-composition-api-id;</artifactId>
+ <version>&avalon-composition-api-version;</version>
</dependency>
<dependency>
<groupId>avalon-util</groupId>
@@ -28,9 +35,9 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>avalon-jmx</groupId>
- <artifactId>avalon-jmx-management-api</artifactId>
- <version>${pom.currentVersion}</version>
+ <groupId>&avalon-jmx-id;</groupId>
+ <artifactId>&avalon-jmx-api-id;</artifactId>
+ <version>&avalon-jmx-api-version;</version>
</dependency>
</dependencies>
</project>
1.1 avalon-components/facilities/jmx/handler/index.ent
Index: index.ent
===================================================================
<!ENTITY % merlin-entities SYSTEM
"file:../../../../avalon/merlin/version.ent"> %merlin-entities;
<!ENTITY % facility-entities SYSTEM "file:../../version.ent">
%facility-entities;
1.3 +6 -7 avalon-components/facilities/jmx/handler/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/jmx/handler/conf/block.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- block.xml 4 Apr 2004 16:18:55 -0000 1.2
+++ block.xml 8 Apr 2004 08:35:16 -0000 1.3
@@ -4,17 +4,16 @@
<classpath>
<repository>
<resource id="avalon-framework:avalon-framework-api"
version="4.1.5"/>
- <resource id="avalon-composition:avalon-composition-api"
version="2.0"/>
- <resource id="avalon-jmx:avalon-jmx-management-api" version="1.0"/>
- <resource id="avalon-jmx:avalon-jmx-management-handler"
version="1.0"/>
- <resource id="avalon-jmx:avalon-jmx-test" version="1.0"/>
+ <resource id="avalon-composition:avalon-composition-api"
version="2.0.0"/>
+ <resource id="avalon-jmx:avalon-jmx-api" version="0.9.0"/>
+ <resource id="avalon-jmx:avalon-jmx-handler" version="0.9.0"/>
+ <resource id="avalon-jmx:avalon-jmx-test" version="0.9.0"/>
</repository>
</classpath>
</classloader>
- <include name="ComponentRegistrationManager"
id="avalon-jmx:avalon-jmx-management-mx4j" version="1.0"/>
+ <include name="mx4j" id="avalon-jmx:avalon-jmx-mx4j" version="0.9.0"/>
- <component name="JmxManagementHandler"
class="org.apache.avalon.jmx.handler.JmxManagementHandler"/>
+ <component name="handler"
class="org.apache.avalon.jmx.handler.JmxManagementHandler"/>
- <component name="JMXTestComponent"
class="org.apache.avalon.playground.jmxtest.JMXTestComponent"/>
</container>
1.2 +42 -34
avalon-components/facilities/jmx/handler/src/java/org/apache/avalon/jmx/handler/JmxManagementHandler.java
Index: JmxManagementHandler.java
===================================================================
RCS file:
/home/cvs/avalon-components/facilities/jmx/handler/src/java/org/apache/avalon/jmx/handler/JmxManagementHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JmxManagementHandler.java 4 Apr 2004 16:18:55 -0000 1.1
+++ JmxManagementHandler.java 8 Apr 2004 08:35:16 -0000 1.2
@@ -25,11 +25,11 @@
import org.apache.avalon.util.i18n.ResourceManager;
import org.apache.avalon.util.i18n.Resources;
-import org.apache.avalon.framework.activity.Startable;
+import org.apache.avalon.framework.activity.Disposable;
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.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
@@ -42,51 +42,48 @@
* @author <a href="mailto:dev@avalon.apache.org";>Avalon Development Team</a>
* @version $Revision$
*
- * @avalon.component name="JmxManagementHandler" version="0.1"
lifestyle="singleton"
+ * @avalon.component name="jmx-handler" lifestyle="singleton"
*/
-
-public class JmxManagementHandler extends AbstractLogEnabled
- implements CompositionListener, Contextualizable, Serviceable, Startable
+public class JmxManagementHandler
+ implements CompositionListener, Disposable
{
private static final Resources REZ = ResourceManager.getPackageResources(
JmxManagementHandler.class );
private ContainmentModel m_model;
private ComponentRegistrationManager m_manager;
+ private Logger m_logger;
/**
- * Contextualizes this component.
+ * Creation of a new handler.
+ *
+ * @param logger the logging channel
* @param context the Context for this component
+ * @avalon.entry key="urn:composition:containment.model"
+ * type="org.apache.avalon.composition.model.ContainmentModel"
+ * @param manager the ServiceManager from which to retrieve service
dependencies
+ * @avalon.dependency key="registry"
+ * type="org.apache.avalon.jmx.ComponentRegistrationManager"
* @throws ContextException if a required context entry is not available
- *
- * @avalon.entry key="urn:composition:containment.model"
type="org.apache.avalon.composition.model.ContainmentModel"
- */
- public void contextualize( Context context ) throws ContextException
- {
- m_model = ( ContainmentModel ) context.get(
"urn:composition:containment.model" );
- }
-
- /**
- * Retrieves service dependencies for this component.
- * @param serviceManager the ServiceManager from which to retrieve
service dependencies
* @throws ServiceException if a required service is not available
- *
- * @avalon.dependency key="ComponentRegistrationManager"
type="org.apache.avalon.merlin.jmx.ComponentRegistrationManager"
optional="false"
*/
- public void service( ServiceManager serviceManager ) throws
ServiceException
- {
- m_manager = ( ComponentRegistrationManager ) serviceManager.lookup(
"ComponentRegistrationManager" );
- }
-
- public void start() throws Exception
- {
+ public JmxManagementHandler(
+ Logger logger, Context context, ServiceManager manager )
+ throws ContextException, ServiceException
+ {
+ m_logger = logger;
+ m_model =
+ (ContainmentModel) context.get(
+ "urn:composition:containment.model" );
+ m_manager =
+ (ComponentRegistrationManager) manager.lookup( "registry" );
synchronized ( m_model )
{
processModel( m_model, true );
}
}
- public void stop() throws Exception
+ public void dispose()
{
synchronized ( m_model )
{
@@ -120,7 +117,8 @@
{
if ( model instanceof ContainmentModel )
{
- ContainmentModel containment = ( ContainmentModel ) model;
+ ContainmentModel containment =
+ (ContainmentModel) model;
if ( flag )
{
containment.addCompositionListener( this );
@@ -137,7 +135,8 @@
}
else if ( model instanceof ComponentModel )
{
- final ComponentModel componentModel = ( ComponentModel ) model;
+ final ComponentModel componentModel =
+ (ComponentModel)model;
if ( flag )
{
@@ -147,8 +146,10 @@
}
catch ( ComponentRegistrationException cme )
{
- final String message = REZ.getString(
"compositionlistener.error.register",
-
componentModel.getQualifiedName() );
+ final String message =
+ REZ.getString(
+ "compositionlistener.error.register",
+ componentModel.getQualifiedName() );
getLogger().debug( message, cme );
}
}
@@ -161,11 +162,18 @@
}
catch ( ComponentRegistrationException cme )
{
- final String message = REZ.getString(
"compositionlistener.error.unregister",
-
componentModel.getQualifiedName() );
+ final String message =
+ REZ.getString(
+ "compositionlistener.error.unregister",
+ componentModel.getQualifiedName() );
getLogger().debug( message, cme );
}
}
}
+ }
+
+ private Logger getLogger()
+ {
+ return m_logger;
}
}
1.4 +17 -10 avalon-components/facilities/jmx/mx4j/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/jmx/mx4j/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 4 Apr 2004 17:09:37 -0000 1.3
+++ project.xml 8 Apr 2004 08:35:16 -0000 1.4
@@ -1,11 +1,18 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
- <extend>${basedir}/../common-project.xml</extend>
- <id>avalon-jmx-management-mx4j</id>
- <name>Merlin MX4J Implementation</name>
- <package>org.apache.avalon.merlin.jmx.mx4j</package>
+ <extend>${basedir}/../../common-project.xml</extend>
+
+ <id>&avalon-jmx-mx4j-id;</id>
+ <groupId>&avalon-jmx-id;</groupId>
+ <currentVersion>&avalon-jmx-mx4j-version;</currentVersion>
+
+ <name>Avalon JMX MX4J Implementation</name>
+ <package>org.apache.avalon.jmx.mx4j</package>
<shortDescription>MX4J implementation of JMX in Merlin</shortDescription>
<description>
MX4J implementation of JMX in Merlin
@@ -18,14 +25,14 @@
<version>4.1.5</version>
</dependency>
<dependency>
- <groupId>avalon-jmx</groupId>
- <artifactId>avalon-jmx-management-api</artifactId>
- <version>${pom.currentVersion}</version>
+ <groupId>&avalon-jmx-id;</groupId>
+ <artifactId>&avalon-jmx-api-id;</artifactId>
+ <version>&avalon-jmx-api-version;</version>
</dependency>
<dependency>
- <groupId>avalon-jmx</groupId>
- <artifactId>avalon-jmx-management-spi</artifactId>
- <version>${pom.currentVersion}</version>
+ <groupId>&avalon-jmx-id;</groupId>
+ <artifactId>&avalon-jmx-spi-id;</artifactId>
+ <version>&avalon-jmx-spi-version;</version>
</dependency>
<dependency>
<groupId>mx4j</groupId>
1.1 avalon-components/facilities/jmx/mx4j/index.ent
Index: index.ent
===================================================================
<!ENTITY % merlin-entities SYSTEM
"file:../../../../avalon/merlin/version.ent"> %merlin-entities;
<!ENTITY % facility-entities SYSTEM "file:../../version.ent">
%facility-entities;
1.3 +8 -6 avalon-components/facilities/jmx/mx4j/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/jmx/mx4j/conf/block.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- block.xml 4 Apr 2004 16:18:56 -0000 1.2
+++ block.xml 8 Apr 2004 08:35:16 -0000 1.3
@@ -3,7 +3,7 @@
<services>
<service type="org.apache.avalon.jmx.ComponentRegistrationManager">
- <source>MX4JComponentRegistrationManager</source>
+ <source>registry</source>
</service>
</services>
@@ -12,17 +12,19 @@
<repository>
<resource id="avalon-framework:avalon-framework-api"
version="4.1.5"/>
<resource id="avalon-framework:avalon-framework-impl"
version="4.1.5"/>
- <resource id="avalon-composition:avalon-composition-api"
version="2.0"/>
+ <resource id="avalon-composition:avalon-composition-api"
version="2.0.0"/>
<resource id="avalon-util:avalon-util-i18n" version="1.0"/>
- <resource id="avalon-jmx:avalon-jmx-management-api" version="1.0"/>
- <resource id="avalon-jmx:avalon-jmx-management-spi" version="1.0"/>
- <resource id="avalon-jmx:avalon-jmx-util" version="1.0"/>
+ <resource id="avalon-jmx:avalon-jmx-api" version="0.9.0"/>
+ <resource id="avalon-jmx:avalon-jmx-spi" version="0.9.0"/>
+ <resource id="avalon-jmx:avalon-jmx-util" version="0.9.0"/>
<resource id="mx4j:mx4j-jmx" version="1.1.1"/>
<resource id="mx4j:mx4j-tools" version="1.1.1"/>
</repository>
</classpath>
</classloader>
- <component name="MX4JComponentRegistrationManager"
class="org.apache.avalon.jmx.mx4j.MX4JComponentRegistrationManager"
activation="startup"/>
+ <component name="registry"
+ class="org.apache.avalon.jmx.mx4j.MX4JComponentRegistrationManager"
+ activation="startup"/>
</container>
1.2 +15 -7
avalon-components/facilities/jmx/mx4j/src/java/org/apache/avalon/jmx/mx4j/MX4JComponentRegistrationManager.java
Index: MX4JComponentRegistrationManager.java
===================================================================
RCS file:
/home/cvs/avalon-components/facilities/jmx/mx4j/src/java/org/apache/avalon/jmx/mx4j/MX4JComponentRegistrationManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MX4JComponentRegistrationManager.java 4 Apr 2004 16:18:56 -0000
1.1
+++ MX4JComponentRegistrationManager.java 8 Apr 2004 08:35:16 -0000
1.2
@@ -50,19 +50,19 @@
* @author <a href="mailto:dev@avalon.apache.org";>Avalon Development Team</a>
* @version $Revision$
*
- * @avalon.component name="MX4JComponentRegistrationManager" version="0.1"
lifestyle="singleton"
- * @avalon.service
type="org.apache.avalon.merlin.jmx.ComponentRegistrationManager"
+ * @avalon.component name="jmx-mx4j-manager" lifestyle="singleton"
+ * @avalon.service type="org.apache.avalon.jmx.ComponentRegistrationManager"
*/
-
public class MX4JComponentRegistrationManager extends
AbstractJMXComponentRegistrationManager
implements Contextualizable, Configurable
{
- private static final Resources REZ =
ResourceManager.getPackageResources( MX4JComponentRegistrationManager.class );
+ private static final Resources REZ =
+ ResourceManager.getPackageResources(
MX4JComponentRegistrationManager.class );
private static final String DEFAULT_NAMING_FACTORY =
"com.sun.jndi.rmi.registry.RegistryContextFactory";
private static final String DEFAULT_HTTPADAPTER_HOST = "localhost";
- private static final int DEFAULT_HTTPADAPTER_PORT = Integer.getInteger(
"merlin.adapter.http",
- 8082 ).intValue();
+ private static final int DEFAULT_HTTPADAPTER_PORT =
+ Integer.getInteger( "merlin.adapter.http", 8082 ).intValue();
private String m_host;
private int m_port;
@@ -73,6 +73,13 @@
private String m_password;
private String m_username;
+ /*
+ public MX4JComponentRegistrationManager(
+ final Context context, final Configuration configuration,
ServiceManager manager )
+ {
+ }
+ */
+
/**
* @avalon.entry key="urn:avalon:home" type="java.io.File"
*/
@@ -100,7 +107,8 @@
m_namingFactory = configuration.getChild( "rmi-naming-factory"
).getValue(
DEFAULT_NAMING_FACTORY );
- final String stylesheets = configuration.getChild( "stylesheets-dir"
).getValue( null );
+ final String stylesheets =
+ configuration.getChild( "stylesheets-dir" ).getValue( null );
if ( null != stylesheets )
{
m_stylesheetDir = new File( m_homeDir, stylesheets
).getAbsolutePath();
1.3 +3 -3 avalon-components/facilities/jmx/site/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/jmx/site/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 4 Apr 2004 17:09:37 -0000 1.2
+++ project.xml 8 Apr 2004 08:35:16 -0000 1.3
@@ -2,11 +2,11 @@
<project>
- <extend>${basedir}/../common-project.xml</extend>
+ <extend>${basedir}/../../common-project.xml</extend>
<id>avalon-jmx-site</id>
- <name>JMX Management Documentation</name>
+ <name>Avalon JMX Documentation</name>
<package>org.apache.avalon.facilities.jmx</package>
- <shortDescription>JMX Management Documentation</shortDescription>
+ <shortDescription>Avalon JMX Documentation</shortDescription>
<description>
JMX Management Site Documentation.
</description>
1.1 avalon-components/facilities/jmx/site/index.ent
Index: index.ent
===================================================================
<!ENTITY % merlin-entities SYSTEM
"file:../../../../avalon/merlin/version.ent"> %merlin-entities;
<!ENTITY % facility-entities SYSTEM "file:../../version.ent">
%facility-entities;
1.4 +20 -13 avalon-components/facilities/jmx/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/jmx/spi/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 4 Apr 2004 17:09:38 -0000 1.3
+++ project.xml 8 Apr 2004 08:35:16 -0000 1.4
@@ -1,11 +1,18 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
- <extend>${basedir}/../common-project.xml</extend>
- <id>avalon-jmx-management-spi</id>
- <name>JMX Management SPI</name>
- <package>org.apache.avalon.merlin.jmx.spi</package>
+ <extend>${basedir}/../../common-project.xml</extend>
+
+ <id>&avalon-jmx-spi-id;</id>
+ <groupId>&avalon-jmx-id;</groupId>
+ <currentVersion>&avalon-jmx-spi-version;</currentVersion>
+
+ <name>Avalon JMX SPI</name>
+ <package>org.apache.avalon.jmx.spi</package>
<shortDescription>JMX Management SPI</shortDescription>
<description>
JMX Management SPI
@@ -18,19 +25,19 @@
<version>4.1.5</version>
</dependency>
<dependency>
- <groupId>avalon-composition</groupId>
- <artifactId>avalon-composition-api</artifactId>
- <version>3.3.0</version>
+ <groupId>&avalon-composition-id;</groupId>
+ <artifactId>&avalon-composition-api-id;</artifactId>
+ <version>&avalon-composition-api-version;</version>
</dependency>
<dependency>
- <groupId>avalon-jmx</groupId>
- <artifactId>avalon-jmx-management-api</artifactId>
- <version>${pom.currentVersion}</version>
+ <groupId>&avalon-jmx-id;</groupId>
+ <artifactId>&avalon-jmx-api-id;</artifactId>
+ <version>&avalon-jmx-api-version;</version>
</dependency>
<dependency>
- <groupId>avalon-jmx</groupId>
- <artifactId>avalon-jmx-util</artifactId>
- <version>${pom.currentVersion}</version>
+ <groupId>&avalon-jmx-id;</groupId>
+ <artifactId>&avalon-jmx-util-id;</artifactId>
+ <version>&avalon-jmx-util-version;</version>
</dependency>
<dependency>
<groupId>mx4j</groupId>
1.1 avalon-components/facilities/jmx/spi/index.ent
Index: index.ent
===================================================================
<!ENTITY % merlin-entities SYSTEM
"file:../../../../avalon/merlin/version.ent"> %merlin-entities;
<!ENTITY % facility-entities SYSTEM "file:../../version.ent">
%facility-entities;
1.3 +1 -2
avalon-components/facilities/jmx/spi/src/java/org/apache/avalon/jmx/spi/AbstractComponentRegistrationManager.java
Index: AbstractComponentRegistrationManager.java
===================================================================
RCS file:
/home/cvs/avalon-components/facilities/jmx/spi/src/java/org/apache/avalon/jmx/spi/AbstractComponentRegistrationManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractComponentRegistrationManager.java 5 Apr 2004 00:08:56 -0000
1.2
+++ AbstractComponentRegistrationManager.java 8 Apr 2004 08:35:16 -0000
1.3
@@ -80,7 +80,6 @@
{
unexport( name, entry.getExportedObject() );
}
-
}
protected abstract String getName( ComponentModel deploymentModel )
throws
1.4 +10 -3 avalon-components/facilities/jmx/test/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/jmx/test/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 4 Apr 2004 17:09:38 -0000 1.3
+++ project.xml 8 Apr 2004 08:35:16 -0000 1.4
@@ -1,10 +1,17 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
- <extend>${basedir}/../common-project.xml</extend>
- <id>avalon-jmx-test</id>
- <name>JMX Facility Test</name>
+ <extend>${basedir}/../../common-project.xml</extend>
+
+ <id>&avalon-jmx-test-id;</id>
+ <groupId>&avalon-jmx-id;</groupId>
+ <currentVersion>&avalon-jmx-test-version;</currentVersion>
+
+ <name>Avalon JMX Test</name>
<package>org.apache.avalon.playground.jmxtest</package>
<shortDescription>JMX Facility Test</shortDescription>
<description>
1.1 avalon-components/facilities/jmx/test/index.ent
Index: index.ent
===================================================================
<!ENTITY % merlin-entities SYSTEM
"file:../../../../avalon/merlin/version.ent"> %merlin-entities;
<!ENTITY % facility-entities SYSTEM "file:../../version.ent">
%facility-entities;
1.2 +1 -1
avalon-components/facilities/jmx/test/src/java/org/apache/avalon/playground/jmxtest/JMXTestComponent.java
Index: JMXTestComponent.java
===================================================================
RCS file:
/home/cvs/avalon-components/facilities/jmx/test/src/java/org/apache/avalon/playground/jmxtest/JMXTestComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMXTestComponent.java 4 Apr 2004 15:00:58 -0000 1.1
+++ JMXTestComponent.java 8 Apr 2004 08:35:16 -0000 1.2
@@ -24,7 +24,7 @@
* @author <a href="mailto:dev@avalon.apache.org";>Avalon Development Team</a>
* @version $Revision$
*
- * @avalon.component name="JMXTestComponent" version="0.1"
lifestyle="singleton"
+ * @avalon.component name="JMXTestComponent" lifestyle="singleton"
* @avalon.service type="org.apache.avalon.playground.jmxtest.JMXTestService"
* @avalon.service
type="org.apache.avalon.playground.jmxtest.JMXTestComponentMBean"
*/
1.4 +11 -4 avalon-components/facilities/jmx/util/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/jmx/util/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 4 Apr 2004 17:09:38 -0000 1.3
+++ project.xml 8 Apr 2004 08:35:16 -0000 1.4
@@ -1,11 +1,18 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
- <extend>${basedir}/../common-project.xml</extend>
- <id>avalon-jmx-util</id>
- <name>Merlin JMX Utility</name>
- <package>org.apache.avalon.merlin.jmx.util</package>
+ <extend>${basedir}/../../common-project.xml</extend>
+
+ <id>&avalon-jmx-util-id;</id>
+ <groupId>&avalon-jmx-id;</groupId>
+ <currentVersion>&avalon-jmx-util-version;</currentVersion>
+
+ <name>Avalon JMX Utility</name>
+ <package>org.apache.avalon.jmx.util</package>
<shortDescription>Merlin JMX utilities</shortDescription>
<description>
Utility classes to create JMX MBeans.
1.1 avalon-components/facilities/jmx/util/index.ent
Index: index.ent
===================================================================
<!ENTITY % merlin-entities SYSTEM
"file:../../../../avalon/merlin/version.ent"> %merlin-entities;
<!ENTITY % facility-entities SYSTEM "file:../../version.ent">
%facility-entities;
1.2 +2 -2
avalon-components/facilities/jmx/util/src/java/org/apache/avalon/jmx/util/ConfigurationBuilder.java
Index: ConfigurationBuilder.java
===================================================================
RCS file:
/home/cvs/avalon-components/facilities/jmx/util/src/java/org/apache/avalon/jmx/util/ConfigurationBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConfigurationBuilder.java 4 Apr 2004 16:18:57 -0000 1.1
+++ ConfigurationBuilder.java 8 Apr 2004 08:35:16 -0000 1.2
@@ -43,13 +43,13 @@
(
"-//PHOENIX/Mx Info DTD Version 1.0//EN",
"http://avalon.apache.org/dtds/meta/mxinfo_1_0.dtd";,
- "org/apache/avalon/merlin/jmx/util/mxinfo.dtd"
+ "org/apache/avalon/jmx/util/mxinfo.dtd"
),
new DTDInfo
(
"-//PHOENIX/Mx Info DTD Version 1.0//EN",
"http://jakarta.apache.org/avalon/dtds/phoenix/mxinfo_1_0.dtd";,
- "org/apache/avalon/merlin/jmx/util/mxinfo.dtd"
+ "org/apache/avalon/jmx/util/mxinfo.dtd"
)
};
1.5 +1 -1 avalon-components/facilities/mds/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/mds/impl/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 5 Apr 2004 09:45:33 -0000 1.4
+++ project.xml 8 Apr 2004 08:35:17 -0000 1.5
@@ -52,7 +52,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>3.3.0</version>
+ <version>2.0.0</version>
</dependency>
<dependency>
1.6 +1 -1 avalon-components/facilities/mds/test/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/mds/test/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 5 Apr 2004 09:45:33 -0000 1.5
+++ project.xml 8 Apr 2004 08:35:17 -0000 1.6
@@ -58,7 +58,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>3.3.0</version>
+ <version>2.0.0</version>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
