You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ni...@apache.org on 2004/04/18 07:16:44 UTC
cvs commit: avalon/versioning avalon-logging.ent avalon-logkit.ent avalon-merlin.ent
niclas 2004/04/17 22:16:44
Modified: buildsystem maven-common-gump-build-reactor.xml
maven-common-gump-build.xml maven-common.xml
maven-template.xml maven.xml project.properties
project.xml
maven-plugins/merlin merlin.properties
versioning avalon-logging.ent avalon-logkit.ent
avalon-merlin.ent
Log:
Mre license headers.
Revision Changes Path
1.2 +17 -1 avalon/buildsystem/maven-common-gump-build-reactor.xml
Index: maven-common-gump-build-reactor.xml
===================================================================
RCS file: /home/cvs/avalon/buildsystem/maven-common-gump-build-reactor.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven-common-gump-build-reactor.xml 16 Mar 2004 09:06:08 -0000 1.1
+++ maven-common-gump-build-reactor.xml 18 Apr 2004 05:16:44 -0000 1.2
@@ -1,4 +1,20 @@
<?xml version="1.0"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
<!-- this ant buildfile provides base functionality for gump
integration. You should not normally have to modify this
@@ -272,4 +288,4 @@
<property name="project.version" value="${project.version}"/>
</ant>
</target>
-</project>
\ No newline at end of file
+</project>
1.11 +17 -1 avalon/buildsystem/maven-common-gump-build.xml
Index: maven-common-gump-build.xml
===================================================================
RCS file: /home/cvs/avalon/buildsystem/maven-common-gump-build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- maven-common-gump-build.xml 21 Mar 2004 12:55:37 -0000 1.10
+++ maven-common-gump-build.xml 18 Apr 2004 05:16:44 -0000 1.11
@@ -1,4 +1,20 @@
<?xml version="1.0"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
<!-- this ant buildfile provides base functionality for gump
integration. You should not normally have to modify this
@@ -347,4 +363,4 @@
prefix="${project.name}-${project.version}"/>
</zip>
</target>
-</project>
\ No newline at end of file
+</project>
1.11 +16 -0 avalon/buildsystem/maven-common.xml
Index: maven-common.xml
===================================================================
RCS file: /home/cvs/avalon/buildsystem/maven-common.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- maven-common.xml 21 Feb 2004 13:26:59 -0000 1.10
+++ maven-common.xml 18 Apr 2004 05:16:44 -0000 1.11
@@ -1,4 +1,20 @@
<?xml version="1.0"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
<project default="avalon:info"
xmlns:j="jelly:core"
1.3 +16 -0 avalon/buildsystem/maven-template.xml
Index: maven-template.xml
===================================================================
RCS file: /home/cvs/avalon/buildsystem/maven-template.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven-template.xml 17 Jun 2003 17:28:37 -0000 1.2
+++ maven-template.xml 18 Apr 2004 05:16:44 -0000 1.3
@@ -1,4 +1,20 @@
<?xml version="1.0"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
<project default="check"
xmlns:j="jelly:core"
1.8 +17 -1 avalon/buildsystem/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/buildsystem/maven.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- maven.xml 17 Jun 2003 17:25:51 -0000 1.7
+++ maven.xml 18 Apr 2004 05:16:44 -0000 1.8
@@ -1,4 +1,20 @@
<?xml version="1.0"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
<project default="avalon:info"
xmlns:j="jelly:core"
@@ -677,4 +693,4 @@
<attainGoal name="avalon:seed-gump-module"/>
</goal>
-</project>
\ No newline at end of file
+</project>
1.3 +16 -0 avalon/buildsystem/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/buildsystem/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.properties 18 Apr 2004 05:13:05 -0000 1.2
+++ project.properties 18 Apr 2004 05:16:44 -0000 1.3
@@ -1,3 +1,19 @@
+# Copyright 2004 The Apache Software Foundation
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
# -------------------------------------------------------------------
# P R O J E C T P R O P E R T I E S
# -------------------------------------------------------------------
1.2 +17 -1 avalon/buildsystem/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/buildsystem/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 9 Jun 2003 15:26:24 -0000 1.1
+++ project.xml 18 Apr 2004 05:16:44 -0000 1.2
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
<project>
<extend>./project-common.xml</extend>
@@ -18,4 +34,4 @@
<unitTestSourceDirectory/>
</build>
-</project>
\ No newline at end of file
+</project>
1.2 +15 -0 avalon/maven-plugins/merlin/merlin.properties
Index: merlin.properties
===================================================================
RCS file: /home/cvs/avalon/maven-plugins/merlin/merlin.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- merlin.properties 17 Apr 2004 10:22:50 -0000 1.1
+++ merlin.properties 18 Apr 2004 05:16:44 -0000 1.2
@@ -1,3 +1,18 @@
+# Copyright 2004 The Apache Software Foundation
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
#----------------------------------------------------------------------
# static defaults for the merlin platform
1.5 +16 -0 avalon/versioning/avalon-logging.ent
Index: avalon-logging.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-logging.ent,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- avalon-logging.ent 11 Apr 2004 13:06:32 -0000 1.4
+++ avalon-logging.ent 18 Apr 2004 05:16:44 -0000 1.5
@@ -1,3 +1,19 @@
+<!--
+Copyright 2004 The Apache Software Foundation
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
<!ENTITY avalon-logging-id "avalon-logging">
1.3 +1 -1 avalon/versioning/avalon-logkit.ent
Index: avalon-logkit.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-logkit.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- avalon-logkit.ent 9 Apr 2004 10:27:50 -0000 1.2
+++ avalon-logkit.ent 18 Apr 2004 05:16:44 -0000 1.3
@@ -1,5 +1,5 @@
<!ENTITY avalon-logkit-group "avalon-logkit">
<!ENTITY avalon-logkit-id "avalon-logkit">
-<!ENTITY avalon-logkit-version "2.0">
+<!ENTITY avalon-logkit-version "2.0.dev-0">
1.6 +17 -0 avalon/versioning/avalon-merlin.ent
Index: avalon-merlin.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-merlin.ent,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- avalon-merlin.ent 11 Apr 2004 13:06:32 -0000 1.5
+++ avalon-merlin.ent 18 Apr 2004 05:16:44 -0000 1.6
@@ -1,3 +1,20 @@
+<!--
+Copyright 2004 The Apache Software Foundation
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
<!-- Avalon Composition -->
<!ENTITY avalon-composition-spec "2.0">
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org