cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jheym...@apache.org
Subject svn commit: r432742 [6/7] - in /cocoon/trunk: ./ blocks/ blocks/cocoon-ajax/ blocks/cocoon-ajax/cocoon-ajax-impl/ blocks/cocoon-ajax/cocoon-ajax-sample/ blocks/cocoon-apples/ blocks/cocoon-apples/cocoon-apples-impl/ blocks/cocoon-apples/cocoon-apples-s...
Date Fri, 18 Aug 2006 22:01:14 GMT
Modified: cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2005 The Apache Software Foundation
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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
 
-  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
 
-      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.
+  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.
 -->
 <!--+
     | @version $Id$

Modified: cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,40 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2006 The Apache Software Foundation
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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
 
-  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
 
-      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.
+  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.
 -->
 <!--+
     | @version $Id$
+    |
     +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  
-  <modelVersion>4.0.0</modelVersion>  
-  
+  <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-xsp</artifactId>
     <version>1-SNAPSHOT</version>
   </parent>
-  
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-xsp-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-    
   <packaging>jar</packaging>
   <name>xsp Block Samples</name>
   <description/>
-  
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
@@ -42,5 +41,4 @@
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
-
 </project>

Modified: cocoon/trunk/blocks/cocoon-xsp/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xsp/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-xsp/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,42 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2006 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.
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
 -->
 <!--+
     | @version $Id$
+    |
     +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
     <version>2-SNAPSHOT</version>
   </parent>
-
   <modelVersion>4.0.0</modelVersion>
-
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-xsp</artifactId>
   <version>1-SNAPSHOT</version>
-
   <packaging>pom</packaging>
-
-  <name>xsp Block</name>
-
+  <name>Xsp Block [modules]</name>
   <description/>
-
   <modules>
     <module>cocoon-xsp-impl</module>
     <module>cocoon-xsp-sample</module>

Modified: cocoon/trunk/blocks/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/blocks/pom.xml (original)
+++ cocoon/trunk/blocks/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,39 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2006 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.
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
 -->
 <!--+
     | @version $Id$
+    |
     +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>  
-
-  <packaging>pom</packaging>  
-
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>pom</packaging>
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon</artifactId>
     <version>2-SNAPSHOT</version>
   </parent>
-
   <artifactId>cocoon-blocks-modules</artifactId>
   <version>2-SNAPSHOT</version>
-
   <name>Cocoon Blocks [modules]</name>
-
   <modules>
     <module>cocoon-ajax</module>
     <module>cocoon-apples</module>
@@ -80,7 +78,7 @@
     <module>cocoon-scratchpad</module>
     <module>cocoon-serializers</module>
     <module>cocoon-session-fw</module>
-    <module>cocoon-samples-style</module>				
+    <module>cocoon-samples-style</module>
     <module>cocoon-slide</module>
     <module>cocoon-slop</module>
     <module>cocoon-stx</module>

Modified: cocoon/trunk/commons/legal/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/commons/legal/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/commons/legal/pom.xml (original)
+++ cocoon/trunk/commons/legal/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,39 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2006 The Apache Software Foundation
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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
 
-  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
 
-      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.
+  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.
 -->
 <!--+
-    | @version $Id: pom.xml 393040 2006-04-10 20:06:15Z jheymans $
+    | @version $Id$
+    |
     +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  
-  <modelVersion>4.0.0</modelVersion>  
-  
-  <packaging>jar</packaging>  
-  
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>jar</packaging>
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon</artifactId>
     <version>2-SNAPSHOT</version>
   </parent>
-
   <artifactId>cocoon-licenses</artifactId>
   <version>1.0.0-M2-SNAPSHOT</version>
-    
   <name>Cocoon Licenses</name>
-
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/cocoon/trunk/commons/legal</connection>
   </scm>

Modified: cocoon/trunk/commons/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/commons/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/commons/pom.xml (original)
+++ cocoon/trunk/commons/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,40 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2006 The Apache Software Foundation
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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
 
-  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
 
-      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.
+  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.
 -->
 <!--+
-    | @version $Id: pom.xml 393040 2006-04-10 20:06:15Z jheymans $
+    | @version $Id$
+    |
     +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  
-  <modelVersion>4.0.0</modelVersion>  
-  
-  <packaging>pom</packaging>  
-  
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>pom</packaging>
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon</artifactId>
     <version>2-SNAPSHOT</version>
   </parent>
-
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-commons-modules</artifactId>
   <version>2-SNAPSHOT</version>
-    
   <name>Cocoon Commons [modules]</name>
-
   <modules>
     <module>legal</module>
   </modules>

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo1/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo1/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo1/pom.xml (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo1/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,4 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+-->
+<!--+
+    | @version $Id$
+    |
+    +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>cocoon-blocks-fw</artifactId>

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo2/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo2/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo2/pom.xml (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo2/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,4 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+-->
+<!--+
+    | @version $Id$
+    |
+    +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>cocoon-blocks-fw</artifactId>

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,4 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+-->
+<!--+
+    | @version $Id$
+    |
+    +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>cocoon-blocks-fw</artifactId>

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,4 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+-->
+<!--+
+    | @version $Id$
+    |
+    +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>cocoon-blocks-fw</artifactId>

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-sample/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-sample/pom.xml (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-sample/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,24 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2005 The Apache Software Foundation
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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
 
-  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
 
-  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.
+  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.
 -->
 <!--+
-  | @version $Id$
-  |
-  +-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    | @version $Id$
+    |
+    +-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>cocoon-blocks-fw</artifactId>

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,4 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+-->
+<!--+
+    | @version $Id$
+    |
+    +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>cocoon-blocks-fw</artifactId>

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-tests/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-tests/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-tests/pom.xml (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-tests/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,4 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+-->
+<!--+
+    | @version $Id$
+    |
+    +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.cocoon</groupId>
@@ -18,7 +40,7 @@
       <groupId>org.apache.excalibur.components.store</groupId>
       <artifactId>excalibur-store</artifactId>
       <version>2.1</version>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>osgi_R4_core</artifactId>
@@ -30,16 +52,16 @@
       <artifactId>osgi_R4_compendium</artifactId>
       <version>1.0</version>
       <scope>provided</scope>
-    </dependency>            
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
       <version>2.0-rc1</version>
-    </dependency>           
+    </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
       <version>2.2.0-M2-SNAPSHOT</version>
-    </dependency>    
+    </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-default/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-default/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-default/pom.xml (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-default/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,19 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2006 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.
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
 -->
+<!--+
+    | @version $Id$
+    |
+    +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -22,12 +29,9 @@
     <version>2-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
-
   <name>Cocoon default (all blocks to run blocks-fw)</name>
-
   <artifactId>cocoon-default</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-
   <!--dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
@@ -45,5 +49,4 @@
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
   </dependencies-->
-
 </project>

Modified: cocoon/trunk/core/cocoon-blocks-fw/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/pom.xml (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,24 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2006 The Apache Software Foundation
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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
 
-  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
 
-      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.
+  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.
 -->
 <!--+
     | @version $Id$
     |
     +-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-core-modules</artifactId>

Modified: cocoon/trunk/core/cocoon-bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-bootstrap/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-bootstrap/pom.xml (original)
+++ cocoon/trunk/core/cocoon-bootstrap/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,41 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2005 The Apache Software Foundation
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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
 
-  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
 
-      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.
+  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.
 -->
 <!--+
     | @version $Id$
     |
     +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-core-modules</artifactId>
     <version>2-SNAPSHOT</version>
   </parent>
-  
   <modelVersion>4.0.0</modelVersion>
-  
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-bootstrap</artifactId>
   <version>1.0.0-M2-SNAPSHOT</version>
-  
   <packaging>jar</packaging>
-  
   <name>Cocoon Bootstrap Implementation</name>
-  
   <dependencies>
     <dependency>
       <groupId>commons-jci</groupId>

Modified: cocoon/trunk/core/cocoon-core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/pom.xml (original)
+++ cocoon/trunk/core/cocoon-core/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,52 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2005 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.
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
 -->
 <!--+
-  | @version $Id$
-  |
-  +-->
+    | @version $Id$
+    |
+    +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
   <modelVersion>4.0.0</modelVersion>
-
-  <packaging>jar</packaging>  
-
+  <packaging>jar</packaging>
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-core-modules</artifactId>
     <version>2-SNAPSHOT</version>
   </parent>
-
   <artifactId>cocoon-core</artifactId>
   <version>2.2.0-M2-SNAPSHOT</version>
-
   <name>Cocoon Core</name>
   <build>
     <plugins>
       <plugin>
-       <!-- export our test classes in a separate jar -->
-       <groupId>org.apache.maven.plugins</groupId>
-       <artifactId>maven-jar-plugin</artifactId>
-       <executions>
-         <execution>
-           <goals>
-             <goal>test-jar</goal>
-           </goals>
-         </execution>
-       </executions>
+        <!-- export our test classes in a separate jar -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <!-- uncommeent the cocoon-maven-eclipse-plugin plugin to create the Eclipse project files
            with PDE support. Note that you have to run 'mvn install'
@@ -58,7 +56,7 @@
         <configuration>
           <pde>true</pde>
         </configuration>
-      </plugin-->         
+      </plugin-->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
@@ -95,22 +93,18 @@
       </resource>
     </resources>
   </build>
-
   <dependencies>
-
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-licenses</artifactId>
       <version>1.0.0-M2-SNAPSHOT</version>
     </dependency>
-
     <!--  bootstrap -->
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-bootstrap</artifactId>
       <version>1.0.0-M2-SNAPSHOT</version>
     </dependency>
-
     <!--  excalibur -->
     <dependency>
       <groupId>org.apache.excalibur.components.pool</groupId>
@@ -192,7 +186,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-
     <!-- commons -->
     <dependency>
       <groupId>commons-io</groupId>
@@ -240,7 +233,7 @@
         <exclusion>
           <artifactId>ant-optional</artifactId>
           <groupId>ant</groupId>
-        </exclusion>        
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -330,33 +323,32 @@
       <artifactId>jakarta-bcel</artifactId>
       <version>20040329</version>
     </dependency>
-    <!-- We have to include all relevant spring modules as the poms for 2.0rc2 are not available --> 
+    <!-- We have to include all relevant spring modules as the poms for 2.0rc2 are not available -->
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
       <version>2.0-rc2</version>
-    </dependency>           
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
       <version>2.0-rc2</version>
-    </dependency>           
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
       <version>2.0-rc2</version>
-    </dependency>           
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
       <version>2.0-rc2</version>
-    </dependency>           
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
       <version>2.0-rc2</version>
     </dependency>
-
     <!-- OSGi -->
     <dependency>
       <groupId>org.osgi</groupId>
@@ -369,8 +361,7 @@
       <artifactId>osgi_R4_compendium</artifactId>
       <version>1.0</version>
       <scope>provided</scope>
-    </dependency>        
-
+    </dependency>
     <!--  test dependencies  -->
     <dependency>
       <groupId>xmlunit</groupId>

Modified: cocoon/trunk/core/cocoon-webapp/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/pom.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,37 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2005 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.
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
 -->
 <!--+
-  | @version $Id$
-  |
-  +-->
+    | @version $Id$
+    |
+    +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
   <modelVersion>4.0.0</modelVersion>
-
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-core-modules</artifactId>
     <version>2-SNAPSHOT</version>
   </parent>
-
   <artifactId>cocoon-webapp</artifactId>
   <packaging>war</packaging>
   <name>Core Webapp</name>
-
   <build>
     <plugins>
       <plugin>
@@ -60,7 +59,6 @@
     </plugins>
     <finalName>cocoon-webapp</finalName>
   </build>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
@@ -93,7 +91,6 @@
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
-
   <pluginRepositories>
     <pluginRepository>
       <id>snapshots</id>
@@ -105,5 +102,4 @@
       <url>http://www.mortbay.org/maven2/release</url>
     </pluginRepository>
   </pluginRepositories>
-
 </project>

Modified: cocoon/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/core/pom.xml (original)
+++ cocoon/trunk/core/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,39 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2006 The Apache Software Foundation
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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
 
-  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
 
-      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.
+  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.
 -->
 <!--+
     | @version $Id$
+    |
     +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  
-  <modelVersion>4.0.0</modelVersion>  
-  
-  <packaging>pom</packaging>  
-  
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>pom</packaging>
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon</artifactId>
     <version>2-SNAPSHOT</version>
   </parent>
-
   <artifactId>cocoon-core-modules</artifactId>
-  <version>2-SNAPSHOT</version> 
-   
+  <version>2-SNAPSHOT</version>
   <name>Cocoon Core [modules]</name>
-
   <modules>
     <module>cocoon-blocks-fw</module>
     <module>cocoon-bootstrap</module>

Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,39 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2005 The Apache Software Foundation
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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
 
-  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
 
-      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.
+  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 is the main Maven file that contains all global settings, management and information.
     | @version $Id$
+    |
     +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  
   <modelVersion>4.0.0</modelVersion>
-
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
     <version>3</version>
   </parent>
-  
-  <packaging>pom</packaging>  
-  
+  <packaging>pom</packaging>
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon</artifactId>
   <version>2-SNAPSHOT</version>
-  
   <name>Apache Cocoon</name>
   <url>http://cocoon.apache.org</url>
   <licenses>
@@ -143,7 +141,7 @@
       <organizationUrl>http://www.apache.org</organizationUrl>
       <timezone>+1</timezone>
       <roles>
-         <role>Committer</role>
+        <role>Committer</role>
       </roles>
     </developer>
     <developer>
@@ -189,7 +187,7 @@
         <role>Committer</role>
       </roles>
       <timezone>+1</timezone>
-    </developer>    
+    </developer>
     <developer>
       <id>jbq</id>
       <name>Jean-Baptiste Quenot</name>
@@ -320,21 +318,21 @@
   <build>
     <pluginManagement>
       <plugins>
-        <plugin> 
+        <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
           <version>2.2</version>
-        </plugin> 
+        </plugin>
       </plugins>
     </pluginManagement>
     <extensions>
       <extension>
         <groupId>org.apache.maven.wagon</groupId>
-         <artifactId>wagon-ssh-external</artifactId>
-         <version>1.0-alpha-6</version>
+        <artifactId>wagon-ssh-external</artifactId>
+        <version>1.0-alpha-6</version>
       </extension>
     </extensions>
-   <!--
+    <!--
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -349,11 +347,11 @@
     <plugins>
       <plugin>
         <artifactId>maven-release-plugin</artifactId>
-		<version>2.0-beta-4</version>
+        <version>2.0-beta-4</version>
         <configuration>
           <tagBase>https://svn.apache.org/repos/asf/cocoon/tags</tagBase>
         </configuration>
-      </plugin>    
+      </plugin>
     </plugins>
   </build>
   <reporting>

Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/pom.xml (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,3 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+-->
+<!--+
+    | @version $Id$
+    |
+    +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>cocoon-archetypes</artifactId>

Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,32 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2006 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.
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
 -->
+<!--+
+    | @version $Id$
+    |
+    +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
-
   <name>${artifactId}</name>
-
   <groupId>${groupId}</groupId>
   <artifactId>${artifactId}</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-
   <build>
-  	<!-- with multimodule project setting finalName like this results in having 2 jars in cocoon/lib:
+    <!-- with multimodule project setting finalName like this results in having 2 jars in cocoon/lib:
   	     my-module.jar and my-module-1.0-SNAPSHOT.jar -->
     <!-- finalName>${artifactId}</finalName -->
     <plugins>
@@ -53,7 +56,6 @@
       </plugin>
     </plugins>
   </build>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
@@ -78,5 +80,4 @@
       <url>http://svn.apache.org/maven-snapshot-repository</url>
     </repository>
   </repositories>
-
 </project>

Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/pom.xml (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,20 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2006 The Apache Software Foundation
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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
 
-  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
 
-      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.
+  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 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<!--+
+    | @version $Id$
+    |
+    +-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>cocoon-archetypes</artifactId>
     <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/pom.xml (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,30 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2006 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.
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
 -->
+<!--+
+    | @version $Id$
+    |
+    +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
-
   <name>${artifactId}</name>
-
   <groupId>${groupId}</groupId>
   <artifactId>${artifactId}</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-
   <build>
     <plugins>
       <plugin>
@@ -53,7 +56,6 @@
     </plugins>
     <finalName>cocoon-webapp</finalName>
   </build>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
@@ -66,5 +68,4 @@
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
-
 </project>

Modified: cocoon/trunk/tools/archetypes/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/pom.xml (original)
+++ cocoon/trunk/tools/archetypes/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,28 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+-->
+<!--+
+    | @version $Id$
+    |
+    +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-tools-modules</artifactId>
     <version>2-SNAPSHOT</version>
   </parent>
-
   <modelVersion>4.0.0</modelVersion>
-
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-archetypes</artifactId>
   <version>2-SNAPSHOT</version>
-
   <name>Cocoon Archetypes [modules]</name>
-
   <packaging>pom</packaging>
-
   <modules>
     <module>cocoon-22-archetype-block</module>
     <module>cocoon-22-archetype-webapp</module>
   </modules>
-
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/cocoon/trunk/tools/archetypes</connection>
   </scm>
-
 </project>

Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,35 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2006 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.
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
 -->
+<!--+
+    | @version $Id$
+    |
+    +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  
-  <modelVersion>4.0.0</modelVersion>  
-  <packaging>jar</packaging>  
-  
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>jar</packaging>
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-deployer-modules</artifactId>    
+    <artifactId>cocoon-deployer-modules</artifactId>
     <version>2-SNAPSHOT</version>
   </parent>
-  
   <artifactId>cocoon-deployer-core</artifactId>
   <version>1.0.0-M2-SNAPSHOT</version>
-    
   <name>Cocoon Deployer - Core</name>
-    
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -41,36 +43,36 @@
       <groupId>castor</groupId>
       <artifactId>castor</artifactId>
       <version>1.0</version>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>xerces</groupId>
       <artifactId>xercesImpl</artifactId>
       <version>2.8.0</version>
-    </dependency>  
+    </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.4</version>      
-    </dependency>  
+      <version>1.0.4</version>
+    </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.1</version>      
-    </dependency>      
+      <version>2.1</version>
+    </dependency>
     <dependency>
       <groupId>xml-apis</groupId>
       <artifactId>xml-apis</artifactId>
       <version>1.3.02</version>
-    </dependency>  
+    </dependency>
     <dependency>
       <groupId>oro</groupId>
       <artifactId>oro</artifactId>
-      <version>2.0.8</version>      
-    </dependency>  
+      <version>2.0.8</version>
+    </dependency>
     <dependency>
       <groupId>commons-transaction</groupId>
       <artifactId>commons-transaction</artifactId>
-      <version>1.1</version>      
+      <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>geronimo-spec</groupId>
@@ -81,8 +83,8 @@
       <groupId>easymock</groupId>
       <artifactId>easymock</artifactId>
       <version>1.1</version>
-      <scope>test</scope>      
-    </dependency>    
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-minimal-webapp/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-minimal-webapp/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-minimal-webapp/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-minimal-webapp/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2006 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.
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
 -->
+<!--+
+    | @version $Id$
+    |
+    +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
   <modelVersion>4.0.0</modelVersion>
-
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-deployer-modules</artifactId>
     <version>2-SNAPSHOT</version>
   </parent>
-
   <artifactId>cocoon-deployer-minimal-webapp</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-
   <packaging>war</packaging>
-
   <name>Minimal Cocoon web application</name>
-
   <url>http://cocoon.apache.org</url>
-
 </project>

Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin-demo/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin-demo/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin-demo/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin-demo/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,37 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2006 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.
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
 -->
+<!--+
+    | @version $Id$
+    |
+    +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
   <modelVersion>4.0.0</modelVersion>
-
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-deployer-modules</artifactId>
     <version>2-SNAPSHOT</version>
   </parent>
-
   <artifactId>cocoon-deployer-plugin-demo</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-
   <packaging>jar</packaging>
-
   <name>Demo of the Cocoon block deployer</name>
   <url>http://cocoon.apache.org</url>
-
   <build>
     <plugins>
       <plugin>
@@ -39,7 +40,6 @@
         <artifactId>cocoon-deployer-plugin</artifactId>
         <version>1.0.0-M2-SNAPSHOT</version>
       </plugin>
-
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty6-plugin</artifactId>
@@ -63,7 +63,6 @@
       </plugin>
     </plugins>
   </build>
-
   <dependencies>
     <!-- this is just a runtime dependency for the Jetty6 plugin - I (rpoetz) don't understand
          why the plugin requires it as it is added to WEB-INF/lib by the deployer ... -->
@@ -73,7 +72,6 @@
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
-
   <pluginRepositories>
     <pluginRepository>
       <id>mortbay-repo</id>
@@ -81,5 +79,4 @@
       <url>http://www.mortbay.org/maven2/release</url>
     </pluginRepository>
   </pluginRepositories>
-
 </project>

Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2006 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.
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
 -->
+<!--+
+    | @version $Id$
+    |
+    +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  
-  <modelVersion>4.0.0</modelVersion>  
-  
+  <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-deployer-modules</artifactId>
     <version>2-SNAPSHOT</version>
   </parent>
-
   <artifactId>cocoon-deployer-plugin</artifactId>
   <version>1.0.0-M2-SNAPSHOT</version>
-    
   <packaging>maven-plugin</packaging>
-  
   <name>Cocoon Deployer - Maven 2 Plugin</name>
-  
   <dependencies>
-    
     <!-- utility libs -->
     <dependency>
       <groupId>antlr</groupId>
       <artifactId>stringtemplate</artifactId>
-      <version>2.2</version>      
+      <version>2.2</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
@@ -47,41 +47,39 @@
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.1</version>      
-    </dependency>       
-    
+      <version>2.1</version>
+    </dependency>
     <!-- Maven specific -->
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
       <version>2.0.1</version>
-    </dependency>  
+    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
       <version>2.0.1</version>
-    </dependency>   
+    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
-      <version>2.0.1</version>      
+      <version>2.0.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
-      <version>2.0.1</version>      
-    </dependency>   
+      <version>2.0.1</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
-      <version>2.0.1</version>      
-    </dependency> 
+      <version>2.0.1</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-war-plugin</artifactId>
       <version>2.0-beta-2</version>
     </dependency>
-    
     <!-- test libs -->
     <dependency>
       <groupId>junit</groupId>
@@ -90,7 +88,6 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  
   <build>
     <plugins>
       <plugin>
@@ -98,7 +95,7 @@
         <configuration>
           <goalPrefix>cocoon</goalPrefix>
         </configuration>
-      </plugin>    
+      </plugin>
     </plugins>
   </build>
 </project>

Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-webapp-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-webapp-sample/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-webapp-sample/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-webapp-sample/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,36 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2006 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.
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
 -->
+<!--+
+    | @version $Id$
+    |
+    +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
   <modelVersion>4.0.0</modelVersion>
-
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-deployer-modules</artifactId>
     <version>2-SNAPSHOT</version>
   </parent>
-
   <artifactId>cocoon-deployer-webapp-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
-
   <name>Demo Cocoon web application</name>
   <url>http://cocoon.apache.org</url>
-
   <build>
     <finalName>demo</finalName>
     <plugins>
@@ -62,7 +64,6 @@
       </plugin>
     </plugins>
   </build>
-
   <dependencies>
     <!-- this is just a runtime dependency for the Jetty6 plugin - I (rpoetz) don't understand
          why the plugin requires it as it is added to WEB-INF/lib by the deployer ... -->
@@ -72,5 +73,4 @@
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
-
 </project>

Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-tutorial-simple-block/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-tutorial-simple-block/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-tutorial-simple-block/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-tutorial-simple-block/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,33 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2006 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.
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
 -->
+<!--+
+    | @version $Id$
+    |
+    +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-deployer-modules</artifactId>
     <version>2-SNAPSHOT</version>
-    </parent>
+  </parent>
   <packaging>jar</packaging>
-
   <name>Cocoon Deployer: Blocks tutorial sample</name>
-
   <artifactId>cocoon-tutorial-simple-block</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-
   <build>
     <plugins>
       <plugin>
@@ -58,7 +62,6 @@
       </plugin>
     </plugins>
   </build>
-
   <dependencies>
     <!-- this is just a runtime dependency for the Jetty6 plugin - I (rpoetz) don't understand
          why the plugin requires it as it is added to WEB-INF/lib by the deployer ... -->
@@ -68,5 +71,4 @@
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
-
 </project>

Modified: cocoon/trunk/tools/cocoon-block-deployer/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/pom.xml?rev=432742&r1=432741&r2=432742&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/pom.xml Fri Aug 18 15:01:04 2006
@@ -1,19 +1,37 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+-->
+<!--+
+    | @version $Id$
+    |
+    +-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-tools-modules</artifactId>
     <version>2-SNAPSHOT</version>
   </parent>
-
   <modelVersion>4.0.0</modelVersion>
-
   <artifactId>cocoon-deployer-modules</artifactId>
   <version>2-SNAPSHOT</version>
-
   <packaging>pom</packaging>
   <name>Cocoon Deployer [modules]</name>
-
   <modules>
     <module>cocoon-deployer-minimal-webapp</module>
     <module>cocoon-deployer-plugin</module>



Mime
View raw message