mcconnell 2003/11/03 10:54:19
Modified:
merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
AbstractBlock.java
merlin/composition/api/src/java/org/apache/avalon/composition/model
DeploymentModel.java
merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder
TargetsBuilder.java
merlin maven.xml platform.xml
merlin/repository/impl/src/java/org/apache/avalon/repository/impl
DefaultFactory.java
merlin/repository/spi/src/java/org/apache/avalon/repository
RepositoryConfig.java RepositoryLoader.java
Log:
Corrections to sources to eliminate javadoc generation errors and include util
supproject in javadoc generation.
Revision Changes Path
1.2 +2 -2
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java
Index: AbstractBlock.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractBlock.java 3 Nov 2003 06:14:08 -0000 1.1
+++ AbstractBlock.java 3 Nov 2003 18:54:18 -0000 1.2
@@ -104,7 +104,7 @@
/**
* Create a root containment block.
- * @param context the service context
+ * @param services the service context
* @param model the root containment model
* @return the appliance
*/
1.6 +2 -2
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DeploymentModel.java 28 Oct 2003 12:53:48 -0000 1.5
+++ DeploymentModel.java 3 Nov 2003 18:54:18 -0000 1.6
@@ -92,7 +92,7 @@
/**
* Set the collection policy to a supplied value.
*
- * @param the collection policy
+ * @param policy the collection policy
* @see org.apache.avalon.meta.info.InfoDescriptor#LIBERAL
* @see org.apache.avalon.meta.info.InfoDescriptor#DEMOCRAT
* @see org.apache.avalon.meta.info.InfoDescriptor#CONSERVATIVE
1.3 +2 -2
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/TargetsBuilder.java
Index: TargetsBuilder.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/TargetsBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TargetsBuilder.java 28 Oct 2003 20:21:00 -0000 1.2
+++ TargetsBuilder.java 3 Nov 2003 18:54:18 -0000 1.3
@@ -83,7 +83,7 @@
/**
- * Create a [EMAIL PROTECTED] TargetDirective} from a stream.
+ * Create a [EMAIL PROTECTED] Targets} instance from a stream.
*
* @param inputStream the stream that the resource is loaded from
* @return the target directive
1.5 +2 -0 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 7 Oct 2003 18:04:34 -0000 1.4
+++ maven.xml 3 Nov 2003 18:54:18 -0000 1.5
@@ -331,6 +331,8 @@
<j:forEach var="packageGroup" items="${pom.packageGroups}">
<group title="${packageGroup.title}" packages="${packageGroup.packages}"/>
</j:forEach>
+ <sourcepath path="${basedir}/util/env/src/java"/>
+ <sourcepath path="${basedir}/util/defaults/src/java"/>
<sourcepath path="${basedir}/repository/spi/src/java"/>
<sourcepath path="${basedir}/repository/impl/src/java"/>
<sourcepath path="${basedir}/extension/spi/src/java"/>
1.8 +11 -0 avalon/merlin/platform.xml
Index: platform.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- platform.xml 3 Nov 2003 06:11:31 -0000 1.7
+++ platform.xml 3 Nov 2003 18:54:18 -0000 1.8
@@ -39,6 +39,17 @@
<!-- avalon dependecies -->
<dependency>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-env</artifactId>
+ <version>1.0-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-defaults</artifactId>
+ <version>1.0-dev</version>
+ </dependency>
+
+ <dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
<version>1.0b1</version>
1.2 +3 -3
avalon/merlin/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultFactory.java
Index: DefaultFactory.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultFactory.java 3 Nov 2003 06:53:05 -0000 1.1
+++ DefaultFactory.java 3 Nov 2003 18:54:19 -0000 1.2
@@ -211,7 +211,7 @@
/**
* Creates a file repository using the properties of a configuration bean.
*
- * @see org.apache.avalon.repository.RepositoryFactory#
+ * @see org.apache.avalon.repository.RepositoryFactory
* create(org.apache.avalon.repository.RepositoryConfig)
*/
public Repository create( RepositoryConfig a_config )
1.2 +3 -2
avalon/merlin/repository/spi/src/java/org/apache/avalon/repository/RepositoryConfig.java
Index: RepositoryConfig.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/repository/spi/src/java/org/apache/avalon/repository/RepositoryConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RepositoryConfig.java 3 Nov 2003 06:35:41 -0000 1.1
+++ RepositoryConfig.java 3 Nov 2003 18:54:19 -0000 1.2
@@ -135,6 +135,7 @@
/**
+ * Return the path to the local repository cache
* @return Returns the localRepository.
*/
public String getLocalRepository()
1.2 +3 -3
avalon/merlin/repository/spi/src/java/org/apache/avalon/repository/RepositoryLoader.java
Index: RepositoryLoader.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/repository/spi/src/java/org/apache/avalon/repository/RepositoryLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RepositoryLoader.java 3 Nov 2003 06:35:41 -0000 1.1
+++ RepositoryLoader.java 3 Nov 2003 18:54:19 -0000 1.2
@@ -216,7 +216,7 @@
* @param a_config a repository configuration bean
* @return the newly created repository
* @throws RepositoryException if there is a failure while creating the repo
- * @see org.apache.avalon.repository.RepositoryFactory#
+ * @see org.apache.avalon.repository.RepositoryFactory
* create(org.apache.avalon.repository.RepositoryConfig)
*/
public Repository create( RepositoryConfig a_config )
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
