You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/09/22 11:11:13 UTC

svn commit: r1174005 [1/2] - in /karaf/branches/karaf-2.2.x: admin/ admin/command/ admin/core/ admin/management/ archetypes/ archetypes/command/ archetypes/itests/ assemblies/ assemblies/apache-karaf/ assemblies/features/ assemblies/features/enterprise...

Author: jbonofre
Date: Thu Sep 22 09:11:10 2011
New Revision: 1174005

URL: http://svn.apache.org/viewvc?rev=1174005&view=rev
Log:
Cleanup the POM and add relativePom to avoid Maven 3 warning.
Add NOTICE file where is missing.

Added:
    karaf/branches/karaf-2.2.x/archetypes/command/NOTICE
    karaf/branches/karaf-2.2.x/demos/dump/NOTICE
    karaf/branches/karaf-2.2.x/deployer/kar/NOTICE
    karaf/branches/karaf-2.2.x/deployer/wrap/NOTICE
    karaf/branches/karaf-2.2.x/diagnostic/command/NOTICE
    karaf/branches/karaf-2.2.x/diagnostic/common/NOTICE
    karaf/branches/karaf-2.2.x/diagnostic/core/NOTICE
    karaf/branches/karaf-2.2.x/diagnostic/management/NOTICE
    karaf/branches/karaf-2.2.x/exception/NOTICE
    karaf/branches/karaf-2.2.x/features/obr/NOTICE
    karaf/branches/karaf-2.2.x/jaas/command/NOTICE
    karaf/branches/karaf-2.2.x/jaas/jasypt/NOTICE
    karaf/branches/karaf-2.2.x/shell/dev/NOTICE
    karaf/branches/karaf-2.2.x/shell/web/NOTICE
    karaf/branches/karaf-2.2.x/tooling/cmdhelp-maven-plugin/NOTICE
    karaf/branches/karaf-2.2.x/util/NOTICE
    karaf/branches/karaf-2.2.x/webconsole/console/NOTICE
Modified:
    karaf/branches/karaf-2.2.x/admin/command/pom.xml
    karaf/branches/karaf-2.2.x/admin/core/pom.xml
    karaf/branches/karaf-2.2.x/admin/management/pom.xml
    karaf/branches/karaf-2.2.x/admin/pom.xml
    karaf/branches/karaf-2.2.x/archetypes/command/pom.xml
    karaf/branches/karaf-2.2.x/archetypes/itests/pom.xml
    karaf/branches/karaf-2.2.x/archetypes/pom.xml
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml
    karaf/branches/karaf-2.2.x/assemblies/features/enterprise/pom.xml
    karaf/branches/karaf-2.2.x/assemblies/features/pom.xml
    karaf/branches/karaf-2.2.x/assemblies/features/standard/pom.xml
    karaf/branches/karaf-2.2.x/assemblies/pom.xml
    karaf/branches/karaf-2.2.x/client/pom.xml
    karaf/branches/karaf-2.2.x/demos/branding/pom.xml
    karaf/branches/karaf-2.2.x/demos/branding/shell/pom.xml
    karaf/branches/karaf-2.2.x/demos/dump/pom.xml
    karaf/branches/karaf-2.2.x/demos/pom.xml
    karaf/branches/karaf-2.2.x/demos/web/pom.xml
    karaf/branches/karaf-2.2.x/deployer/blueprint/pom.xml
    karaf/branches/karaf-2.2.x/deployer/features/pom.xml
    karaf/branches/karaf-2.2.x/deployer/kar/pom.xml
    karaf/branches/karaf-2.2.x/deployer/pom.xml
    karaf/branches/karaf-2.2.x/deployer/spring/pom.xml
    karaf/branches/karaf-2.2.x/deployer/wrap/pom.xml
    karaf/branches/karaf-2.2.x/diagnostic/command/pom.xml
    karaf/branches/karaf-2.2.x/diagnostic/common/pom.xml
    karaf/branches/karaf-2.2.x/diagnostic/core/pom.xml
    karaf/branches/karaf-2.2.x/diagnostic/management/pom.xml
    karaf/branches/karaf-2.2.x/diagnostic/pom.xml
    karaf/branches/karaf-2.2.x/exception/pom.xml
    karaf/branches/karaf-2.2.x/features/command/pom.xml
    karaf/branches/karaf-2.2.x/features/core/pom.xml
    karaf/branches/karaf-2.2.x/features/management/pom.xml
    karaf/branches/karaf-2.2.x/features/obr/pom.xml
    karaf/branches/karaf-2.2.x/features/pom.xml
    karaf/branches/karaf-2.2.x/itests/dependencies/pom.xml
    karaf/branches/karaf-2.2.x/itests/kittests/pom.xml
    karaf/branches/karaf-2.2.x/itests/pom.xml
    karaf/branches/karaf-2.2.x/itests/tests/pom.xml
    karaf/branches/karaf-2.2.x/jaas/boot/pom.xml
    karaf/branches/karaf-2.2.x/jaas/command/pom.xml
    karaf/branches/karaf-2.2.x/jaas/config/pom.xml
    karaf/branches/karaf-2.2.x/jaas/jasypt/pom.xml
    karaf/branches/karaf-2.2.x/jaas/modules/pom.xml
    karaf/branches/karaf-2.2.x/jaas/pom.xml
    karaf/branches/karaf-2.2.x/main/pom.xml
    karaf/branches/karaf-2.2.x/management/pom.xml
    karaf/branches/karaf-2.2.x/manual/pom.xml
    karaf/branches/karaf-2.2.x/shell/commands/pom.xml
    karaf/branches/karaf-2.2.x/shell/config/pom.xml
    karaf/branches/karaf-2.2.x/shell/console/pom.xml
    karaf/branches/karaf-2.2.x/shell/dev/pom.xml
    karaf/branches/karaf-2.2.x/shell/log/pom.xml
    karaf/branches/karaf-2.2.x/shell/obr/pom.xml
    karaf/branches/karaf-2.2.x/shell/osgi/pom.xml
    karaf/branches/karaf-2.2.x/shell/packages/pom.xml
    karaf/branches/karaf-2.2.x/shell/pom.xml
    karaf/branches/karaf-2.2.x/shell/ssh/pom.xml
    karaf/branches/karaf-2.2.x/shell/web/pom.xml
    karaf/branches/karaf-2.2.x/shell/wrapper/pom.xml
    karaf/branches/karaf-2.2.x/tooling/cmdhelp-maven-plugin/pom.xml
    karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/pom.xml
    karaf/branches/karaf-2.2.x/tooling/pom.xml
    karaf/branches/karaf-2.2.x/tooling/testing/pom.xml
    karaf/branches/karaf-2.2.x/util/pom.xml
    karaf/branches/karaf-2.2.x/webconsole/admin/pom.xml
    karaf/branches/karaf-2.2.x/webconsole/branding/pom.xml
    karaf/branches/karaf-2.2.x/webconsole/console/pom.xml
    karaf/branches/karaf-2.2.x/webconsole/features/pom.xml
    karaf/branches/karaf-2.2.x/webconsole/gogo/pom.xml
    karaf/branches/karaf-2.2.x/webconsole/pom.xml

Modified: karaf/branches/karaf-2.2.x/admin/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/admin/command/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/admin/command/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/admin/command/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.admin</groupId>
         <artifactId>admin</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.admin.command</artifactId>
@@ -114,4 +115,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: karaf/branches/karaf-2.2.x/admin/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/admin/core/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/admin/core/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/admin/core/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.admin</groupId>
         <artifactId>admin</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.admin.core</artifactId>
@@ -195,4 +196,5 @@
            </plugin>
         </plugins>
     </build>
+
 </project>

Modified: karaf/branches/karaf-2.2.x/admin/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/admin/management/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/admin/management/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/admin/management/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.admin</groupId>
         <artifactId>admin</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.admin.management</artifactId>
@@ -105,4 +106,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: karaf/branches/karaf-2.2.x/admin/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/admin/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/admin/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/admin/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.karaf.admin</groupId>

Added: karaf/branches/karaf-2.2.x/archetypes/command/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/archetypes/command/NOTICE?rev=1174005&view=auto
==============================================================================
--- karaf/branches/karaf-2.2.x/archetypes/command/NOTICE (added)
+++ karaf/branches/karaf-2.2.x/archetypes/command/NOTICE Thu Sep 22 09:11:10 2011
@@ -0,0 +1,48 @@
+Apache Karaf
+Copyright 2010 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+Tanuki Software (http://www.tanukisoftware.com/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0

Modified: karaf/branches/karaf-2.2.x/archetypes/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/archetypes/command/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/archetypes/command/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/archetypes/command/pom.xml Thu Sep 22 09:11:10 2011
@@ -1,27 +1,31 @@
 <?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.
--->
 <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/xsd/maven-4.0.0.xsd">
+
+    <!--
+
+        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.
+    -->
+
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.karaf</groupId>
         <artifactId>archetypes</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.karaf.archetypes</groupId>

Modified: karaf/branches/karaf-2.2.x/archetypes/itests/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/archetypes/itests/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/archetypes/itests/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/archetypes/itests/pom.xml Thu Sep 22 09:11:10 2011
@@ -24,6 +24,7 @@
         <artifactId>archetypes</artifactId>
         <groupId>org.apache.karaf</groupId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <groupId>org.apache.karaf.archetypes</groupId>

Modified: karaf/branches/karaf-2.2.x/archetypes/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/archetypes/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/archetypes/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/archetypes/pom.xml Thu Sep 22 09:11:10 2011
@@ -24,6 +24,7 @@
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>archetypes</artifactId>

Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml Thu Sep 22 09:11:10 2011
@@ -22,9 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-	<groupId>org.apache.karaf.assemblies</groupId>
-	<artifactId>assemblies</artifactId>
+	    <groupId>org.apache.karaf.assemblies</groupId>
+	    <artifactId>assemblies</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.karaf</groupId>
@@ -696,4 +697,5 @@
             </build>
         </profile>
     </profiles>
+
 </project>

Modified: karaf/branches/karaf-2.2.x/assemblies/features/enterprise/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/features/enterprise/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/features/enterprise/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/features/enterprise/pom.xml Thu Sep 22 09:11:10 2011
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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/xsd/maven-4.0.0.xsd">
+
     <!--
 
         Licensed to the Apache Software Foundation (ASF) under one or more
@@ -24,6 +25,7 @@
         <groupId>org.apache.karaf.assemblies.features</groupId>
         <artifactId>features</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>enterprise</artifactId>

Modified: karaf/branches/karaf-2.2.x/assemblies/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/features/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/features/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/features/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.assemblies</groupId>
         <artifactId>assemblies</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.karaf.assemblies.features</groupId>

Modified: karaf/branches/karaf-2.2.x/assemblies/features/standard/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/features/standard/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/features/standard/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/features/standard/pom.xml Thu Sep 22 09:11:10 2011
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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/xsd/maven-4.0.0.xsd">
+
     <!--
 
         Licensed to the Apache Software Foundation (ASF) under one or more
@@ -24,6 +25,7 @@
         <groupId>org.apache.karaf.assemblies.features</groupId>
         <artifactId>features</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>standard</artifactId>

Modified: karaf/branches/karaf-2.2.x/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.karaf.assemblies</groupId>

Modified: karaf/branches/karaf-2.2.x/client/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/client/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/client/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/client/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.client</artifactId>
@@ -125,6 +126,5 @@
             </plugin>
         </plugins>
     </build>
-    
 
 </project>

Modified: karaf/branches/karaf-2.2.x/demos/branding/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/demos/branding/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/demos/branding/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/demos/branding/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.demos</groupId>
         <artifactId>demos</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.demos.branding</artifactId>

Modified: karaf/branches/karaf-2.2.x/demos/branding/shell/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/demos/branding/shell/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/demos/branding/shell/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/demos/branding/shell/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.demos</groupId>
         <artifactId>org.apache.karaf.demos.branding</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.demos.branding.shell</artifactId>

Added: karaf/branches/karaf-2.2.x/demos/dump/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/demos/dump/NOTICE?rev=1174005&view=auto
==============================================================================
--- karaf/branches/karaf-2.2.x/demos/dump/NOTICE (added)
+++ karaf/branches/karaf-2.2.x/demos/dump/NOTICE Thu Sep 22 09:11:10 2011
@@ -0,0 +1,48 @@
+Apache Karaf
+Copyright 2010 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+Tanuki Software (http://www.tanukisoftware.com/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0

Modified: karaf/branches/karaf-2.2.x/demos/dump/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/demos/dump/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/demos/dump/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/demos/dump/pom.xml Thu Sep 22 09:11:10 2011
@@ -19,26 +19,27 @@
         limitations under the License.
     -->
 
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.apache.karaf.demos</groupId>
-    <artifactId>demos</artifactId>
-    <version>2.2.4-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>dump</artifactId>
-  <packaging>bundle</packaging>
-  <name>Apache Karaf :: Demos :: Demo Dump provider</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.karaf.diagnostic</groupId>
-      <artifactId>org.apache.karaf.diagnostic.core</artifactId>
-    </dependency>
-  </dependencies>
+    <parent>
+        <groupId>org.apache.karaf.demos</groupId>
+        <artifactId>demos</artifactId>
+        <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>dump</artifactId>
+    <packaging>bundle</packaging>
+    <name>Apache Karaf :: Demos :: Demo Dump provider</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.karaf.diagnostic</groupId>
+            <artifactId>org.apache.karaf.diagnostic.core</artifactId>
+        </dependency>
+    </dependencies>
 
-  <build>
+    <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
@@ -47,10 +48,10 @@
                     <instructions>
                         <Import-Package>*</Import-Package>
                         <Private-Package>!*</Private-Package>
-                    </instructions> 
+                    </instructions>
                 </configuration>
             </plugin>
         </plugins>
-  </build>
+    </build>
 
 </project>

Modified: karaf/branches/karaf-2.2.x/demos/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/demos/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/demos/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/demos/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.karaf.demos</groupId>

Modified: karaf/branches/karaf-2.2.x/demos/web/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/demos/web/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/demos/web/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/demos/web/pom.xml Thu Sep 22 09:11:10 2011
@@ -19,138 +19,140 @@
         limitations under the License.
     -->
 
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.apache.karaf.demos</groupId>
-    <artifactId>demos</artifactId>
-    <version>2.2.4-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>web</artifactId>
-  <packaging>war</packaging>
-  <name>Apache Karaf :: Demos :: Web</name>
-  
-  <properties>
-    <jetty.port>8080</jetty.port>
-    <maven-jetty-plugin.version>6.1.26</maven-jetty-plugin.version>
-    <geronimo.servlet.version>1.1.2</geronimo.servlet.version>
-
-    <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.karaf</groupId>
-      <artifactId>org.apache.karaf.main</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.karaf.jaas</groupId>
-      <artifactId>org.apache.karaf.jaas.boot</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.karaf</groupId>
-      <artifactId>apache-karaf</artifactId>
-      <type>zip</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_2.5_spec</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <warSourceDirectory>src/main/webapp/</warSourceDirectory>
-          <webResources>
-            <resource>
-              <directory>target/karaf</directory>
-            </resource>
-          </webResources>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty-plugin</artifactId>
-        <version>${maven-jetty-plugin.version}</version>
-        <configuration>
-          <connectors>
-            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-              <port>${jetty.port}</port>
-              <maxIdleTime>60000</maxIdleTime>
-            </connector>
-          </connectors>
-          <systemProperties>
-            <!-- enable easy connection to JConsole -->
-            <systemProperty>
-              <name>com.sun.management.jmxremote</name>
-              <value />
-            </systemProperty>
-          </systemProperties>
-          <scanIntervalSeconds>10</scanIntervalSeconds>
-          <webAppSourceDirectory>${project.build.directory}/${project.build.finalName}</webAppSourceDirectory>
-        </configuration>
-      </plugin>
-      <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <executions>
-              <execution>
-                  <id>unpack-unix</id>
-                  <phase>generate-resources</phase>
-                  <goals>
-                      <goal>unpack</goal>
-                  </goals>
-                  <configuration>
-                      <artifactItems>
-                          <artifactItem>
-                              <groupId>org.apache.karaf</groupId>
-                              <artifactId>apache-karaf</artifactId>
-                              <type>zip</type>
-                              <overWrite>true</overWrite>
-                              <outputDirectory>${project.build.directory}/karaf/WEB-INF</outputDirectory>
-                              <excludes>**/lib/*,**/*.txt,**/bin/*,**/demos/**,**/lib,**/bin,**/demos</excludes>
-                          </artifactItem>
-                      </artifactItems>
-                  </configuration>
-              </execution>
-        </executions>
-      </plugin>
-      <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <executions>
-              <execution>
-                  <id>copy-karaf</id>
-                  <phase>process-resources</phase>
-                  <goals>
-                      <goal>run</goal>
-                  </goals>
-                  <configuration>
-                      <tasks>
-                          <move todir="${project.build.directory}/karaf/WEB-INF/karaf">
-                              <fileset dir="${project.build.directory}/karaf/WEB-INF/apache-karaf-${project.version}" />
-                          </move>
-                      </tasks>
-                  </configuration>
-              </execution>
-          </executions>
-      </plugin>
-    </plugins>
-  </build>
+    <parent>
+        <groupId>org.apache.karaf.demos</groupId>
+        <artifactId>demos</artifactId>
+        <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>web</artifactId>
+    <packaging>war</packaging>
+    <name>Apache Karaf :: Demos :: Web</name>
+
+    <properties>
+        <jetty.port>8080</jetty.port>
+        <maven-jetty-plugin.version>6.1.26</maven-jetty-plugin.version>
+        <geronimo.servlet.version>1.1.2</geronimo.servlet.version>
+
+        <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.karaf</groupId>
+            <artifactId>org.apache.karaf.main</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.jaas</groupId>
+            <artifactId>org.apache.karaf.jaas.boot</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf</groupId>
+            <artifactId>apache-karaf</artifactId>
+            <type>zip</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <warSourceDirectory>src/main/webapp/</warSourceDirectory>
+                    <webResources>
+                        <resource>
+                            <directory>target/karaf</directory>
+                        </resource>
+                    </webResources>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <version>${maven-jetty-plugin.version}</version>
+                <configuration>
+                    <connectors>
+                        <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                            <port>${jetty.port}</port>
+                            <maxIdleTime>60000</maxIdleTime>
+                        </connector>
+                    </connectors>
+                    <systemProperties>
+                        <!-- enable easy connection to JConsole -->
+                        <systemProperty>
+                            <name>com.sun.management.jmxremote</name>
+                            <value/>
+                        </systemProperty>
+                    </systemProperties>
+                    <scanIntervalSeconds>10</scanIntervalSeconds>
+                    <webAppSourceDirectory>${project.build.directory}/${project.build.finalName}</webAppSourceDirectory>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-unix</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.karaf</groupId>
+                                    <artifactId>apache-karaf</artifactId>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/karaf/WEB-INF</outputDirectory>
+                                    <excludes>**/lib/*,**/*.txt,**/bin/*,**/demos/**,**/lib,**/bin,**/demos</excludes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-karaf</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <move todir="${project.build.directory}/karaf/WEB-INF/karaf">
+                                    <fileset
+                                            dir="${project.build.directory}/karaf/WEB-INF/apache-karaf-${project.version}"/>
+                                </move>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

Modified: karaf/branches/karaf-2.2.x/deployer/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/deployer/blueprint/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/deployer/blueprint/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/deployer/blueprint/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,12 +25,12 @@
         <groupId>org.apache.karaf.deployer</groupId>
         <artifactId>deployer</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.deployer.blueprint</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Karaf :: Deployer :: Blueprint</name>
-
     <description>This deployer transforms a plain blueprint xml file to a deployable bundle</description>
 
     <properties>

Modified: karaf/branches/karaf-2.2.x/deployer/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/deployer/features/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/deployer/features/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/deployer/features/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,12 +25,12 @@
         <groupId>org.apache.karaf.deployer</groupId>
         <artifactId>deployer</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.deployer.features</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Karaf :: Deployer :: Features</name>
-
     <description>This deployer can deploy features descriptor on the fly</description>
 
     <properties>

Added: karaf/branches/karaf-2.2.x/deployer/kar/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/deployer/kar/NOTICE?rev=1174005&view=auto
==============================================================================
--- karaf/branches/karaf-2.2.x/deployer/kar/NOTICE (added)
+++ karaf/branches/karaf-2.2.x/deployer/kar/NOTICE Thu Sep 22 09:11:10 2011
@@ -0,0 +1,48 @@
+Apache Karaf
+Copyright 2010 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+Tanuki Software (http://www.tanukisoftware.com/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0

Modified: karaf/branches/karaf-2.2.x/deployer/kar/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/deployer/kar/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/deployer/kar/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/deployer/kar/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,12 +25,12 @@
         <groupId>org.apache.karaf.deployer</groupId>
         <artifactId>deployer</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.deployer.kar</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Karaf :: Deployer :: Karaf Archive (.kar)</name>
-
     <description>This deployer can deploy .kar archives on the fly</description>
 
     <properties>

Modified: karaf/branches/karaf-2.2.x/deployer/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/deployer/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/deployer/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/deployer/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.karaf.deployer</groupId>

Modified: karaf/branches/karaf-2.2.x/deployer/spring/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/deployer/spring/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/deployer/spring/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/deployer/spring/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,12 +25,12 @@
         <groupId>org.apache.karaf.deployer</groupId>
         <artifactId>deployer</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.deployer.spring</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Karaf :: Deployer :: Spring</name>
-
     <description>This deployer transforms a plain spring xml file to a deployable bundle</description>
 
     <properties>

Added: karaf/branches/karaf-2.2.x/deployer/wrap/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/deployer/wrap/NOTICE?rev=1174005&view=auto
==============================================================================
--- karaf/branches/karaf-2.2.x/deployer/wrap/NOTICE (added)
+++ karaf/branches/karaf-2.2.x/deployer/wrap/NOTICE Thu Sep 22 09:11:10 2011
@@ -0,0 +1,48 @@
+Apache Karaf
+Copyright 2010 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+Tanuki Software (http://www.tanukisoftware.com/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0

Modified: karaf/branches/karaf-2.2.x/deployer/wrap/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/deployer/wrap/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/deployer/wrap/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/deployer/wrap/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,12 +25,12 @@
         <groupId>org.apache.karaf.deployer</groupId>
         <artifactId>deployer</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.deployer.wrap</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Karaf :: Deployer :: Wrap Non OSGi Jar</name>
-
     <description>This deployer transforms non OSGi jar files to a deployable bundle.</description>
 
     <properties>

Added: karaf/branches/karaf-2.2.x/diagnostic/command/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/diagnostic/command/NOTICE?rev=1174005&view=auto
==============================================================================
--- karaf/branches/karaf-2.2.x/diagnostic/command/NOTICE (added)
+++ karaf/branches/karaf-2.2.x/diagnostic/command/NOTICE Thu Sep 22 09:11:10 2011
@@ -0,0 +1,48 @@
+Apache Karaf
+Copyright 2010 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+Tanuki Software (http://www.tanukisoftware.com/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0

Modified: karaf/branches/karaf-2.2.x/diagnostic/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/diagnostic/command/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/diagnostic/command/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/diagnostic/command/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.diagnostic</groupId>
         <artifactId>diagnostic</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.diagnostic.command</artifactId>
@@ -90,4 +91,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Added: karaf/branches/karaf-2.2.x/diagnostic/common/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/diagnostic/common/NOTICE?rev=1174005&view=auto
==============================================================================
--- karaf/branches/karaf-2.2.x/diagnostic/common/NOTICE (added)
+++ karaf/branches/karaf-2.2.x/diagnostic/common/NOTICE Thu Sep 22 09:11:10 2011
@@ -0,0 +1,48 @@
+Apache Karaf
+Copyright 2010 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+Tanuki Software (http://www.tanukisoftware.com/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0

Modified: karaf/branches/karaf-2.2.x/diagnostic/common/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/diagnostic/common/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/diagnostic/common/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/diagnostic/common/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.diagnostic</groupId>
         <artifactId>diagnostic</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.diagnostic.common</artifactId>
@@ -92,4 +93,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Added: karaf/branches/karaf-2.2.x/diagnostic/core/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/diagnostic/core/NOTICE?rev=1174005&view=auto
==============================================================================
--- karaf/branches/karaf-2.2.x/diagnostic/core/NOTICE (added)
+++ karaf/branches/karaf-2.2.x/diagnostic/core/NOTICE Thu Sep 22 09:11:10 2011
@@ -0,0 +1,48 @@
+Apache Karaf
+Copyright 2010 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+Tanuki Software (http://www.tanukisoftware.com/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0

Modified: karaf/branches/karaf-2.2.x/diagnostic/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/diagnostic/core/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/diagnostic/core/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/diagnostic/core/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.diagnostic</groupId>
         <artifactId>diagnostic</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.diagnostic.core</artifactId>
@@ -74,4 +75,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Added: karaf/branches/karaf-2.2.x/diagnostic/management/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/diagnostic/management/NOTICE?rev=1174005&view=auto
==============================================================================
--- karaf/branches/karaf-2.2.x/diagnostic/management/NOTICE (added)
+++ karaf/branches/karaf-2.2.x/diagnostic/management/NOTICE Thu Sep 22 09:11:10 2011
@@ -0,0 +1,48 @@
+Apache Karaf
+Copyright 2010 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+Tanuki Software (http://www.tanukisoftware.com/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0

Modified: karaf/branches/karaf-2.2.x/diagnostic/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/diagnostic/management/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/diagnostic/management/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/diagnostic/management/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.diagnostic</groupId>
         <artifactId>diagnostic</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.diagnostic.management</artifactId>
@@ -96,4 +97,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: karaf/branches/karaf-2.2.x/diagnostic/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/diagnostic/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/diagnostic/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/diagnostic/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.karaf.diagnostic</groupId>

Added: karaf/branches/karaf-2.2.x/exception/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/exception/NOTICE?rev=1174005&view=auto
==============================================================================
--- karaf/branches/karaf-2.2.x/exception/NOTICE (added)
+++ karaf/branches/karaf-2.2.x/exception/NOTICE Thu Sep 22 09:11:10 2011
@@ -0,0 +1,48 @@
+Apache Karaf
+Copyright 2010 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+Tanuki Software (http://www.tanukisoftware.com/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0

Modified: karaf/branches/karaf-2.2.x/exception/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/exception/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/exception/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/exception/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.exception</artifactId>

Modified: karaf/branches/karaf-2.2.x/features/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/features/command/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/features/command/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/features/command/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.features</groupId>
         <artifactId>features</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.features.command</artifactId>
@@ -128,4 +129,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: karaf/branches/karaf-2.2.x/features/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/features/core/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/features/core/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/features/core/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.features</groupId>
         <artifactId>features</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.features.core</artifactId>
@@ -134,4 +135,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: karaf/branches/karaf-2.2.x/features/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/features/management/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/features/management/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/features/management/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.features</groupId>
         <artifactId>features</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.features.management</artifactId>
@@ -133,4 +134,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Added: karaf/branches/karaf-2.2.x/features/obr/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/features/obr/NOTICE?rev=1174005&view=auto
==============================================================================
--- karaf/branches/karaf-2.2.x/features/obr/NOTICE (added)
+++ karaf/branches/karaf-2.2.x/features/obr/NOTICE Thu Sep 22 09:11:10 2011
@@ -0,0 +1,48 @@
+Apache Karaf
+Copyright 2010 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+Tanuki Software (http://www.tanukisoftware.com/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0

Modified: karaf/branches/karaf-2.2.x/features/obr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/features/obr/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/features/obr/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/features/obr/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.features</groupId>
         <artifactId>features</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.features.obr</artifactId>
@@ -93,4 +94,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: karaf/branches/karaf-2.2.x/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/features/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/features/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/features/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.karaf.features</groupId>

Modified: karaf/branches/karaf-2.2.x/itests/dependencies/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/itests/dependencies/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/itests/dependencies/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/itests/dependencies/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,37 +25,19 @@
         <groupId>org.apache.karaf.itests</groupId>
         <artifactId>itests</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>dependencies</artifactId>
     <packaging>pom</packaging>
     <name>Apache Karaf :: Integration Tests :: Dependencies</name>
 
-    <repositories>
-        <repository>
-            <id>pax-runner</id>
-            <url>http://osgi.sonatype.org/content/groups/pax-runner</url>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.main</artifactId>
 			<version>3.0.2</version>
         </dependency>
-        <!--
-        <dependency>
-			<groupId>org.eclipse</groupId>
-			<artifactId>osgi</artifactId>
-			<version>3.5.1.R35x_v20090827</version>
-        </dependency>
-        <dependency>
-			<groupId>org.junit</groupId>
-			<artifactId>com.springsource.junit</artifactId>
-			<version>4.4.0</version>
-        </dependency>
--->
         <dependency>
 			<groupId>org.ops4j.pax.exam</groupId>
 			<artifactId>pax-exam-container-default</artifactId>

Modified: karaf/branches/karaf-2.2.x/itests/kittests/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/itests/kittests/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/itests/kittests/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/itests/kittests/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,16 +25,13 @@
         <groupId>org.apache.karaf.itests</groupId>
         <artifactId>itests</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>kittests</artifactId>
     <packaging>jar</packaging>
     <name>Apache Karaf :: Integration Tests :: Kit Tests</name>
 
-    <description>
-        Kits Integration tests
-    </description>
-
     <properties>
         <appendedResourcesDirectory>${basedir}/../etc/appended-resources</appendedResourcesDirectory>
     </properties>

Modified: karaf/branches/karaf-2.2.x/itests/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/itests/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/itests/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/itests/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.karaf.itests</groupId>

Modified: karaf/branches/karaf-2.2.x/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/itests/tests/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/itests/tests/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/itests/tests/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,16 +25,13 @@
         <groupId>org.apache.karaf.itests</groupId>
         <artifactId>itests</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>tests</artifactId>
     <packaging>jar</packaging>
     <name>Apache Karaf :: Integration Tests :: ITests</name>
 
-    <description>
-        Integration tests
-    </description>
-
     <properties>
         <appendedResourcesDirectory>${basedir}/../etc/appended-resources</appendedResourcesDirectory>
     </properties>

Modified: karaf/branches/karaf-2.2.x/jaas/boot/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/boot/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/boot/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/jaas/boot/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.jaas</groupId>
         <artifactId>jaas</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.jaas.boot</artifactId>
@@ -73,4 +74,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Added: karaf/branches/karaf-2.2.x/jaas/command/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/command/NOTICE?rev=1174005&view=auto
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/command/NOTICE (added)
+++ karaf/branches/karaf-2.2.x/jaas/command/NOTICE Thu Sep 22 09:11:10 2011
@@ -0,0 +1,48 @@
+Apache Karaf
+Copyright 2010 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+Tanuki Software (http://www.tanukisoftware.com/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0

Modified: karaf/branches/karaf-2.2.x/jaas/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/command/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/command/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/jaas/command/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <artifactId>jaas</artifactId>
         <groupId>org.apache.karaf.jaas</groupId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.jaas.command</artifactId>
@@ -135,4 +136,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: karaf/branches/karaf-2.2.x/jaas/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/config/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/config/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/jaas/config/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.jaas</groupId>
         <artifactId>jaas</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.jaas.config</artifactId>
@@ -94,4 +95,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Added: karaf/branches/karaf-2.2.x/jaas/jasypt/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/jasypt/NOTICE?rev=1174005&view=auto
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/jasypt/NOTICE (added)
+++ karaf/branches/karaf-2.2.x/jaas/jasypt/NOTICE Thu Sep 22 09:11:10 2011
@@ -0,0 +1,48 @@
+Apache Karaf
+Copyright 2010 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+Tanuki Software (http://www.tanukisoftware.com/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0

Modified: karaf/branches/karaf-2.2.x/jaas/jasypt/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/jasypt/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/jasypt/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/jaas/jasypt/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.jaas</groupId>
         <artifactId>jaas</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>org.apache.karaf.jaas.jasypt</artifactId>

Modified: karaf/branches/karaf-2.2.x/jaas/modules/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/modules/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/modules/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/jaas/modules/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.jaas</groupId>
         <artifactId>jaas</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.jaas.modules</artifactId>

Modified: karaf/branches/karaf-2.2.x/jaas/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/jaas/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.karaf.jaas</groupId>

Modified: karaf/branches/karaf-2.2.x/main/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/main/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/main/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/main/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,13 +25,13 @@
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.main</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Karaf :: Main</name>
-    <description>This bundle is the main Karaf launcher. It's responsible of the Karaf startup including
-    the console, branding, etc bootstrap.</description>
+    <description>This bundle is the main Karaf launcher. It's responsible of the Karaf startup including the console, branding, etc bootstrap.</description>
 
     <properties>
         <appendedResourcesDirectory>${basedir}/../etc/appended-resources</appendedResourcesDirectory>

Modified: karaf/branches/karaf-2.2.x/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/management/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/management/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,13 +25,13 @@
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.management</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Karaf :: Management</name>
-    <description>This bundle starts the Karaf embedded MBean server and RMI registry allowing users
-    to use JMX to manage Karaf.</description>
+    <description>This bundle starts the Karaf embedded MBean server and RMI registry allowing users to use JMX to manage Karaf.</description>
 
     <properties>
         <appendedResourcesDirectory>${basedir}/../etc/appended-resources</appendedResourcesDirectory>
@@ -99,5 +99,4 @@
        </plugins>
     </build>
 
-
 </project>

Modified: karaf/branches/karaf-2.2.x/manual/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/manual/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/manual/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/manual/pom.xml Thu Sep 22 09:11:10 2011
@@ -1,34 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (C) 2009-2010 the original author or authors.
-    See the notice.md file distributed with this work for additional
-    information regarding copyright ownership.
-
-    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
+<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">
 
-    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.
+    -->
 
-<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.karaf</groupId>
         <artifactId>karaf</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-
     <artifactId>manual</artifactId>
     <name>Apache Karaf :: Manual</name>
     <packaging>war</packaging>

Modified: karaf/branches/karaf-2.2.x/shell/commands/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/commands/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/commands/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/shell/commands/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.shell</groupId>
         <artifactId>shell</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.shell.commands</artifactId>
@@ -103,4 +104,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: karaf/branches/karaf-2.2.x/shell/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/config/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/config/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/shell/config/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.shell</groupId>
         <artifactId>shell</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.shell.config</artifactId>
@@ -102,4 +103,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: karaf/branches/karaf-2.2.x/shell/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/console/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/console/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/shell/console/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.shell</groupId>
         <artifactId>shell</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.shell.console</artifactId>
@@ -154,4 +155,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Added: karaf/branches/karaf-2.2.x/shell/dev/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/dev/NOTICE?rev=1174005&view=auto
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/dev/NOTICE (added)
+++ karaf/branches/karaf-2.2.x/shell/dev/NOTICE Thu Sep 22 09:11:10 2011
@@ -0,0 +1,48 @@
+Apache Karaf
+Copyright 2010 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+Tanuki Software (http://www.tanukisoftware.com/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0

Modified: karaf/branches/karaf-2.2.x/shell/dev/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/dev/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/dev/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/shell/dev/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <artifactId>shell</artifactId>
         <groupId>org.apache.karaf.shell</groupId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.shell.dev</artifactId>

Modified: karaf/branches/karaf-2.2.x/shell/log/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/log/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/log/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/shell/log/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.shell</groupId>
         <artifactId>shell</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.shell.log</artifactId>
@@ -100,4 +101,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: karaf/branches/karaf-2.2.x/shell/obr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/obr/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/obr/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/shell/obr/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.shell</groupId>
         <artifactId>shell</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.shell.obr</artifactId>
@@ -100,4 +101,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: karaf/branches/karaf-2.2.x/shell/osgi/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/osgi/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/osgi/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/shell/osgi/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.shell</groupId>
         <artifactId>shell</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.shell.osgi</artifactId>
@@ -117,4 +118,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: karaf/branches/karaf-2.2.x/shell/packages/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/packages/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/packages/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/shell/packages/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.shell</groupId>
         <artifactId>shell</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.shell.packages</artifactId>
@@ -90,4 +91,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: karaf/branches/karaf-2.2.x/shell/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/shell/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.karaf.shell</groupId>

Modified: karaf/branches/karaf-2.2.x/shell/ssh/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/ssh/pom.xml?rev=1174005&r1=1174004&r2=1174005&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/ssh/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/shell/ssh/pom.xml Thu Sep 22 09:11:10 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.karaf.shell</groupId>
         <artifactId>shell</artifactId>
         <version>2.2.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.karaf.shell.ssh</artifactId>
@@ -103,4 +104,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>