mcconnell 2004/01/19 06:14:57
Modified: merlin/composition/api/src/java/org/apache/avalon/composition/data
ClassLoaderDirective.java ContainmentProfile.java
merlin maven.xml
Log:
Housekeeping.
Revision Changes Path
1.4 +8 -2
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ClassLoaderDirective.java 19 Jan 2004 01:26:19 -0000 1.3
+++ ClassLoaderDirective.java 19 Jan 2004 14:14:56 -0000 1.4
@@ -62,6 +62,7 @@
{
private static final LibraryDirective EMPTY_LIBRARY = new LibraryDirective();
private static final ClasspathDirective EMPTY_CLASSPATH = new
ClasspathDirective();
+ private static final GrantDirective EMPTY_GRANT = new GrantDirective();
/**
* The library directive.
@@ -112,10 +113,15 @@
{
m_classpath = classpath;
}
+
if( grant == null )
- m_grantDirective = new GrantDirective();
+ {
+ m_grantDirective = EMPTY_GRANT;
+ }
else
+ {
m_grantDirective = grant;
+ }
}
/**
1.5 +9 -4
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ContainmentProfile.java 19 Jan 2004 01:26:19 -0000 1.4
+++ ContainmentProfile.java 19 Jan 2004 14:14:56 -0000 1.5
@@ -81,12 +81,17 @@
private static final ServiceDirective[] EMPTY_SERVICES =
new ServiceDirective[0];
- private static final DeploymentProfile[] EMPTY_PROFILES = new
DeploymentProfile[0];
+ private static final DeploymentProfile[] EMPTY_PROFILES =
+ new DeploymentProfile[0];
- private static final CategoriesDirective EMPTY_CATEGORIES = new
CategoriesDirective();
+ private static final CategoriesDirective EMPTY_CATEGORIES =
+ new CategoriesDirective();
private static final ClassLoaderDirective EMPTY_CLASSLOADER =
- new ClassLoaderDirective( new LibraryDirective(), new ClasspathDirective(),
new GrantDirective() );
+ new ClassLoaderDirective(
+ new LibraryDirective(),
+ new ClasspathDirective(),
+ new GrantDirective() );
//========================================================================
// state
1.40 +14 -23 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- maven.xml 19 Jan 2004 13:38:35 -0000 1.39
+++ maven.xml 19 Jan 2004 14:14:57 -0000 1.40
@@ -274,20 +274,6 @@
</ant:fixcrlf>
</goal>
-
- <goal name="avalon:test">
- <!--- DOES NOT WORK -->
- <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
@@ -296,15 +282,20 @@
<goal name="avalon:package">
- <!--
- <j:set var="package.name" value="${maven.final.name}-dist"/>
- -->
- <maven:snapshot project="${pom}"/>
- <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"/>-->
+ <j:choose>
+ <j:when test="${merlin.snapshot}">
+ <maven:snapshot project="${pom}"/>
+ <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}"/>
+ <echo>Snapshot Packaging: ${timestamp}</echo>
+ </j:when>
+ <j:otherwise>
+ <j:set var="package.name" value="${maven.final.name}-dist"/>
+ <j:set var="tutorial.name" value="${maven.final.name}-tutorial"/>
+ <echo>Release Packaging: ${pom.currentVersion}</echo>
+ </j:otherwise>
+ </j:choose>
<ant:echo>Building distribution: ${package.name}</ant:echo>
<ant:zip zipfile="${maven.build.dir}/${package.name}.zip">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
