mcconnell 2003/01/06 20:24:16
Modified: merlin build.xml
merlin/src/etc project.mf
merlin/src/java/org/apache/avalon/merlin/block
DefaultBlock.java
Log:
Update to handle Block-Name in manifest.
Revision Changes Path
1.9 +2 -1 avalon-sandbox/merlin/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 6 Jan 2003 01:05:53 -0000 1.8
+++ build.xml 7 Jan 2003 04:24:16 -0000 1.9
@@ -169,7 +169,7 @@
</filterset>
</copy>
<copy todir="${build.conf}" flatten="true">
- <fileset dir="${src.dir}/etc" includes="kernel.xml"/>
+ <fileset dir="${src.dir}/etc" includes="kernel.xml" />
</copy>
<mkdir dir="${build.lib}"/>
@@ -180,6 +180,7 @@
manifest="${src.dir}/etc/project.mf">
<exclude name="**/test/**"/>
<exclude name="**/playground/**"/>
+ <exclude name="**/*.zip"/>
<zipfileset dir="${build.conf}" prefix="META-INF/">
<include name="LICENSE.txt"/>
</zipfileset>
1.6 +1 -1 avalon-sandbox/merlin/src/etc/project.mf
Index: project.mf
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/src/etc/project.mf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.mf 11 Dec 2002 02:53:40 -0000 1.5
+++ project.mf 7 Jan 2003 04:24:16 -0000 1.6
@@ -24,4 +24,4 @@
Main-Class: org.apache.avalon.merlin.Main
Name: Avalon-Block
-Block-Name: Merlin
+Block-Package: org.apache.avalon.merlin
1.10 +5 -0
avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/block/DefaultBlock.java
Index: DefaultBlock.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/block/DefaultBlock.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultBlock.java 27 Dec 2002 16:38:54 -0000 1.9
+++ DefaultBlock.java 7 Jan 2003 04:24:16 -0000 1.10
@@ -54,6 +54,7 @@
//==============================================================
public static final Attributes.Name BLOCK_PACKAGE = new Attributes.Name(
"Block-Package" );
+ public static final Attributes.Name OLD_BLOCK_NAME = new
Attributes.Name( "Block-Name" );
public static String getPackageName( Manifest manifest )
{
@@ -65,6 +66,10 @@
if( attributes.containsKey( BLOCK_PACKAGE ) )
{
return (String) attributes.get( BLOCK_PACKAGE );
+ }
+ if( attributes.containsKey( OLD_BLOCK_NAME ) )
+ {
+ return (String) attributes.get( OLD_BLOCK_NAME );
}
return null;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
