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 2003/06/28 01:13:55 UTC
cvs commit: avalon-sandbox/merlin/merlin-platform/tutorials/hello/conf block.xml
mcconnell 2003/06/27 16:13:55
Modified: merlin LICENSE.txt project.xml
Added: merlin/merlin-platform/tutorials/dependencies .cvsignore
merlin/merlin-platform/tutorials/hello maven.xml
merlin/merlin-platform/tutorials/hello/conf block.xml
Log:
Housekeeping.
Revision Changes Path
1.2 +8 -6 avalon-sandbox/merlin/LICENSE.txt
Index: LICENSE.txt
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/LICENSE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LICENSE.txt 24 Jun 2003 21:58:54 -0000 1.1
+++ LICENSE.txt 27 Jun 2003 23:13:54 -0000 1.2
@@ -2,7 +2,8 @@
The Apache Software License, Version 1.1
============================================================================
- Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
+ Copyright (C) 1997-2003 The Apache Software Foundation.
+ All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
@@ -20,10 +21,10 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Jakarta", "Apache Avalon", "Avalon Framework" and
- "Apache Software Foundation" must not be used to endorse or promote
- products derived from this software without prior written
- permission. For written permission, please contact apache@apache.org.
+ 4. The names "Apache", "Avalon", "Excalibur", "Fortress", "Phoenix",
+ "Merlin" and "Apache Software Foundation" must not be used to endorse or
+ promote products derived from this software without prior written
+ permission. For written permission, please contact apache@apache.org.
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
@@ -42,4 +43,5 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation. For more information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
+ Apache Software Foundation, please see http://www.apache.org/.
+
1.20 +1 -0 avalon-sandbox/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/project.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- project.xml 24 Jun 2003 21:57:35 -0000 1.19
+++ project.xml 27 Jun 2003 23:13:54 -0000 1.20
@@ -144,6 +144,7 @@
<roles>
<role>Patches enhancing the meta-info generation sources and documentation, and patches related to the pooled lifestyle handler.</role>
</roles>
+ <organization>Jentro AG</organization>
</contributor>
<contributor>
<name>Aaron Far</name>
1.1 avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/.cvsignore
Index: .cvsignore
===================================================================
maven.log
velocity.log
build.xml
build.properties
target
maven.log
working
1.1 avalon-sandbox/merlin/merlin-platform/tutorials/hello/maven.xml
Index: maven.xml
===================================================================
<project default="java:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
<preGoal name="java:compile">
<attainGoal name="merlin:meta"/>
</preGoal>
</project>
1.1 avalon-sandbox/merlin/merlin-platform/tutorials/hello/conf/block.xml
Index: block.xml
===================================================================
<block>
<info>
<name>tutorial</name>
</info>
<implementation>
<component name="hello" class="tutorial.HelloComponent" activation="startup"/>
</implementation>
</block>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org