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 2004/01/19 14:35:11 UTC
cvs commit: avalon/merlin maven.xml project.properties
mcconnell 2004/01/19 05:35:11
Modified: merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
DefaultClassLoaderModel.java
merlin/facilities/http/impl/src/java/org/apache/avalon/http/impl
DefaultServer.java
merlin/kernel/api/src/java/org/apache/avalon/merlin
KernelCriteria.java
merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl
DefaultCriteria.java DefaultKernelContext.java
merlin maven.xml project.properties
Log:
Updates to fix those annoying javadoc warning.
Revision Changes Path
1.6 +3 -2 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultClassLoaderModel.java
Index: DefaultClassLoaderModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultClassLoaderModel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultClassLoaderModel.java 19 Jan 2004 01:26:19 -0000 1.5
+++ DefaultClassLoaderModel.java 19 Jan 2004 13:35:10 -0000 1.6
@@ -218,7 +218,8 @@
m_permissions = createPermissions( directive.getGrantDirective() );
if( getLocalLogger().isDebugEnabled() )
{
- String str = "classpath: " + StringHelper.toString( m_classpath );
+ String str = "classpath: "
+ + StringHelper.toString( m_classpath );
getLocalLogger().debug( str );
}
1.2 +9 -6 avalon/merlin/facilities/http/impl/src/java/org/apache/avalon/http/impl/DefaultServer.java
Index: DefaultServer.java
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/http/impl/src/java/org/apache/avalon/http/impl/DefaultServer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultServer.java 13 Jan 2004 12:46:54 -0000 1.1
+++ DefaultServer.java 19 Jan 2004 13:35:11 -0000 1.2
@@ -155,7 +155,7 @@
/**
* Contextualization of the server by the container.
- * @param config the supplied server context
+ * @param context the supplied server context
* @exception ContextException if a contextualization error occurs
* @avalon.entry key="urn:composition:dir" type="java.io.File"
*/
@@ -285,20 +285,21 @@
/**
* Create a context defined in the component configuration.
- * @param conf the context configuration
+ * @param config the context configuration
*/
- private HttpContext createContext( Configuration child )
+ private HttpContext createContext( Configuration config )
throws Exception
{
HttpContext context = new HttpContext();
- String path = child.getAttribute( PATH_ATTRIBUTE_NAME, "/*" );
- String base = child.getAttribute( BASE_ATTRIBUTE_NAME, null );
+ String path = config.getAttribute( PATH_ATTRIBUTE_NAME, "/*" );
+ String base = config.getAttribute( BASE_ATTRIBUTE_NAME, null );
return createContext( path, base );
}
/**
* Create a context using the supplied parameters.
- * @param conf the context configuration
+ * @param path the context path
+ * @param base the base directory
*/
private HttpContext createContext( String path, String base )
throws Exception
@@ -365,6 +366,7 @@
/**
* Creates a new socket listener
* @param config an socket listener configuration
+ * @param port the default port
*/
private HttpListener createSocketListener( Configuration config, int port )
throws UnknownHostException
@@ -380,6 +382,7 @@
/**
* Creates a default sun jsse listener.
* @param configuration
+ * @param port the default port
* @return The newly created sun jsse listener
* @throws Exception
*/
1.4 +1 -3 avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/KernelCriteria.java
Index: KernelCriteria.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/KernelCriteria.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- KernelCriteria.java 16 Jan 2004 16:39:02 -0000 1.3
+++ KernelCriteria.java 19 Jan 2004 13:35:11 -0000 1.4
@@ -198,8 +198,6 @@
/**
* Return the set of block URLs to be included in the root application
- *
- * @param repository a repository against which artifact url may be resolved
* @return the block deployment urls
*/
URL[] getDeploymentURLs();
1.16 +2 -1 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java
Index: DefaultCriteria.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DefaultCriteria.java 16 Jan 2004 16:39:02 -0000 1.15
+++ DefaultCriteria.java 19 Jan 2004 13:35:11 -0000 1.16
@@ -227,6 +227,7 @@
/**
* Creation of a new default kernel criteria.
+ * @param context the initial repository context
*/
public DefaultCriteria( InitialContext context )
{
1.2 +2 -2 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultKernelContext.java
Index: DefaultKernelContext.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultKernelContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultKernelContext.java 13 Jan 2004 18:43:15 -0000 1.1
+++ DefaultKernelContext.java 19 Jan 2004 13:35:11 -0000 1.2
@@ -74,7 +74,7 @@
* Creation of a new default kernel context.
* @param logger the logging channel to be assigned to the kernel
* @param facilities the internal facilities model
- * @param appliance the application model
+ * @param application the application model
*/
public DefaultKernelContext(
final Logger logger, final ContainmentModel facilities,
1.38 +53 -3 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- maven.xml 16 Jan 2004 16:39:02 -0000 1.37
+++ maven.xml 19 Jan 2004 13:35:11 -0000 1.38
@@ -2,6 +2,14 @@
<!--
==============================================================================
+ switches
+ ==============================================================================
+ -->
+
+ <ant:property name="merlin.snapshot" value="true"/>
+
+ <!--
+ ==============================================================================
dependent properties
==============================================================================
-->
@@ -266,6 +274,19 @@
</ant:fixcrlf>
</goal>
+
+ <goal name="avalon:test">
+ <j:choose>
+ <echo>PROPERTY: '${merlin.snapshot}'</echo>
+ <j:when test="${merlin.snapshot == 'true'}">
+ <echo>SNAPSHOT BUILD</echo>
+ </j:when>
+ <j:otherwise>
+ <echo>RELEASE BUILD</echo>
+ </j:otherwise>
+ </j:choose>
+ </goal>
+
<!--
==============================================================================
prepare the merlin installation package
@@ -274,6 +295,15 @@
<goal name="avalon:package">
+ <j:choose>
+ <j:when test="${merlin.snapshot == 'true'}">
+ <echo>SNAPSHOT BUILD</echo>
+ </j:when>
+ <j:otherwise>
+ <echo>RELEASE BUILD</echo>
+ </j:otherwise>
+ </j:choose>
+
<!--
<j:set var="package.name" value="${maven.final.name}-dist"/>
-->
@@ -281,6 +311,9 @@
<j:set var="timestamp" value="${snapshotSignature.substring(7,15)}"/>
<j:set var="package.name" value="${maven.final.name}-dist-${timestamp}"/>
+ <j:set var="tutorial.name" value="${maven.final.name}-tutorial-${timestamp}"/>
+ <!--<j:set var="tutorial.name" value="${maven.final.name}-tutorial"/>-->
+
<ant:echo>Building distribution: ${package.name}</ant:echo>
<ant:zip zipfile="${maven.build.dir}/${package.name}.zip">
<zipfileset dir="${merlin.build.inst.dir}" prefix="merlin"/>
@@ -308,9 +341,6 @@
<ant:delete file="${maven.build.dir}/${package.name}.tar"/>
<checksum file="${maven.build.dir}/${package.name}.tar.gz"/>
- <j:set var="tutorial.name" value="${maven.final.name}-tutorial-${timestamp}"/>
- <!--<j:set var="tutorial.name" value="${maven.final.name}-tutorial"/>-->
-
<ant:echo>Building tutorial kit: ${tutorial.name}</ant:echo>
<ant:zip zipfile="${maven.build.dir}/${tutorial.name}.zip">
<zipfileset dir="${basedir}/target/tutorials" prefix="tutorial"/>
@@ -402,18 +432,23 @@
bottom="${copyright}"
additionalparam="-breakiterator -J-Xmx128m "
packagenames="*,org.*">
+
<classpath>
<path refid="template.classpath"/>
</classpath>
+
<j:forEach var="child" items="${reactorProjects}">
<sourcepath path="${child.file.parentFile}/src/java"/>
</j:forEach>
+
<j:forEach var="packageGroup" items="${pom.packageGroups}">
<group title="${packageGroup.title}" packages="${packageGroup.packages}"/>
</j:forEach>
+
<classpath>
<path refid="maven.dependency.classpath"/>
</classpath>
+
<link href="${sun.j2se.link}" />
<link href="${sun.j2ee.link}" />
<link href="${avalon.framework.link}" />
@@ -423,6 +458,21 @@
<link href="${avalon.logkit.link}" />
<!--<link href="${avalon.lifecycle.link}" />-->
<link href="${excalibur.configuration.link}" />
+
+ <util:tokenize var="listOfTags" delim=" ">${maven.javadoc.customtags}</util:tokenize>
+ <j:forEach var="someTag" items="${listOfTags}">
+ <j:set var="nameVar" value="${someTag}.name"/>
+ <j:set var="name" value="${context.findVariable(nameVar)}"/>
+ <j:set var="descriptionVar" value="${someTag}.description"/>
+ <j:set var="description" value="${context.findVariable(descriptionVar)}"/>
+ <j:set var="enabledVar" value="${someTag}.enabled"/>
+ <j:set var="enabled" value="${context.findVariable(enabledVar)}"/>
+ <j:set var="scopeVar" value="${someTag}.scope"/>
+ <j:set var="scope" value="${context.findVariable(scopeVar)}"/>
+ <ant:tag name="${name}" description="${description}"
+ enabled="${enabled}" scope="${scope}"/>
+ </j:forEach>
+
</ant:javadoc>
</goal>
1.7 +25 -0 avalon/merlin/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/merlin/project.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.properties 13 Jan 2004 11:41:22 -0000 1.6
+++ project.properties 19 Jan 2004 13:35:11 -0000 1.7
@@ -11,6 +11,31 @@
maven.docs.dest = ${maven.build.dir}/merlin/docs
#
+# custom tags spec
+#
+maven.javadoc.customtags = component service entry dependency
+
+component.name = avalon.component
+component.description = Component:
+component.enabled = true
+component.scope = class
+
+service.name = avalon.service
+service.description = Service Export:
+service.enabled = true
+service.scope = class
+
+entry.name = avalon.entry
+entry.description = Context Entry:
+entry.enabled = true
+entry.scope = method
+
+dependency.name = avalon.dependency
+dependency.description = Service Dependency:
+dependency.enabled = true
+dependency.scope = method
+
+#
# Declaration of the remote links to assign on javadoc generation.
# Link declarations can be overriden in the user's build.properties
# file.
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org