diff --git a/.svnignore b/.svnignore
deleted file mode 100644
index e4bd397..0000000
--- a/.svnignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-bin_test
-generated
-store
-bundle-cache
-felix-cache
diff --git a/build.gradle b/build.gradle
index f90d1f4..f0fc8e7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,6 @@
 /*
+ * Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+ *
  * Master Gradle build script
  *
  * Depends on bndPlugin property set by settings.gradle.
diff --git a/build/bnd.bnd b/build/bnd.bnd
index b7481de..2476c4c 100644
--- a/build/bnd.bnd
+++ b/build/bnd.bnd
@@ -1,3 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 -nobundles: true
 -dependson: \
     org.apache.ace.agent,\
diff --git a/build/build.gradle b/build/build.gradle
index 295acc3..3f04aef 100644
--- a/build/build.gradle
+++ b/build/build.gradle
@@ -40,29 +40,36 @@
 // Configure RAT plugin to ignore some files
 rat {
   excludes = [
-    'rat-report.xml',
-    '**/.git/**',
-    '**/.gradle/**',
+    '.git/**',
+    '.gradle/**',
+    '.metadata/**',
+    'org.apache.ace.client.repository/test/*.txt',
+    'org.apache.ace.client.repository/test/*.xml',
+    'org.apache.ace.webui.vaadin/resources/VAADIN/themes/reindeer/styles.css',
     '**/.project',
+    '**/.classpath',
     '**/.settings/**',
+    '**/.recommenders/**',
     '**/*.iml',
     '**/*.iws',
     '**/*.ipr',
-    '**/.classpath',
-    'cnf/**',
-    'gradle/wrapper/**',
-    'release/**',
-    'gradlew',
-    'README',
+    '**/build.xml',
     '**/DEPENDENCIES',
     '**/README',
     '**/.gitignore',
     '**/generated/**',
-    'doc/**',
     '**/packageinfo',
-    '**/*.txt',
-    'docs/**',
-    '.metadata/**'
+    '**/bundle-cache/**',
+    '**/test-output/**',
+    '**/store/**',
+    '**/bin_test/**',
+    '**/bin/**',
+    'cnf/**',
+    'gradle/wrapper/**',
+    'gradle.properties',
+    'gradlew',
+    'gradlew.bat',
+    'rat-report.xml',
   ]
 }
 
diff --git a/cnf/bnd.bnd b/cnf/bnd.bnd
index 04f8e91..76d544b 100644
--- a/cnf/bnd.bnd
+++ b/cnf/bnd.bnd
@@ -1,4 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 -nobundles: true
 -buildpath: \
 	biz.aQute.bnd;version=2.4.1,\
-	org.osgi.impl.bundle.bindex
\ No newline at end of file
+	org.osgi.impl.bundle.bindex
diff --git a/cnf/build.bnd b/cnf/build.bnd
index 861c089..2034098 100644
--- a/cnf/build.bnd
+++ b/cnf/build.bnd
@@ -1,3 +1,4 @@
+## Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 ## Place your specific settings here.
 
 
diff --git a/etc/Eclipse Cleanup.xml b/etc/Eclipse Cleanup.xml
index 5efeb58..b4c6906 100644
--- a/etc/Eclipse Cleanup.xml
+++ b/etc/Eclipse Cleanup.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0). -->
 <profiles version="2">
 <profile kind="CleanUpProfile" name="Apache ACE" version="2">
 <setting id="cleanup.remove_unused_private_fields" value="true"/>
diff --git a/etc/Eclipse Formatter.xml b/etc/Eclipse Formatter.xml
index e150995..600495e 100644
--- a/etc/Eclipse Formatter.xml
+++ b/etc/Eclipse Formatter.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0). -->
 <profiles version="12">
 <profile kind="CodeFormatterProfile" name="Apache ACE" version="12">
 <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
diff --git a/org.apache.ace.agent.controller.itest/bnd.bnd b/org.apache.ace.agent.controller.itest/bnd.bnd
index 0582de5..d1c99ff 100644
--- a/org.apache.ace.agent.controller.itest/bnd.bnd
+++ b/org.apache.ace.agent.controller.itest/bnd.bnd
@@ -1,3 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 Test-Cases: org.apache.ace.agent.itest.CustomAgentControllerTest,\
 	org.apache.ace.agent.itest.CustomStandaloneAgentControllerTest
 -runbundles: \
diff --git a/org.apache.ace.agent.itest/bnd.bnd b/org.apache.ace.agent.itest/bnd.bnd
index 2e846de..1fb9d5e 100644
--- a/org.apache.ace.agent.itest/bnd.bnd
+++ b/org.apache.ace.agent.itest/bnd.bnd
@@ -1,3 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 -runbundles: \
 	org.apache.ace.agent;version=latest,\
 	org.apache.ace.test;version=latest,\
diff --git a/org.apache.ace.agent.launcher/base.bnd b/org.apache.ace.agent.launcher/base.bnd
index 6bce307..362a0b4 100644
--- a/org.apache.ace.agent.launcher/base.bnd
+++ b/org.apache.ace.agent.launcher/base.bnd
@@ -1,3 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
 # The Jar Main-Class header
 Main-Class: org.apache.ace.agent.launcher.Launcher
diff --git a/org.apache.ace.agent.launcher/bnd.bnd b/org.apache.ace.agent.launcher/bnd.bnd
index 192a1d2..b2c25d8 100644
--- a/org.apache.ace.agent.launcher/bnd.bnd
+++ b/org.apache.ace.agent.launcher/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.core;version=6.0.0,\
diff --git a/org.apache.ace.agent.launcher/felix.bnd b/org.apache.ace.agent.launcher/felix.bnd
index cf1f79e..3d3e188 100644
--- a/org.apache.ace.agent.launcher/felix.bnd
+++ b/org.apache.ace.agent.launcher/felix.bnd
@@ -1,3 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
 # The Jar Main-Class header
 Main-Class: org.apache.ace.agent.launcher.Launcher
diff --git a/org.apache.ace.agent.launcher/launch.bndrun b/org.apache.ace.agent.launcher/launch.bndrun
index fff49f7..a9f0475 100644
--- a/org.apache.ace.agent.launcher/launch.bndrun
+++ b/org.apache.ace.agent.launcher/launch.bndrun
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runee: JavaSE-1.6
 
diff --git a/org.apache.ace.agent.launcher/launcher-example.properties b/org.apache.ace.agent.launcher/launcher-example.properties
index 64df849..c57275b 100644
--- a/org.apache.ace.agent.launcher/launcher-example.properties
+++ b/org.apache.ace.agent.launcher/launcher-example.properties
@@ -1,3 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
 #
 # Agent properties:
diff --git a/org.apache.ace.agent.launcher/resources/org.apache.ace.agent.launcher.BundleProvider b/org.apache.ace.agent.launcher/resources/org.apache.ace.agent.launcher.BundleProvider
index cda5a0b..66f1d28 100644
--- a/org.apache.ace.agent.launcher/resources/org.apache.ace.agent.launcher.BundleProvider
+++ b/org.apache.ace.agent.launcher/resources/org.apache.ace.agent.launcher.BundleProvider
@@ -1,2 +1,4 @@
 org.apache.ace.agent.launcher.AgentBundleProvider
 org.apache.ace.agent.launcher.BundleDirBundleProvider
+
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
\ No newline at end of file
diff --git a/org.apache.ace.agent.launcher/src/org/apache/ace/agent/launcher/launcher-defaults.properties b/org.apache.ace.agent.launcher/src/org/apache/ace/agent/launcher/launcher-defaults.properties
index 6b3c1f4..9f315bf 100644
--- a/org.apache.ace.agent.launcher/src/org/apache/ace/agent/launcher/launcher-defaults.properties
+++ b/org.apache.ace.agent.launcher/src/org/apache/ace/agent/launcher/launcher-defaults.properties
@@ -1,2 +1,3 @@
-#TODO
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+#
 #framework.felix.log.level=4
\ No newline at end of file
diff --git a/org.apache.ace.agent.launcher/test/org/apache/ace/agent/launcher/test.properties b/org.apache.ace.agent.launcher/test/org/apache/ace/agent/launcher/test.properties
index dc5c9e9..b03cd0d 100644
--- a/org.apache.ace.agent.launcher/test/org/apache/ace/agent/launcher/test.properties
+++ b/org.apache.ace.agent.launcher/test/org/apache/ace/agent/launcher/test.properties
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 agent.discovery.serverurls=http://localhost:1234/
 agent.identification.agentid=myAgentID
 prop1 = value1
diff --git a/org.apache.ace.agent.update.itest/bnd.bnd b/org.apache.ace.agent.update.itest/bnd.bnd
index 860ebe2..6449b9d 100644
--- a/org.apache.ace.agent.update.itest/bnd.bnd
+++ b/org.apache.ace.agent.update.itest/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+#
 # NOTE: This test is stored in a seperate from the main agent itest project because 
 # it updates the agent bundle. This causes problems if other tests try to wire to
 # the the api package after the fact.
diff --git a/org.apache.ace.agent/bnd.bnd b/org.apache.ace.agent/bnd.bnd
index ed68695..555a738 100644
--- a/org.apache.ace.agent/bnd.bnd
+++ b/org.apache.ace.agent/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Bundle-Name: Apache ACE Agent
 Bundle-Description: Implementation of the Apache ACE Agent
 Bundle-Version: 1.0.2
diff --git a/org.apache.ace.ant.tasks/bnd.bnd b/org.apache.ace.ant.tasks/bnd.bnd
index c89f62c..487abf7 100644
--- a/org.apache.ace.ant.tasks/bnd.bnd
+++ b/org.apache.ace.ant.tasks/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	ant;version=latest,\
 	org.apache.ace.builder;version=latest
diff --git a/org.apache.ace.authentication.itest/bnd.bnd b/org.apache.ace.authentication.itest/bnd.bnd
index d367ba4..6a0b06f 100644
--- a/org.apache.ace.authentication.itest/bnd.bnd
+++ b/org.apache.ace.authentication.itest/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.authentication.AuthenticationTestBase}
 -buildpath: \
 	junit.osgi,\
diff --git a/org.apache.ace.authentication/api.bnd b/org.apache.ace.authentication/api.bnd
index a9e0f55..c40e38b 100644
--- a/org.apache.ace.authentication/api.bnd
+++ b/org.apache.ace.authentication/api.bnd
@@ -1,4 +1,6 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Export-Package: org.apache.ace.authentication.api
 Bundle-Version: 1.0.0
 Bundle-Name: Apache ACE Authentication API
-Bundle-Description: Provides a pluggable authentication API for Apache ACE
\ No newline at end of file
+Bundle-Description: Provides a pluggable authentication API for Apache ACE
diff --git a/org.apache.ace.authentication/bnd.bnd b/org.apache.ace.authentication/bnd.bnd
index 4a4d541..8ce2b46 100644
--- a/org.apache.ace.authentication/bnd.bnd
+++ b/org.apache.ace.authentication/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.core;version=6.0.0,\
@@ -9,4 +11,4 @@
 	bcpkix,\
 	org.apache.commons.codec,\
 	org.apache.ace.test;version=latest
--sub: *.bnd
\ No newline at end of file
+-sub: *.bnd
diff --git a/org.apache.ace.authentication/impl.bnd b/org.apache.ace.authentication/impl.bnd
index ac9b965..ac6d278 100644
--- a/org.apache.ace.authentication/impl.bnd
+++ b/org.apache.ace.authentication/impl.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.authentication.impl
 Bundle-Activator: org.apache.ace.authentication.impl.Activator
 Bundle-Version: 1.0.0
diff --git a/org.apache.ace.authentication/processor.basicauth.bnd b/org.apache.ace.authentication/processor.basicauth.bnd
index 0149ae2..3c0f204 100644
--- a/org.apache.ace.authentication/processor.basicauth.bnd
+++ b/org.apache.ace.authentication/processor.basicauth.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.authentication.processor.basicauth,\
 	org.apache.commons.codec,\
 	org.apache.commons.codec.binary
diff --git a/org.apache.ace.authentication/processor.clientcert.bnd b/org.apache.ace.authentication/processor.clientcert.bnd
index ce2c75e..ecbb28a 100644
--- a/org.apache.ace.authentication/processor.clientcert.bnd
+++ b/org.apache.ace.authentication/processor.clientcert.bnd
@@ -1,5 +1,7 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.authentication.processor.clientcert
 Bundle-Activator: org.apache.ace.authentication.processor.clientcert.Activator
 Bundle-Version: 1.0.0
 Bundle-Name: Apache ACE Authentication Clientcert processor
-Bundle-Description: Clientcert support for Apache ACE Authentication
\ No newline at end of file
+Bundle-Description: Clientcert support for Apache ACE Authentication
diff --git a/org.apache.ace.authentication/processor.password.bnd b/org.apache.ace.authentication/processor.password.bnd
index 7bf5288..deeb206 100644
--- a/org.apache.ace.authentication/processor.password.bnd
+++ b/org.apache.ace.authentication/processor.password.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.authentication.processor.password,\
 	org.apache.commons.codec,\
 	org.apache.commons.codec.binary,\
@@ -5,4 +7,4 @@
 Bundle-Activator: org.apache.ace.authentication.processor.password.Activator
 Bundle-Version: 1.0.0
 Bundle-Name: Apache ACE Authentication Password processor
-Bundle-Description: Password support for Apache ACE Authentication
\ No newline at end of file
+Bundle-Description: Password support for Apache ACE Authentication
diff --git a/org.apache.ace.bnd/bnd.bnd b/org.apache.ace.bnd/bnd.bnd
index 9470594..b75489f 100644
--- a/org.apache.ace.bnd/bnd.bnd
+++ b/org.apache.ace.bnd/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -sub: *.bnd
 -buildpath: \
 	biz.aQute.bnd,\
diff --git a/org.apache.ace.bnd/repository.bnd b/org.apache.ace.bnd/repository.bnd
index e3e0a0e..28ef141 100644
--- a/org.apache.ace.bnd/repository.bnd
+++ b/org.apache.ace.bnd/repository.bnd
@@ -1,4 +1,6 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Bundle-Version: 1.0.0
 Bundle-Name: Apache ACE OBR Repository
 Bundle-Description: Provides an ACE Bnd Repository implementation
-Export-Package: org.apache.ace.bnd.repository
\ No newline at end of file
+Export-Package: org.apache.ace.bnd.repository
diff --git a/org.apache.ace.builder/bnd.bnd b/org.apache.ace.builder/bnd.bnd
index df03072..46b1a0e 100644
--- a/org.apache.ace.builder/bnd.bnd
+++ b/org.apache.ace.builder/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	org.apache.ace.test;version=latest
diff --git a/org.apache.ace.client.automation/bnd.bnd b/org.apache.ace.client.automation/bnd.bnd
index 714115c..f7c9fa8 100644
--- a/org.apache.ace.client.automation/bnd.bnd
+++ b/org.apache.ace.client.automation/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.core;version=6.0.0,\
@@ -9,4 +11,4 @@
 Bundle-Activator: org.apache.ace.client.automation.Activator
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE Client Automation
-Bundle-Description: Provides automation tasks for the Apache ACE client
\ No newline at end of file
+Bundle-Description: Provides automation tasks for the Apache ACE client
diff --git a/org.apache.ace.client.repository.itest/bnd.bnd b/org.apache.ace.client.repository.itest/bnd.bnd
index e1e7794..fe8f38c 100644
--- a/org.apache.ace.client.repository.itest/bnd.bnd
+++ b/org.apache.ace.client.repository.itest/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
 -buildpath: \
 	junit.osgi,\
diff --git a/org.apache.ace.client.repository/api.bnd b/org.apache.ace.client.repository/api.bnd
index d351d67..11b2f09 100644
--- a/org.apache.ace.client.repository/api.bnd
+++ b/org.apache.ace.client.repository/api.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Export-Package: org.apache.ace.client.repository,\
 	org.apache.ace.client.repository.helper,\
 	org.apache.ace.client.repository.helper.bundle,\
@@ -6,4 +8,4 @@
 	org.apache.ace.client.repository.stateful
 Bundle-Version: 2.0.0
 Bundle-Name: Apache ACE Client Repository API
-Bundle-Description: Provides the Apache ACE Cleint Repository API
\ No newline at end of file
+Bundle-Description: Provides the Apache ACE Cleint Repository API
diff --git a/org.apache.ace.client.repository/bnd.bnd b/org.apache.ace.client.repository/bnd.bnd
index c1fd564..4a5d50f 100644
--- a/org.apache.ace.client.repository/bnd.bnd
+++ b/org.apache.ace.client.repository/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.core;version=6.0.0,\
diff --git a/org.apache.ace.client.repository/helper.base.bnd b/org.apache.ace.client.repository/helper.base.bnd
index 485b9f0..6450efd 100644
--- a/org.apache.ace.client.repository/helper.base.bnd
+++ b/org.apache.ace.client.repository/helper.base.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: \
 	javax.xml.namespace,\
 	org.xmlpull.mxp1,\
@@ -39,4 +41,4 @@
 	*
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE Client Repository Helper Base
-Bundle-Description: Provides the base implementation for Apache ACE repository helpers
\ No newline at end of file
+Bundle-Description: Provides the base implementation for Apache ACE repository helpers
diff --git a/org.apache.ace.client.repository/helper.bundle.bnd b/org.apache.ace.client.repository/helper.bundle.bnd
index ebaf391..b9f04e9 100644
--- a/org.apache.ace.client.repository/helper.bundle.bnd
+++ b/org.apache.ace.client.repository/helper.bundle.bnd
@@ -1,5 +1,7 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.client.repository.helper.bundle.impl
 Bundle-Activator: org.apache.ace.client.repository.helper.bundle.impl.Activator
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE Client Repository Bundle Helper
-Bundle-Description: Registers the Apache ACE Client helper services for bundles
\ No newline at end of file
+Bundle-Description: Registers the Apache ACE Client helper services for bundles
diff --git a/org.apache.ace.client.repository/helper.configuration.bnd b/org.apache.ace.client.repository/helper.configuration.bnd
index c84180c..ae3650e 100644
--- a/org.apache.ace.client.repository/helper.configuration.bnd
+++ b/org.apache.ace.client.repository/helper.configuration.bnd
@@ -1,7 +1,9 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.client.repository.helper.configuration.impl
 Bundle-Activator: org.apache.ace.client.repository.helper.configuration.impl.Activator
 Export-Package: org.apache.ace.client.repository.helper.configuration
 Deployment-ProvidesResourceProcessor: org.osgi.deployment.rp.autoconf
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE Client Repository Configuration Helper
-Bundle-Description: Registers the Apache ACE Client Helper services for metatype configuration
\ No newline at end of file
+Bundle-Description: Registers the Apache ACE Client Helper services for metatype configuration
diff --git a/org.apache.ace.client.repository/helper.user.bnd b/org.apache.ace.client.repository/helper.user.bnd
index 43b838c..d973a36 100644
--- a/org.apache.ace.client.repository/helper.user.bnd
+++ b/org.apache.ace.client.repository/helper.user.bnd
@@ -1,6 +1,8 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.client.repository.helper.user.impl
 Bundle-Activator: org.apache.ace.client.repository.helper.user.impl.Activator
 Export-Package: org.apache.ace.client.repository.helper.user
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE Client Repository User Helper
-Bundle-Description: Registers the Apache ACE Client Helper services for user configuration
\ No newline at end of file
+Bundle-Description: Registers the Apache ACE Client Helper services for user configuration
diff --git a/org.apache.ace.client.repository/impl.bnd b/org.apache.ace.client.repository/impl.bnd
index a70caea..0d12dd9 100644
--- a/org.apache.ace.client.repository/impl.bnd
+++ b/org.apache.ace.client.repository/impl.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.client.repository.impl,\
 	javax.xml.namespace,\
 	org.xmlpull.mxp1,\
@@ -60,4 +62,4 @@
 Bundle-Activator: org.apache.ace.client.repository.impl.Activator
 Bundle-Version: 1.0.1
 Bundle-Name: Apache Ace Client Repository factory
-Bundle-Description: Registers the Apache ACE Client Repository SessionFactory
\ No newline at end of file
+Bundle-Description: Registers the Apache ACE Client Repository SessionFactory
diff --git a/org.apache.ace.client.rest.itest/bnd.bnd b/org.apache.ace.client.rest.itest/bnd.bnd
index 733197c..a238063 100644
--- a/org.apache.ace.client.rest.itest/bnd.bnd
+++ b/org.apache.ace.client.rest.itest/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
@@ -93,4 +95,4 @@
 
 Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
 
--baseline:
\ No newline at end of file
+-baseline:
diff --git a/org.apache.ace.client.rest/bnd.bnd b/org.apache.ace.client.rest/bnd.bnd
index b9c207c..52420bc 100644
--- a/org.apache.ace.client.rest/bnd.bnd
+++ b/org.apache.ace.client.rest/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.core;version=6.0.0,\
diff --git a/org.apache.ace.client.rest/test.sh b/org.apache.ace.client.rest/test.sh
index 3a5c696..5386ffa 100644
--- a/org.apache.ace.client.rest/test.sh
+++ b/org.apache.ace.client.rest/test.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 #
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+#
 # Test script that sends out REST commands
 #
 
diff --git a/org.apache.ace.client.workspace/bnd.bnd b/org.apache.ace.client.workspace/bnd.bnd
index 8c5fdff..fbb1936 100644
--- a/org.apache.ace.client.workspace/bnd.bnd
+++ b/org.apache.ace.client.workspace/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.core;version=6.0.0,\
@@ -11,4 +13,4 @@
 Bundle-Version: 1.0.0
 Bundle-Activator: org.apache.ace.client.workspace.impl.Activator
 Export-Package: org.apache.ace.client.workspace
-Private-Package: org.apache.ace.client.workspace.impl
\ No newline at end of file
+Private-Package: org.apache.ace.client.workspace.impl
diff --git a/org.apache.ace.configurator.useradmin.itest/bnd.bnd b/org.apache.ace.configurator.useradmin.itest/bnd.bnd
index b0275ca..11b5cd7 100644
--- a/org.apache.ace.configurator.useradmin.itest/bnd.bnd
+++ b/org.apache.ace.configurator.useradmin.itest/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
 -buildpath: \
 	junit.osgi,\
diff --git a/org.apache.ace.configurator/bnd.bnd b/org.apache.ace.configurator/bnd.bnd
index e5a3871..4ce2619 100644
--- a/org.apache.ace.configurator/bnd.bnd
+++ b/org.apache.ace.configurator/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.core;version=6.0.0,\
@@ -10,4 +12,4 @@
 	org.apache.ace.test;version=latest,\
 	org.apache.commons.io;version=2.0.1
 
--sub: *.bnd
\ No newline at end of file
+-sub: *.bnd
diff --git a/org.apache.ace.configurator/impl.bnd b/org.apache.ace.configurator/impl.bnd
index d152573..4b52128 100644
--- a/org.apache.ace.configurator/impl.bnd
+++ b/org.apache.ace.configurator/impl.bnd
@@ -1,5 +1,7 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Bundle-Activator: org.apache.ace.configurator.Activator
 Private-Package: org.apache.ace.configurator
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE Configurator
-Bundle-Description: Provides configuration component that feeds properties files to ConfigAdmin.
\ No newline at end of file
+Bundle-Description: Provides configuration component that feeds properties files to ConfigAdmin.
diff --git a/org.apache.ace.configurator/useradmin.task.bnd b/org.apache.ace.configurator/useradmin.task.bnd
index ac0e9f8..9cc8425 100644
--- a/org.apache.ace.configurator/useradmin.task.bnd
+++ b/org.apache.ace.configurator/useradmin.task.bnd
@@ -1,7 +1,9 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.configurator.useradmin.task,\
 	org.apache.ace.repository.ext,\
 	org.apache.ace.repository.ext.impl
 Bundle-Activator: org.apache.ace.configurator.useradmin.task.Activator
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE Configurator Useradmintask
-Bundle-Description: Registeres a runnable task that synchronizes user xml to useradmin
\ No newline at end of file
+Bundle-Description: Registeres a runnable task that synchronizes user xml to useradmin
diff --git a/org.apache.ace.connectionfactory/bnd.bnd b/org.apache.ace.connectionfactory/bnd.bnd
index 9fad46b..8e89556 100644
--- a/org.apache.ace.connectionfactory/bnd.bnd
+++ b/org.apache.ace.connectionfactory/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.core;version=6.0.0,\
@@ -11,4 +13,4 @@
 Export-Package: org.apache.ace.connectionfactory
 Bundle-Version: 1.0.0
 Bundle-Name: Apache ACE ConnectionFactory
-Bundle-Description: Registers a configurable ConnectionFactory service
\ No newline at end of file
+Bundle-Description: Registers a configurable ConnectionFactory service
diff --git a/org.apache.ace.consolelogger/bnd.bnd b/org.apache.ace.consolelogger/bnd.bnd
index bbf7978..151051f 100644
--- a/org.apache.ace.consolelogger/bnd.bnd
+++ b/org.apache.ace.consolelogger/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.core;version=6.0.0,\
@@ -7,4 +9,4 @@
 Bundle-Activator: org.apache.ace.consolelogger.Activator
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE ConsoleLogger
-Bundle-Description: Registers a component that writes log message to the console
\ No newline at end of file
+Bundle-Description: Registers a component that writes log message to the console
diff --git a/org.apache.ace.deployment.itest/bnd.bnd b/org.apache.ace.deployment.itest/bnd.bnd
index aa91fb2..868b372 100644
--- a/org.apache.ace.deployment.itest/bnd.bnd
+++ b/org.apache.ace.deployment.itest/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
 -buildpath: \
 	junit.osgi,\
@@ -66,4 +68,4 @@
 Bundle-Description: Integration test bundle for Apache ACE Deployment
 Bundle-Category: itest
 
--baseline:
\ No newline at end of file
+-baseline:
diff --git a/org.apache.ace.deployment/api.bnd b/org.apache.ace.deployment/api.bnd
index 5c839ac..aea7575 100644
--- a/org.apache.ace.deployment/api.bnd
+++ b/org.apache.ace.deployment/api.bnd
@@ -1,4 +1,6 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Export-Package: org.apache.ace.deployment
 Bundle-Version: 1.0.0
 Bundle-Name: Apache ACE Deployment API
-Bundle-Description: Provides the Apache ACE deployment API
\ No newline at end of file
+Bundle-Description: Provides the Apache ACE deployment API
diff --git a/org.apache.ace.deployment/bnd.bnd b/org.apache.ace.deployment/bnd.bnd
index 18ead71..3d3cc23 100644
--- a/org.apache.ace.deployment/bnd.bnd
+++ b/org.apache.ace.deployment/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.core;version=6.0.0,\
diff --git a/org.apache.ace.deployment/deploymentadmin.bnd b/org.apache.ace.deployment/deploymentadmin.bnd
index 289604e..a3ef0e6 100644
--- a/org.apache.ace.deployment/deploymentadmin.bnd
+++ b/org.apache.ace.deployment/deploymentadmin.bnd
@@ -1,5 +1,7 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.deployment.deploymentadmin
 Bundle-Activator: org.apache.ace.deployment.deploymentadmin.Activator
 Bundle-Version: 1.0.0
 Bundle-Name: Apache ACE Deployment DeploymentAdmin
-Bundle-Description: Registers the DeplouymentAdmin service
\ No newline at end of file
+Bundle-Description: Registers the DeplouymentAdmin service
diff --git a/org.apache.ace.deployment/provider.api.bnd b/org.apache.ace.deployment/provider.api.bnd
index df91800..942ef35 100644
--- a/org.apache.ace.deployment/provider.api.bnd
+++ b/org.apache.ace.deployment/provider.api.bnd
@@ -1,4 +1,6 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Export-Package: org.apache.ace.deployment.provider
 Bundle-Version: 1.1.0
 Bundle-Name: Apache ACE Deployment Provider API
-Bundle-Description: Provides the Deployment Provider API packages
\ No newline at end of file
+Bundle-Description: Provides the Deployment Provider API packages
diff --git a/org.apache.ace.deployment/provider.base.bnd b/org.apache.ace.deployment/provider.base.bnd
index 7b4dcc4..2f9c033 100644
--- a/org.apache.ace.deployment/provider.base.bnd
+++ b/org.apache.ace.deployment/provider.base.bnd
@@ -1,4 +1,6 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Export-Package: org.apache.ace.deployment.provider.impl
 Bundle-Version: 2.0.0
 Bundle-Name: Apache ACE Deployment Base
-Bundle-Description: Provides the Deployemnt Base packages
\ No newline at end of file
+Bundle-Description: Provides the Deployemnt Base packages
diff --git a/org.apache.ace.deployment/provider.filebased.bnd b/org.apache.ace.deployment/provider.filebased.bnd
index 0475d09..c13170c 100644
--- a/org.apache.ace.deployment/provider.filebased.bnd
+++ b/org.apache.ace.deployment/provider.filebased.bnd
@@ -1,6 +1,8 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.deployment.provider.filebased,\
 	org.apache.ace.deployment.provider.impl
 Bundle-Activator: org.apache.ace.deployment.provider.filebased.Activator
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE Deployment Filebased
-Bundle-Description: Registers a filebased Deployment Provider service
\ No newline at end of file
+Bundle-Description: Registers a filebased Deployment Provider service
diff --git a/org.apache.ace.deployment/provider.repositorybased.bnd b/org.apache.ace.deployment/provider.repositorybased.bnd
index e01d5bc..d1f422f 100644
--- a/org.apache.ace.deployment/provider.repositorybased.bnd
+++ b/org.apache.ace.deployment/provider.repositorybased.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.deployment.provider.repositorybased,\
 	org.apache.ace.deployment.provider.impl,\
 	org.apache.ace.repository.ext,\
@@ -5,4 +7,4 @@
 Bundle-Activator: org.apache.ace.deployment.provider.repositorybased.Activator
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE Deployment Provider Repository
-Bundle-Description: Registers a repository based Deployemnt Provider service
\ No newline at end of file
+Bundle-Description: Registers a repository based Deployemnt Provider service
diff --git a/org.apache.ace.deployment/servlet.bnd b/org.apache.ace.deployment/servlet.bnd
index ebd0b47..a7933b5 100644
--- a/org.apache.ace.deployment/servlet.bnd
+++ b/org.apache.ace.deployment/servlet.bnd
@@ -1,6 +1,8 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.deployment.servlet
 Bundle-Activator: org.apache.ace.deployment.servlet.Activator
 Export-Package: org.apache.ace.deployment.processor
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE Deployment Servlet
-Bundle-Description: Registers the Deployment Servlet
\ No newline at end of file
+Bundle-Description: Registers the Deployment Servlet
diff --git a/org.apache.ace.deployment/streamgenerator.bnd b/org.apache.ace.deployment/streamgenerator.bnd
index df8c846..36b4d0e 100644
--- a/org.apache.ace.deployment/streamgenerator.bnd
+++ b/org.apache.ace.deployment/streamgenerator.bnd
@@ -1,6 +1,8 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.deployment.streamgenerator.impl
 Bundle-Activator: org.apache.ace.deployment.streamgenerator.impl.Activator
 Export-Package: org.apache.ace.deployment.streamgenerator
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE Deployment StreamGenerator
-Bundle-Description: Registers a Deployment StreamGenerator service
\ No newline at end of file
+Bundle-Description: Registers a Deployment StreamGenerator service
diff --git a/org.apache.ace.deployment/task.base.bnd b/org.apache.ace.deployment/task.base.bnd
index 5ea1aee..818aed7 100644
--- a/org.apache.ace.deployment/task.base.bnd
+++ b/org.apache.ace.deployment/task.base.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.deployment.service.impl
 Bundle-Activator: org.apache.ace.deployment.service.impl.Activator
 Export-Package: org.apache.ace.deployment.service
diff --git a/org.apache.ace.deployment/task.bnd b/org.apache.ace.deployment/task.bnd
index 795e185..0330c01 100644
--- a/org.apache.ace.deployment/task.bnd
+++ b/org.apache.ace.deployment/task.bnd
@@ -1,5 +1,7 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.deployment.task
 Bundle-Activator: org.apache.ace.deployment.task.Activator
 Bundle-Version: 1.0.0
 Bundle-Name: Apache ACE Deployment Tasks
-Bundle-Description: Registers a service factory for deployment check and update tasks
\ No newline at end of file
+Bundle-Description: Registers a service factory for deployment check and update tasks
diff --git a/org.apache.ace.deployment/util.test.bnd b/org.apache.ace.deployment/util.test.bnd
index 2b87d7a..c50264f 100644
--- a/org.apache.ace.deployment/util.test.bnd
+++ b/org.apache.ace.deployment/util.test.bnd
@@ -1,4 +1,6 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Export-Package: org.apache.ace.deployment.util.test
 Bundle-Version: 1.1.0
 Bundle-Name: Apache ACE Deployment Test util
-Bundle-Description: Provide Deployment test utility packages
\ No newline at end of file
+Bundle-Description: Provide Deployment test utility packages
diff --git a/org.apache.ace.discovery/api.bnd b/org.apache.ace.discovery/api.bnd
index e155417..51aa9f6 100644
--- a/org.apache.ace.discovery/api.bnd
+++ b/org.apache.ace.discovery/api.bnd
@@ -1,4 +1,6 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Export-Package: org.apache.ace.discovery
 Bundle-Version: 1.1.0
 Bundle-Name: Apache ACE Discovery API
-Bundle-Description: Provides the DIscovery API packages
\ No newline at end of file
+Bundle-Description: Provides the DIscovery API packages
diff --git a/org.apache.ace.discovery/bnd.bnd b/org.apache.ace.discovery/bnd.bnd
index db4c3cb..0b0663e 100644
--- a/org.apache.ace.discovery/bnd.bnd
+++ b/org.apache.ace.discovery/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.core;version=6.0.0,\
@@ -5,4 +7,4 @@
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.test;version=latest,\
 	org.easymock
--sub: *.bnd
\ No newline at end of file
+-sub: *.bnd
diff --git a/org.apache.ace.discovery/property.bnd b/org.apache.ace.discovery/property.bnd
index ce2b909..4663786 100644
--- a/org.apache.ace.discovery/property.bnd
+++ b/org.apache.ace.discovery/property.bnd
@@ -1,5 +1,7 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.discovery.property
 Bundle-Activator: org.apache.ace.discovery.property.Activator
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE Discovery Property
-Bundle-Description: Registers a service factory for property based Discovery services
\ No newline at end of file
+Bundle-Description: Registers a service factory for property based Discovery services
diff --git a/org.apache.ace.discovery/upnp.bnd b/org.apache.ace.discovery/upnp.bnd
index 01fc3bf..6ac9bae 100644
--- a/org.apache.ace.discovery/upnp.bnd
+++ b/org.apache.ace.discovery/upnp.bnd
@@ -1,5 +1,7 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.discovery.upnp
 Bundle-Activator: org.apache.ace.discovery.upnp.Activator
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE Discovery UPnP
-Bundle-Description: Registers a service factory for UPnP based Discovery services
\ No newline at end of file
+Bundle-Description: Registers a service factory for UPnP based Discovery services
diff --git a/org.apache.ace.feedback.common/bnd.bnd b/org.apache.ace.feedback.common/bnd.bnd
index d17e631..af4930c 100644
--- a/org.apache.ace.feedback.common/bnd.bnd
+++ b/org.apache.ace.feedback.common/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.feedback.util
 Export-Package: org.apache.ace.feedback
 
@@ -7,4 +9,4 @@
 -buildpath: \
 	${^-buildpath},\
 	org.apache.ace.range.api;version=latest,\
-	org.apache.ace.test;version=latest
\ No newline at end of file
+	org.apache.ace.test;version=latest
diff --git a/org.apache.ace.gogo.servlet/bnd.bnd b/org.apache.ace.gogo.servlet/bnd.bnd
index 56e7d0a..8121477 100644
--- a/org.apache.ace.gogo.servlet/bnd.bnd
+++ b/org.apache.ace.gogo.servlet/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Bundle-Version: 1.0.0
 -buildpath: \
 	${^-buildpath},\
@@ -8,4 +10,4 @@
 	org.apache.ace.gogo;version=latest,\
 	org.apache.felix.gogo.runtime
 Bundle-Activator: org.apache.ace.gogo.servlet.Activator
-Private-Package: org.apache.ace.gogo.servlet
\ No newline at end of file
+Private-Package: org.apache.ace.gogo.servlet
diff --git a/org.apache.ace.gogo/bnd.bnd b/org.apache.ace.gogo/bnd.bnd
index 9a98c5d..de94e34 100644
--- a/org.apache.ace.gogo/bnd.bnd
+++ b/org.apache.ace.gogo/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.core;version=6.0.0,\
@@ -82,4 +84,4 @@
 	org.osgi.impl.bundle.obr.*;-split-package:=merge-last,\
 	org.xmlpull.v1;-split-package:=first,\
 	org.kxml2.io;-split-package:=first
-	
\ No newline at end of file
+	
diff --git a/org.apache.ace.http.itest/bnd.bnd b/org.apache.ace.http.itest/bnd.bnd
index bb7a89c..dc866ba 100644
--- a/org.apache.ace.http.itest/bnd.bnd
+++ b/org.apache.ace.http.itest/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
 -buildpath: \
 	junit.osgi,\
diff --git a/org.apache.ace.http/bnd.bnd b/org.apache.ace.http/bnd.bnd
index cf412de..d7c4c0e 100644
--- a/org.apache.ace.http/bnd.bnd
+++ b/org.apache.ace.http/bnd.bnd
@@ -1,7 +1,9 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	javax.servlet
--sub: *.bnd
\ No newline at end of file
+-sub: *.bnd
diff --git a/org.apache.ace.http/listener.bnd b/org.apache.ace.http/listener.bnd
index 9a1439a..2993222 100644
--- a/org.apache.ace.http/listener.bnd
+++ b/org.apache.ace.http/listener.bnd
@@ -1,6 +1,8 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.http.listener
 Bundle-Activator: org.apache.ace.http.listener.Activator
 Export-Package: org.apache.ace.http.listener.constants
 Bundle-Version: 1.0.0
 Bundle-Name: Apache ACE HTTP Listener
-Bundle-Description: Registers a component that provides a servlet service whiteboard
\ No newline at end of file
+Bundle-Description: Registers a component that provides a servlet service whiteboard
diff --git a/org.apache.ace.http/redirector.bnd b/org.apache.ace.http/redirector.bnd
index 3990003..67f27ce 100644
--- a/org.apache.ace.http/redirector.bnd
+++ b/org.apache.ace.http/redirector.bnd
@@ -1,5 +1,7 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.http.redirector
 Bundle-Activator: org.apache.ace.http.redirector.Activator
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE HTTP Redirector
-Bundle-Description: Redirects configured URLs
\ No newline at end of file
+Bundle-Description: Redirects configured URLs
diff --git a/org.apache.ace.identification/api.bnd b/org.apache.ace.identification/api.bnd
index 65a4cc1..72dc5f5 100644
--- a/org.apache.ace.identification/api.bnd
+++ b/org.apache.ace.identification/api.bnd
@@ -1,4 +1,6 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Export-Package: org.apache.ace.identification
 Bundle-Version: 1.1.0
 Bundle-Name: Apache ACE Identification API
-Bundle-Description: Provides the Identification API packages
\ No newline at end of file
+Bundle-Description: Provides the Identification API packages
diff --git a/org.apache.ace.identification/bnd.bnd b/org.apache.ace.identification/bnd.bnd
index e621cb5..e9fa945 100644
--- a/org.apache.ace.identification/bnd.bnd
+++ b/org.apache.ace.identification/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.core;version=6.0.0,\
diff --git a/org.apache.ace.identification/ifconfig.bnd b/org.apache.ace.identification/ifconfig.bnd
index 7a4275a..1f7514d 100644
--- a/org.apache.ace.identification/ifconfig.bnd
+++ b/org.apache.ace.identification/ifconfig.bnd
@@ -1,5 +1,7 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.identification.ifconfig
 Bundle-Activator: org.apache.ace.identification.ifconfig.Activator
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE Identification Ifconfig
-Bundle-Description: Registers an Identification service based on interface
\ No newline at end of file
+Bundle-Description: Registers an Identification service based on interface
diff --git a/org.apache.ace.identification/property.bnd b/org.apache.ace.identification/property.bnd
index 6894928..c0a8d3b 100644
--- a/org.apache.ace.identification/property.bnd
+++ b/org.apache.ace.identification/property.bnd
@@ -1,5 +1,7 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.identification.property
 Bundle-Activator: org.apache.ace.identification.property.Activator
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE Identification Property
-Bundle-Description: Registers a service factory for property based Identification services
\ No newline at end of file
+Bundle-Description: Registers a service factory for property based Identification services
diff --git a/org.apache.ace.location.upnp/bnd.bnd b/org.apache.ace.location.upnp/bnd.bnd
index a3ebeea..3058788 100644
--- a/org.apache.ace.location.upnp/bnd.bnd
+++ b/org.apache.ace.location.upnp/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.core;version=6.0.0,\
@@ -11,4 +13,4 @@
 Private-Package: org.apache.ace.location.upnp,\
 	org.apache.ace.location.upnp.actions,\
 	org.apache.ace.location.upnp.util
-Bundle-Activator: org.apache.ace.location.upnp.Activator
\ No newline at end of file
+Bundle-Activator: org.apache.ace.location.upnp.Activator
diff --git a/org.apache.ace.log.itest/bnd.bnd b/org.apache.ace.log.itest/bnd.bnd
index 9a15707..044d011 100644
--- a/org.apache.ace.log.itest/bnd.bnd
+++ b/org.apache.ace.log.itest/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
 -buildpath: \
 	${^-buildpath},\
diff --git a/org.apache.ace.log.server.store.itest/bnd.bnd b/org.apache.ace.log.server.store.itest/bnd.bnd
index 3d1ef3e..5b9592e 100644
--- a/org.apache.ace.log.server.store.itest/bnd.bnd
+++ b/org.apache.ace.log.server.store.itest/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
 -runbundles: \
 	org.apache.ace.deployment.provider.api;version=latest,\
diff --git a/org.apache.ace.log.server.ui/bnd.bnd b/org.apache.ace.log.server.ui/bnd.bnd
index 28ec515..89301ac 100644
--- a/org.apache.ace.log.server.ui/bnd.bnd
+++ b/org.apache.ace.log.server.ui/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.core;version=6.0.0,\
@@ -12,4 +14,4 @@
 Bundle-Activator: org.apache.ace.log.server.ui.Activator
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE Log Server UI
-Bundle-Description: Registers an ACE webui extensions that shows logs for targets
\ No newline at end of file
+Bundle-Description: Registers an ACE webui extensions that shows logs for targets
diff --git a/org.apache.ace.log/api.bnd b/org.apache.ace.log/api.bnd
index 7a3ff20..7adc296 100644
--- a/org.apache.ace.log/api.bnd
+++ b/org.apache.ace.log/api.bnd
@@ -1,4 +1,6 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Export-Package: org.apache.ace.log
 Bundle-Version: 2.0.0
 Bundle-Name: Apache ACE Log API
-Bundle-Description: Provides the Apache ACE Log API packages
\ No newline at end of file
+Bundle-Description: Provides the Apache ACE Log API packages
diff --git a/org.apache.ace.log/bnd.bnd b/org.apache.ace.log/bnd.bnd
index 994f0da..1aa401e 100644
--- a/org.apache.ace.log/bnd.bnd
+++ b/org.apache.ace.log/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.core;version=6.0.0,\
@@ -15,4 +17,4 @@
 	org.mongodb.mongo-java-driver,\
 	org.apache.ace.feedback.common;version=latest
 
--sub: *.bnd
\ No newline at end of file
+-sub: *.bnd
diff --git a/org.apache.ace.log/listener.bnd b/org.apache.ace.log/listener.bnd
index 5e2b6b2..9e769d7 100644
--- a/org.apache.ace.log/listener.bnd
+++ b/org.apache.ace.log/listener.bnd
@@ -1,5 +1,7 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.log.listener
 Bundle-Activator: org.apache.ace.log.listener.Activator
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE Log Listener
-Bundle-Description: Registers log listeners for OSGi life-cycle and deployment events
\ No newline at end of file
+Bundle-Description: Registers log listeners for OSGi life-cycle and deployment events
diff --git a/org.apache.ace.log/server.servlet.bnd b/org.apache.ace.log/server.servlet.bnd
index 197300f..a467067 100644
--- a/org.apache.ace.log/server.servlet.bnd
+++ b/org.apache.ace.log/server.servlet.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.log.server.servlet
 Bundle-Activator: org.apache.ace.log.server.servlet.Activator
 Bundle-Version: 1.0.2
diff --git a/org.apache.ace.log/server.store.api.bnd b/org.apache.ace.log/server.store.api.bnd
index 5c3198d..6a704f2 100644
--- a/org.apache.ace.log/server.store.api.bnd
+++ b/org.apache.ace.log/server.store.api.bnd
@@ -1,4 +1,6 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Export-Package: org.apache.ace.log.server.store
 Bundle-Version: 2.0.0
 Bundle-Name: Apache ACE Log Server Store API
-Bundle-Description: Provides the Apache ACE Log Server Store API packages
\ No newline at end of file
+Bundle-Description: Provides the Apache ACE Log Server Store API packages
diff --git a/org.apache.ace.log/server.store.file.bnd b/org.apache.ace.log/server.store.file.bnd
index 8ec8d4d..03b097d 100644
--- a/org.apache.ace.log/server.store.file.bnd
+++ b/org.apache.ace.log/server.store.file.bnd
@@ -1,5 +1,7 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Bundle-Activator: org.apache.ace.log.server.store.impl.Activator
 Private-Package: org.apache.ace.log.server.store.impl
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE Server Store file
-Bundle-Description: Registers a service factory for file base Server Log stores
\ No newline at end of file
+Bundle-Description: Registers a service factory for file base Server Log stores
diff --git a/org.apache.ace.log/server.store.mongo.bnd b/org.apache.ace.log/server.store.mongo.bnd
index 93031eb..2d89979 100644
--- a/org.apache.ace.log/server.store.mongo.bnd
+++ b/org.apache.ace.log/server.store.mongo.bnd
@@ -1,5 +1,7 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.log.server.store.mongo
 Bundle-Activator: org.apache.ace.log.server.store.mongo.Activator
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE Log Server Store Mongo
-Bundle-Description: Registers a service factory for MongoDB bases Server Log stores
\ No newline at end of file
+Bundle-Description: Registers a service factory for MongoDB bases Server Log stores
diff --git a/org.apache.ace.log/server.task.bnd b/org.apache.ace.log/server.task.bnd
index e3a738c..ec4a914 100644
--- a/org.apache.ace.log/server.task.bnd
+++ b/org.apache.ace.log/server.task.bnd
@@ -1,5 +1,7 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Bundle-Version: 1.0.1
 Private-Package: org.apache.ace.log.server.task
 Bundle-Activator: org.apache.ace.log.server.task.Activator
 Bundle-Name: Apache ACE Log Server Task
-Bundle-Description: Registers a service factory for runnable Server Log Tasks
\ No newline at end of file
+Bundle-Description: Registers a service factory for runnable Server Log Tasks
diff --git a/org.apache.ace.log/target.bnd b/org.apache.ace.log/target.bnd
index f5e24cd..c4c32fb 100644
--- a/org.apache.ace.log/target.bnd
+++ b/org.apache.ace.log/target.bnd
@@ -1,6 +1,8 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.log.target,\
 	org.apache.ace.log.target.task
 Bundle-Activator: org.apache.ace.log.target.Activator
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE Log Target
-Bundle-Description: Registers service factories for target log configuration and synchronization
\ No newline at end of file
+Bundle-Description: Registers service factories for target log configuration and synchronization
diff --git a/org.apache.ace.log/target.store.impl.bnd b/org.apache.ace.log/target.store.impl.bnd
index 7aba89a..909c021 100644
--- a/org.apache.ace.log/target.store.impl.bnd
+++ b/org.apache.ace.log/target.store.impl.bnd
@@ -1,6 +1,8 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.log.target.store.impl
 Bundle-Activator: org.apache.ace.log.target.store.impl.Activator
 Export-Package: org.apache.ace.log.target.store
 Bundle-Version: 2.0.0
 Bundle-Name: Apache ACE Log Target Store
-Bundle-Description: Registers a service factory for target log stores
\ No newline at end of file
+Bundle-Description: Registers a service factory for target log stores
diff --git a/org.apache.ace.nodelauncher/amazon.bnd b/org.apache.ace.nodelauncher/amazon.bnd
index de793c8..454d783 100644
--- a/org.apache.ace.nodelauncher/amazon.bnd
+++ b/org.apache.ace.nodelauncher/amazon.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: \
 	org.apache.ace.nodelauncher.amazon.impl,\
 	META-INF.services;-split-package:=merge-first,\
diff --git a/org.apache.ace.nodelauncher/api.bnd b/org.apache.ace.nodelauncher/api.bnd
index 84b34d2..7433700 100644
--- a/org.apache.ace.nodelauncher/api.bnd
+++ b/org.apache.ace.nodelauncher/api.bnd
@@ -1,4 +1,6 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Export-Package: org.apache.ace.nodelauncher
 Bundle-Version: 1.0.0
 Bundle-Name: Apache ACE NodeLauncher API
-Bundle-Description: Provides the Apache ACE NodeLauncher API
\ No newline at end of file
+Bundle-Description: Provides the Apache ACE NodeLauncher API
diff --git a/org.apache.ace.nodelauncher/bnd.bnd b/org.apache.ace.nodelauncher/bnd.bnd
index dd72549..2d45a47 100644
--- a/org.apache.ace.nodelauncher/bnd.bnd
+++ b/org.apache.ace.nodelauncher/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.core;version=6.0.0,\
diff --git a/org.apache.ace.nodelauncher/generate-build-path.groovy b/org.apache.ace.nodelauncher/generate-build-path.groovy
index af589ad..7da4fb5 100644
--- a/org.apache.ace.nodelauncher/generate-build-path.groovy
+++ b/org.apache.ace.nodelauncher/generate-build-path.groovy
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 def libDir = new File("lib")
 def output = new File('buildpath.txt')
 output.text = ""
diff --git a/org.apache.ace.nodelauncher/generate-lib-includes.groovy b/org.apache.ace.nodelauncher/generate-lib-includes.groovy
index 90f879d..3ce509d 100644
--- a/org.apache.ace.nodelauncher/generate-lib-includes.groovy
+++ b/org.apache.ace.nodelauncher/generate-lib-includes.groovy
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 def libDir = new File("lib")
 def output = new File('libs.txt')
 output.text = ""
diff --git a/org.apache.ace.nodelauncher/generate-serviceloader-files.groovy b/org.apache.ace.nodelauncher/generate-serviceloader-files.groovy
index 736b1bf..a5486c5 100644
--- a/org.apache.ace.nodelauncher/generate-serviceloader-files.groovy
+++ b/org.apache.ace.nodelauncher/generate-serviceloader-files.groovy
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 def libDir = new File("lib")
 def serviceProviders = []
 
diff --git a/org.apache.ace.nodelauncher/resources/org.jclouds.apis.ApiMetadata b/org.apache.ace.nodelauncher/resources/org.jclouds.apis.ApiMetadata
index 425a7fd..5ebeb2c 100644
--- a/org.apache.ace.nodelauncher/resources/org.jclouds.apis.ApiMetadata
+++ b/org.apache.ace.nodelauncher/resources/org.jclouds.apis.ApiMetadata
@@ -1,2 +1,4 @@
 org.jclouds.ec2.EC2ApiMetadata
 org.jclouds.compute.stub.StubApiMetadata
+
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
\ No newline at end of file
diff --git a/org.apache.ace.nodelauncher/ui.bnd b/org.apache.ace.nodelauncher/ui.bnd
index d3eaf33..90e934f 100644
--- a/org.apache.ace.nodelauncher/ui.bnd
+++ b/org.apache.ace.nodelauncher/ui.bnd
@@ -1,5 +1,7 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Bundle-Activator: org.apache.ace.nodelauncher.ui.Activator
 Private-Package: org.apache.ace.nodelauncher.ui
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE NodeLauncher UI
-Bundle-Description: Registers an ACE webui extensions that add Nodelauncher controls
\ No newline at end of file
+Bundle-Description: Registers an ACE webui extensions that add Nodelauncher controls
diff --git a/org.apache.ace.obr/bnd.bnd b/org.apache.ace.obr/bnd.bnd
index 09c345c..41d9554 100644
--- a/org.apache.ace.obr/bnd.bnd
+++ b/org.apache.ace.obr/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -sub: *.bnd
 -buildpath: \
 	${^-buildpath},\
diff --git a/org.apache.ace.obr/metadata.bnd b/org.apache.ace.obr/metadata.bnd
index 2f0dc1e..8c58e58 100644
--- a/org.apache.ace.obr/metadata.bnd
+++ b/org.apache.ace.obr/metadata.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.obr.metadata.bindex,\
 	org.kxml2.io,\
 	org.kxml2.kdom,\
@@ -15,4 +17,4 @@
 	org.osgi.service.obr
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE OBR MetaData
-Bundle-Description: Provides the ACE OBR MetaData packages
\ No newline at end of file
+Bundle-Description: Provides the ACE OBR MetaData packages
diff --git a/org.apache.ace.obr/servlet.bnd b/org.apache.ace.obr/servlet.bnd
index f522a27..c70ba0e 100644
--- a/org.apache.ace.obr/servlet.bnd
+++ b/org.apache.ace.obr/servlet.bnd
@@ -1,5 +1,7 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.obr.servlet
 Bundle-Activator: org.apache.ace.obr.servlet.Activator
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE OBR Servlet
-Bundle-Description: Registers the ACE OBR servlet
\ No newline at end of file
+Bundle-Description: Registers the ACE OBR servlet
diff --git a/org.apache.ace.obr/storage.bnd b/org.apache.ace.obr/storage.bnd
index 7d86a24..54cba24 100644
--- a/org.apache.ace.obr/storage.bnd
+++ b/org.apache.ace.obr/storage.bnd
@@ -1,7 +1,9 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.obr.storage.file,\
 	org.apache.ace.obr.metadata.util
 Bundle-Activator: org.apache.ace.obr.storage.file.Activator
 Export-Package: org.apache.ace.obr.storage
 Bundle-Version: 2.0.0
 Bundle-Name: Apache ACE OBR Storage
-Bundle-Description: Registers a file based BundleStore for the OBR
\ No newline at end of file
+Bundle-Description: Registers a file based BundleStore for the OBR
diff --git a/org.apache.ace.processlauncher.itest/bnd.bnd b/org.apache.ace.processlauncher.itest/bnd.bnd
index c09b3ab..e5cbddb 100644
--- a/org.apache.ace.processlauncher.itest/bnd.bnd
+++ b/org.apache.ace.processlauncher.itest/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
 -buildpath: \
 	${^-buildpath},\
diff --git a/org.apache.ace.processlauncher/bnd.bnd b/org.apache.ace.processlauncher/bnd.bnd
index 0eda6a3..11594a0 100644
--- a/org.apache.ace.processlauncher/bnd.bnd
+++ b/org.apache.ace.processlauncher/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	org.apache.felix.dependencymanager,\
@@ -15,4 +17,4 @@
 	org.apache.ace.processlauncher.util
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE ProcessLauncher
-Bundle-Description: Registers a service factory and ProcessLauncher service
\ No newline at end of file
+Bundle-Description: Registers a service factory and ProcessLauncher service
diff --git a/org.apache.ace.processlauncher/test/org/apache/ace/processlauncher/test/impl/launch.properties b/org.apache.ace.processlauncher/test/org/apache/ace/processlauncher/test/impl/launch.properties
index a8b883e..fe21626 100644
--- a/org.apache.ace.processlauncher/test/org/apache/ace/processlauncher/test/impl/launch.properties
+++ b/org.apache.ace.processlauncher/test/org/apache/ace/processlauncher/test/impl/launch.properties
@@ -3,4 +3,6 @@
 executable.args = -c 'sleep 1 && exit' -c 'echo "foo bar!\n"'
 executable.executable.processStreamListener = (foo=bar)
 executable.workingDir = /tmp
-executable.respawnAutomatically = false
\ No newline at end of file
+executable.respawnAutomatically = false
+
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
\ No newline at end of file
diff --git a/org.apache.ace.range.api/bnd.bnd b/org.apache.ace.range.api/bnd.bnd
index d132c80..fd4317a 100644
--- a/org.apache.ace.range.api/bnd.bnd
+++ b/org.apache.ace.range.api/bnd.bnd
@@ -1,7 +1,9 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	org.apache.ace.test;version=latest
 Export-Package: org.apache.ace.range
 Bundle-Version: 1.1.0
 Bundle-Name: Apache ACE Range API
-Bundle-Description: Provides the Apache ACE Range API packages
\ No newline at end of file
+Bundle-Description: Provides the Apache ACE Range API packages
diff --git a/org.apache.ace.repository.itest/bnd.bnd b/org.apache.ace.repository.itest/bnd.bnd
index 38bce3b..cbd14d2 100644
--- a/org.apache.ace.repository.itest/bnd.bnd
+++ b/org.apache.ace.repository.itest/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
 -buildpath: \
 	junit.osgi,\
diff --git a/org.apache.ace.repository/api.bnd b/org.apache.ace.repository/api.bnd
index 52ba2da..28b3f19 100644
--- a/org.apache.ace.repository/api.bnd
+++ b/org.apache.ace.repository/api.bnd
@@ -1,4 +1,6 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Export-Package: org.apache.ace.repository
 Bundle-Version: 1.1.0
 Bundle-Name: Apache ACE Repository API
-Bundle-Description: Provides the Apache ACE Repository API packages
\ No newline at end of file
+Bundle-Description: Provides the Apache ACE Repository API packages
diff --git a/org.apache.ace.repository/bnd.bnd b/org.apache.ace.repository/bnd.bnd
index 72f9df4..178ba56 100644
--- a/org.apache.ace.repository/bnd.bnd
+++ b/org.apache.ace.repository/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.core;version=6.0.0,\
@@ -10,4 +12,4 @@
 	org.apache.ace.scheduler.api;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
 	org.apache.ace.connectionfactory;version=latest
--sub: *.bnd
\ No newline at end of file
+-sub: *.bnd
diff --git a/org.apache.ace.repository/ext.bnd b/org.apache.ace.repository/ext.bnd
index 7325031..03f0228 100644
--- a/org.apache.ace.repository/ext.bnd
+++ b/org.apache.ace.repository/ext.bnd
@@ -1,5 +1,7 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Export-Package: org.apache.ace.repository.ext,\
 	org.apache.ace.repository.ext.impl
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE Repository EXT
-Bundle-Description: Provides the Apache ACE Repository EXT packages
\ No newline at end of file
+Bundle-Description: Provides the Apache ACE Repository EXT packages
diff --git a/org.apache.ace.repository/impl.bnd b/org.apache.ace.repository/impl.bnd
index b1beb3b..d26caf9 100644
--- a/org.apache.ace.repository/impl.bnd
+++ b/org.apache.ace.repository/impl.bnd
@@ -1,5 +1,7 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.repository.impl
 Bundle-Activator: org.apache.ace.repository.impl.Activator
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE Repository Service
-Bundle-Description: Registers a service factory for Repository services
\ No newline at end of file
+Bundle-Description: Registers a service factory for Repository services
diff --git a/org.apache.ace.repository/servlet.bnd b/org.apache.ace.repository/servlet.bnd
index 774483b..59a4330 100644
--- a/org.apache.ace.repository/servlet.bnd
+++ b/org.apache.ace.repository/servlet.bnd
@@ -1,6 +1,8 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.repository.servlet
 Bundle-Activator: org.apache.ace.repository.servlet.Activator
 Export-Package: org.apache.ace.repository.servlet
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE Repository Servlet
-Bundle-Description: Registers a repository and replication servlet
\ No newline at end of file
+Bundle-Description: Registers a repository and replication servlet
diff --git a/org.apache.ace.repository/task.bnd b/org.apache.ace.repository/task.bnd
index 9e39012..0bf94bb 100644
--- a/org.apache.ace.repository/task.bnd
+++ b/org.apache.ace.repository/task.bnd
@@ -1,5 +1,7 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Bundle-Activator: org.apache.ace.repository.task.Activator
 Private-Package: org.apache.ace.repository.task
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE Repository Task
-Bundle-Description: Registers a runnable task for repository replication
\ No newline at end of file
+Bundle-Description: Registers a runnable task for repository replication
diff --git a/org.apache.ace.resourceprocessor.useradmin/bnd.bnd b/org.apache.ace.resourceprocessor.useradmin/bnd.bnd
index 9b323e0..908c33e 100644
--- a/org.apache.ace.resourceprocessor.useradmin/bnd.bnd
+++ b/org.apache.ace.resourceprocessor.useradmin/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.core;version=6.0.0,\
@@ -9,4 +11,4 @@
 Deployment-ProvidesResourceProcessor: org.apache.ace.resourceprocessor.useradmin
 Bundle-Version: 2.0.0
 Bundle-Name: Apache ACE ResourceProcessor UserAdmin
-Bundle-Description: Registers a ResourceProcessor service that handle useradmin resources
\ No newline at end of file
+Bundle-Description: Registers a ResourceProcessor service that handle useradmin resources
diff --git a/org.apache.ace.scheduler/api.bnd b/org.apache.ace.scheduler/api.bnd
index 34af10a..6e9aa83 100644
--- a/org.apache.ace.scheduler/api.bnd
+++ b/org.apache.ace.scheduler/api.bnd
@@ -1,4 +1,6 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Export-Package: org.apache.ace.scheduler.constants
 Bundle-Version: 1.0.0
 Bundle-Name: Apache ACE Scheduler API
-Bundle-Description: Provides the Apache ACE Scheduler API packages
\ No newline at end of file
+Bundle-Description: Provides the Apache ACE Scheduler API packages
diff --git a/org.apache.ace.scheduler/bnd.bnd b/org.apache.ace.scheduler/bnd.bnd
index 539cd96..56563f9 100644
--- a/org.apache.ace.scheduler/bnd.bnd
+++ b/org.apache.ace.scheduler/bnd.bnd
@@ -1,7 +1,9 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.test;version=latest
--sub: *.bnd
\ No newline at end of file
+-sub: *.bnd
diff --git a/org.apache.ace.scheduler/impl.bnd b/org.apache.ace.scheduler/impl.bnd
index e2a5efe..588be3d 100644
--- a/org.apache.ace.scheduler/impl.bnd
+++ b/org.apache.ace.scheduler/impl.bnd
@@ -1,5 +1,7 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Bundle-Activator: org.apache.ace.scheduler.Activator
 Private-Package: org.apache.ace.scheduler
 Bundle-Version: 1.0.0
 Bundle-Name: Apache ACE Scheduler Service
-Bundle-Description: Registers a component that schedules runnable services
\ No newline at end of file
+Bundle-Description: Registers a component that schedules runnable services
diff --git a/org.apache.ace.tageditor/bnd.bnd b/org.apache.ace.tageditor/bnd.bnd
index 3c48414..3a4d6b3 100644
--- a/org.apache.ace.tageditor/bnd.bnd
+++ b/org.apache.ace.tageditor/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.core;version=6.0.0,\
diff --git a/org.apache.ace.target.mgmt.ui/bnd.bnd b/org.apache.ace.target.mgmt.ui/bnd.bnd
index 761e193..1773cc1 100644
--- a/org.apache.ace.target.mgmt.ui/bnd.bnd
+++ b/org.apache.ace.target.mgmt.ui/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.core;version=6.0.0,\
@@ -10,4 +12,4 @@
 Bundle-Activator: org.apache.ace.target.management.ui.Activator
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE TargetMgmtUI
-Bundle-Description: Registers an ACE webui extension for target mgmnt functions
\ No newline at end of file
+Bundle-Description: Registers an ACE webui extension for target mgmnt functions
diff --git a/org.apache.ace.test/bnd.bnd b/org.apache.ace.test/bnd.bnd
index 09e38a9..b3494ae 100644
--- a/org.apache.ace.test/bnd.bnd
+++ b/org.apache.ace.test/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.core;version=4.2,\
diff --git a/org.apache.ace.useradmin.ui.itest/bnd.bnd b/org.apache.ace.useradmin.ui.itest/bnd.bnd
index 0ffa151..c0e296f 100644
--- a/org.apache.ace.useradmin.ui.itest/bnd.bnd
+++ b/org.apache.ace.useradmin.ui.itest/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
 Private-Package: org.apache.ace.useradmin.ui.test
 -runvm: -ea
diff --git a/org.apache.ace.useradmin.ui/bnd.bnd b/org.apache.ace.useradmin.ui/bnd.bnd
index bd48b64..730e02c 100644
--- a/org.apache.ace.useradmin.ui/bnd.bnd
+++ b/org.apache.ace.useradmin.ui/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	org.apache.felix.dependencymanager,\
@@ -17,4 +19,4 @@
 	org.apache.ace.useradmin.ui.editor.impl
 Export-Package: org.apache.ace.useradmin.ui.editor
 Bundle-Name: Apache ACE UserAdminUI
-Bundle-Description: Registers an ACE webui extension that add user management functions
\ No newline at end of file
+Bundle-Description: Registers an ACE webui extension that add user management functions
diff --git a/org.apache.ace.verifier/bnd.bnd b/org.apache.ace.verifier/bnd.bnd
index b78ff56..7e60f21 100644
--- a/org.apache.ace.verifier/bnd.bnd
+++ b/org.apache.ace.verifier/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.core;version=6.0.0,\
diff --git a/org.apache.ace.verifier/impl.bnd b/org.apache.ace.verifier/impl.bnd
index c257318..336c005 100644
--- a/org.apache.ace.verifier/impl.bnd
+++ b/org.apache.ace.verifier/impl.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Export-Package: org.apache.ace.deployment.verifier,\
 	org.osgi.service.log,\
 	org.osgi.framework.wiring
@@ -13,4 +15,4 @@
 Bundle-Version: 1.0.1
 Bundle-Activator: org.apache.ace.deployment.verifier.impl.Activator
 Bundle-Name: Apache ACE Verifier Service
-Bundle-Description: Registers the Apache ACE verifier service
\ No newline at end of file
+Bundle-Description: Registers the Apache ACE verifier service
diff --git a/org.apache.ace.verifier/ui.bnd b/org.apache.ace.verifier/ui.bnd
index 1630a50..d6e454b 100644
--- a/org.apache.ace.verifier/ui.bnd
+++ b/org.apache.ace.verifier/ui.bnd
@@ -1,7 +1,9 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 Private-Package: org.apache.ace.deployment.verifier.ui
 Bundle-Activator: org.apache.ace.deployment.verifier.ui.Activator
 Import-Package: org.osgi.framework;version='[1.5,2)',\
 	*
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE Verifier UI
-Bundle-Description: Registers an ACE webui extension that adds verifier functions
\ No newline at end of file
+Bundle-Description: Registers an ACE webui extension that adds verifier functions
diff --git a/org.apache.ace.webui.vaadin/bnd.bnd b/org.apache.ace.webui.vaadin/bnd.bnd
index 9783cfc..477fa7d 100644
--- a/org.apache.ace.webui.vaadin/bnd.bnd
+++ b/org.apache.ace.webui.vaadin/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -buildpath: \
 	${^-buildpath},\
 	osgi.cmpn,\
@@ -17,4 +19,4 @@
 Bundle-Activator: org.apache.ace.webui.vaadin.Activator
 Bundle-Version: 1.0.1
 Bundle-Name: Apache ACE WebUI Vaadin
-Bundle-Description: Provides the base ACE WebUI based on Vaadin
\ No newline at end of file
+Bundle-Description: Provides the base ACE WebUI based on Vaadin
diff --git a/run-client/bnd.bnd b/run-client/bnd.bnd
index 9a06de2..7f57803 100644
--- a/run-client/bnd.bnd
+++ b/run-client/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -nobundles: true
 Bundle-Name: Apache ACE Run Client
-Bundle-Description: Bnd run project for a standard ACE Client. This projects does not generate any artifacts.
\ No newline at end of file
+Bundle-Description: Bnd run project for a standard ACE Client. This projects does not generate any artifacts.
diff --git a/run-client/client.bndrun b/run-client/client.bndrun
index c46e83d..90baa6e 100644
--- a/run-client/client.bndrun
+++ b/run-client/client.bndrun
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runee: JavaSE-1.6
 -runbundles: org.apache.felix.dependencymanager,\
@@ -60,4 +62,4 @@
 	org.apache.felix.log.maxSize=1000,\
 	launch.keep=true,\
 	launch.storage.dir=bundle-cache
-	
\ No newline at end of file
+	
diff --git a/run-client/conf/org.apache.ace.client.repository.cfg b/run-client/conf/org.apache.ace.client.repository.cfg
index ced8beb..155c8c3 100644
--- a/run-client/conf/org.apache.ace.client.repository.cfg
+++ b/run-client/conf/org.apache.ace.client.repository.cfg
Binary files differ
diff --git a/run-client/conf/org.apache.ace.client.rest.cfg b/run-client/conf/org.apache.ace.client.rest.cfg
index 16e9f8a..78a840a 100644
--- a/run-client/conf/org.apache.ace.client.rest.cfg
+++ b/run-client/conf/org.apache.ace.client.rest.cfg
@@ -1,2 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 org.apache.ace.server.servlet.endpoint=/client
 session.timeout=300
diff --git a/run-client/conf/org.apache.ace.client.workspace.cfg b/run-client/conf/org.apache.ace.client.workspace.cfg
index 9b46bc8..a6ee0f2 100644
--- a/run-client/conf/org.apache.ace.client.workspace.cfg
+++ b/run-client/conf/org.apache.ace.client.workspace.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 repository.url=http://${org.apache.ace.server}/repository
 user.name=d
 authentication.enabled=false
diff --git a/run-client/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg b/run-client/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg
index 99e0203..1195652 100644
--- a/run-client/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg
+++ b/run-client/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 repositoryLocation = http://${org.apache.ace.server}/repository
 repositoryCustomer = apache
 repositoryName = user
diff --git a/run-client/conf/org.apache.ace.connectionfactory/auditlog.cfg b/run-client/conf/org.apache.ace.connectionfactory/auditlog.cfg
index f757161..40212b6 100644
--- a/run-client/conf/org.apache.ace.connectionfactory/auditlog.cfg
+++ b/run-client/conf/org.apache.ace.connectionfactory/auditlog.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 authentication.baseURL = http://${org.apache.ace.server}/auditlog/
 authentication.type = none
 #authentication.user.name = d
diff --git a/run-client/conf/org.apache.ace.connectionfactory/client.cfg b/run-client/conf/org.apache.ace.connectionfactory/client.cfg
index 5cb3b67..b2e5631 100644
--- a/run-client/conf/org.apache.ace.connectionfactory/client.cfg
+++ b/run-client/conf/org.apache.ace.connectionfactory/client.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 authentication.baseURL = http://${org.apache.ace.server}/client/
 authentication.type = none
 #authentication.user.name = d
diff --git a/run-client/conf/org.apache.ace.connectionfactory/deployment.cfg b/run-client/conf/org.apache.ace.connectionfactory/deployment.cfg
index ff33884..710038e 100644
--- a/run-client/conf/org.apache.ace.connectionfactory/deployment.cfg
+++ b/run-client/conf/org.apache.ace.connectionfactory/deployment.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 authentication.baseURL = http://${org.apache.ace.server}/deployment/
 authentication.type = none
 #authentication.user.name = d
diff --git a/run-client/conf/org.apache.ace.connectionfactory/obr.cfg b/run-client/conf/org.apache.ace.connectionfactory/obr.cfg
index 5f8905c..1c3c726 100644
--- a/run-client/conf/org.apache.ace.connectionfactory/obr.cfg
+++ b/run-client/conf/org.apache.ace.connectionfactory/obr.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 authentication.baseURL = http://${org.apache.ace.obr}/obr/
 authentication.type = none
 #authentication.user.name = d
diff --git a/run-client/conf/org.apache.ace.connectionfactory/replication.cfg b/run-client/conf/org.apache.ace.connectionfactory/replication.cfg
index dd1440c..41f559b 100644
--- a/run-client/conf/org.apache.ace.connectionfactory/replication.cfg
+++ b/run-client/conf/org.apache.ace.connectionfactory/replication.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 authentication.baseURL = http://${org.apache.ace.server}/replication/
 authentication.type = none
 #authentication.user.name = d
diff --git a/run-client/conf/org.apache.ace.connectionfactory/repository.cfg b/run-client/conf/org.apache.ace.connectionfactory/repository.cfg
index 0f72654..f952b40 100644
--- a/run-client/conf/org.apache.ace.connectionfactory/repository.cfg
+++ b/run-client/conf/org.apache.ace.connectionfactory/repository.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 authentication.baseURL = http://${org.apache.ace.server}/repository/
 authentication.type = none
 #authentication.user.name = d
diff --git a/run-client/conf/org.apache.ace.discovery.property.cfg b/run-client/conf/org.apache.ace.discovery.property.cfg
index 9670c97..a937d20 100644
--- a/run-client/conf/org.apache.ace.discovery.property.cfg
+++ b/run-client/conf/org.apache.ace.discovery.property.cfg
@@ -1 +1,3 @@
-serverURL = http://${org.apache.ace.server}
\ No newline at end of file
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
+serverURL = http://${org.apache.ace.server}
diff --git a/run-client/conf/org.apache.ace.gogo.servlet.cfg b/run-client/conf/org.apache.ace.gogo.servlet.cfg
index 7156f03..e202e81 100644
--- a/run-client/conf/org.apache.ace.gogo.servlet.cfg
+++ b/run-client/conf/org.apache.ace.gogo.servlet.cfg
@@ -1,3 +1,4 @@
-org.apache.ace.server.servlet.endpoint=/gogo
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
+org.apache.ace.server.servlet.endpoint=/gogo
 
diff --git a/run-client/conf/org.apache.ace.log.server.store.factory/auditlog.cfg b/run-client/conf/org.apache.ace.log.server.store.factory/auditlog.cfg
index 0ca5ff0..a97a27c 100644
--- a/run-client/conf/org.apache.ace.log.server.store.factory/auditlog.cfg
+++ b/run-client/conf/org.apache.ace.log.server.store.factory/auditlog.cfg
@@ -1 +1,3 @@
-name=auditlog
\ No newline at end of file
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
+name=auditlog
diff --git a/run-client/conf/org.apache.ace.log.server.store.filebased.cfg b/run-client/conf/org.apache.ace.log.server.store.filebased.cfg
index 292a339..d42b611 100644
--- a/run-client/conf/org.apache.ace.log.server.store.filebased.cfg
+++ b/run-client/conf/org.apache.ace.log.server.store.filebased.cfg
@@ -1 +1,3 @@
-MaxEvents=0
\ No newline at end of file
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
+MaxEvents=0
diff --git a/run-client/conf/org.apache.ace.log.server.task.factory/auditlog.cfg b/run-client/conf/org.apache.ace.log.server.task.factory/auditlog.cfg
index 1171a0c..eda2448 100644
--- a/run-client/conf/org.apache.ace.log.server.task.factory/auditlog.cfg
+++ b/run-client/conf/org.apache.ace.log.server.task.factory/auditlog.cfg
@@ -1,2 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 name=auditlog
 mode=pull
diff --git a/run-client/conf/org.apache.ace.scheduler.cfg b/run-client/conf/org.apache.ace.scheduler.cfg
index 6b98a70..bc85930 100644
--- a/run-client/conf/org.apache.ace.scheduler.cfg
+++ b/run-client/conf/org.apache.ace.scheduler.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 auditlog = 2000
 org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask = 2000
 org.apache.ace.log.server.task.LogSyncTask = 2000
diff --git a/run-client/conf/org.apache.ace.server.repository.factory/ace-user.cfg b/run-client/conf/org.apache.ace.server.repository.factory/ace-user.cfg
index 75d57e8..9be7db6 100644
--- a/run-client/conf/org.apache.ace.server.repository.factory/ace-user.cfg
+++ b/run-client/conf/org.apache.ace.server.repository.factory/ace-user.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 name=user
 customer=apache
 master=true
diff --git a/run-client/conf/org.apache.ace.webui.vaadin.cfg b/run-client/conf/org.apache.ace.webui.vaadin.cfg
index 8972616..3e3fa60 100644
--- a/run-client/conf/org.apache.ace.webui.vaadin.cfg
+++ b/run-client/conf/org.apache.ace.webui.vaadin.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 # The endpoint of the Vaadin UI
 org.apache.ace.server.servlet.endpoint = /ace
 # Vaadin UI settings
diff --git a/run-develop/bnd.bnd b/run-develop/bnd.bnd
index 4129733..472395a 100644
--- a/run-develop/bnd.bnd
+++ b/run-develop/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -nobundles: true
 Bundle-Name: Apache ACE Development Target
-Bundle-Description: Bnd run project for a standard ACE Target when used in a development environment, such as Eclipse. This projects does not generate any artifacts.
\ No newline at end of file
+Bundle-Description: Bnd run project for a standard ACE Target when used in a development environment, such as Eclipse. This projects does not generate any artifacts.
diff --git a/run-develop/develop.bndrun b/run-develop/develop.bndrun
index 24b65f8..ccf8cdb 100644
--- a/run-develop/develop.bndrun
+++ b/run-develop/develop.bndrun
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runee: JavaSE-1.6
 -runbundles: org.apache.felix.gogo.command,\
diff --git a/run-obr/bnd.bnd b/run-obr/bnd.bnd
index dccf2ee..b4faf7c 100644
--- a/run-obr/bnd.bnd
+++ b/run-obr/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -nobundles: true
 Bundle-Name: Apache ACE Run OBR
-Bundle-Description: Bnd run project for a standard ACE OBR. This projects does not generate any artifacts.
\ No newline at end of file
+Bundle-Description: Bnd run project for a standard ACE OBR. This projects does not generate any artifacts.
diff --git a/run-obr/conf/org.apache.ace.obr.servlet.cfg b/run-obr/conf/org.apache.ace.obr.servlet.cfg
index 802e92f..24eb9d5 100644
--- a/run-obr/conf/org.apache.ace.obr.servlet.cfg
+++ b/run-obr/conf/org.apache.ace.obr.servlet.cfg
@@ -1,2 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 org.apache.ace.server.servlet.endpoint=/obr
 authentication.enabled = false
diff --git a/run-obr/conf/org.apache.ace.obr.storage.file.cfg b/run-obr/conf/org.apache.ace.obr.storage.file.cfg
index bfdb476..6cb1fa8 100644
--- a/run-obr/conf/org.apache.ace.obr.storage.file.cfg
+++ b/run-obr/conf/org.apache.ace.obr.storage.file.cfg
@@ -1 +1,3 @@
-fileLocation=store
\ No newline at end of file
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
+fileLocation=store
diff --git a/run-obr/obr.bndrun b/run-obr/obr.bndrun
index 5bd5dc0..ea52c2e 100644
--- a/run-obr/obr.bndrun
+++ b/run-obr/obr.bndrun
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runee: JavaSE-1.6
 -runbundles: org.apache.felix.dependencymanager,\
diff --git a/run-relay/bnd.bnd b/run-relay/bnd.bnd
index 2b35f23..6ba0461 100644
--- a/run-relay/bnd.bnd
+++ b/run-relay/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -nobundles: true
 Bundle-Name: Apache ACE Relay Server
-Bundle-Description: Bnd run project for a ACE relay server. This projects does not generate any artifacts.
\ No newline at end of file
+Bundle-Description: Bnd run project for a ACE relay server. This projects does not generate any artifacts.
diff --git a/run-relay/conf/org.apache.ace.connectionfactory/auditlog.cfg b/run-relay/conf/org.apache.ace.connectionfactory/auditlog.cfg
index e74120d..4e41c31 100644
--- a/run-relay/conf/org.apache.ace.connectionfactory/auditlog.cfg
+++ b/run-relay/conf/org.apache.ace.connectionfactory/auditlog.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 authentication.baseURL = http://${org.apache.ace.relay}/auditlog/
 authentication.type = none
 #authentication.user.name = d
diff --git a/run-relay/conf/org.apache.ace.connectionfactory/deployment.cfg b/run-relay/conf/org.apache.ace.connectionfactory/deployment.cfg
index 3887a0e..009a53c 100644
--- a/run-relay/conf/org.apache.ace.connectionfactory/deployment.cfg
+++ b/run-relay/conf/org.apache.ace.connectionfactory/deployment.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 authentication.baseURL = http://${org.apache.ace.relay}/deployment/
 authentication.type = none
 #authentication.user.name = d
diff --git a/run-relay/conf/org.apache.ace.connectionfactory/repository.cfg b/run-relay/conf/org.apache.ace.connectionfactory/repository.cfg
index 9e8d2ea..fe9628d 100644
--- a/run-relay/conf/org.apache.ace.connectionfactory/repository.cfg
+++ b/run-relay/conf/org.apache.ace.connectionfactory/repository.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 authentication.baseURL = http://${org.apache.ace.relay}/repository/
 authentication.type = none
 #authentication.user.name = d
diff --git a/run-relay/conf/org.apache.ace.deployment.provider.repositorybased.cfg b/run-relay/conf/org.apache.ace.deployment.provider.repositorybased.cfg
index ea71eab..03aeeae 100644
--- a/run-relay/conf/org.apache.ace.deployment.provider.repositorybased.cfg
+++ b/run-relay/conf/org.apache.ace.deployment.provider.repositorybased.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 url = http://${org.apache.ace.relay}/repository
 name = deployment
 customer = apache
diff --git a/run-relay/conf/org.apache.ace.deployment.servlet.agent.cfg b/run-relay/conf/org.apache.ace.deployment.servlet.agent.cfg
index a593c72..972e774 100644
--- a/run-relay/conf/org.apache.ace.deployment.servlet.agent.cfg
+++ b/run-relay/conf/org.apache.ace.deployment.servlet.agent.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 org.apache.ace.server.servlet.endpoint=/agent
 # no authentication is used...
 authentication.enabled = false
diff --git a/run-relay/conf/org.apache.ace.deployment.servlet.cfg b/run-relay/conf/org.apache.ace.deployment.servlet.cfg
index bb0a00c..1272eb2 100644
--- a/run-relay/conf/org.apache.ace.deployment.servlet.cfg
+++ b/run-relay/conf/org.apache.ace.deployment.servlet.cfg
@@ -1,2 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 org.apache.ace.server.servlet.endpoint=/deployment
 authentication.enabled = false
diff --git a/run-relay/conf/org.apache.ace.discovery.property.cfg b/run-relay/conf/org.apache.ace.discovery.property.cfg
index 763df70..a3c4181 100644
--- a/run-relay/conf/org.apache.ace.discovery.property.cfg
+++ b/run-relay/conf/org.apache.ace.discovery.property.cfg
@@ -1,2 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 # This is the *master* server URL to contact in order to relay to...
-serverURL = http://${org.apache.ace.server}
\ No newline at end of file
+serverURL = http://${org.apache.ace.server}
diff --git a/run-relay/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg b/run-relay/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg
index b38faca..989dfc9 100644
--- a/run-relay/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg
+++ b/run-relay/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 org.apache.ace.server.servlet.endpoint=/auditlog
 name = auditlog
 authentication.enabled = false
diff --git a/run-relay/conf/org.apache.ace.log.server.store.factory/auditlog.cfg b/run-relay/conf/org.apache.ace.log.server.store.factory/auditlog.cfg
index 0ca5ff0..a97a27c 100644
--- a/run-relay/conf/org.apache.ace.log.server.store.factory/auditlog.cfg
+++ b/run-relay/conf/org.apache.ace.log.server.store.factory/auditlog.cfg
@@ -1 +1,3 @@
-name=auditlog
\ No newline at end of file
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
+name=auditlog
diff --git a/run-relay/conf/org.apache.ace.log.server.store.filebased.cfg b/run-relay/conf/org.apache.ace.log.server.store.filebased.cfg
index 292a339..d42b611 100644
--- a/run-relay/conf/org.apache.ace.log.server.store.filebased.cfg
+++ b/run-relay/conf/org.apache.ace.log.server.store.filebased.cfg
@@ -1 +1,3 @@
-MaxEvents=0
\ No newline at end of file
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
+MaxEvents=0
diff --git a/run-relay/conf/org.apache.ace.log.server.task.factory/auditlog.cfg b/run-relay/conf/org.apache.ace.log.server.task.factory/auditlog.cfg
index 6b373d6..a7ace01 100644
--- a/run-relay/conf/org.apache.ace.log.server.task.factory/auditlog.cfg
+++ b/run-relay/conf/org.apache.ace.log.server.task.factory/auditlog.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 # name of log to synchronize
 name = auditlog
 # how to synchronize, can be 'pull' (only receive updates), 'push' (only push updates) or 'pushpull' (2-way update)
diff --git a/run-relay/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg b/run-relay/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg
index f8f283d..c0100b7 100644
--- a/run-relay/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg
+++ b/run-relay/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg
@@ -1,2 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 org.apache.ace.server.servlet.endpoint=/repository
 authentication.enabled = false
diff --git a/run-relay/conf/org.apache.ace.scheduler.cfg b/run-relay/conf/org.apache.ace.scheduler.cfg
index ceafddf..fb15c0e 100644
--- a/run-relay/conf/org.apache.ace.scheduler.cfg
+++ b/run-relay/conf/org.apache.ace.scheduler.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 auditlog = 2000
 # Synchronize the relay logs with the master every 5 seconds...
 org.apache.ace.log.server.task.LogSyncTask = 5000
diff --git a/run-relay/conf/org.apache.ace.server.repository.factory/ace-deployment.cfg b/run-relay/conf/org.apache.ace.server.repository.factory/ace-deployment.cfg
index a5422ce..1cf1f20 100644
--- a/run-relay/conf/org.apache.ace.server.repository.factory/ace-deployment.cfg
+++ b/run-relay/conf/org.apache.ace.server.repository.factory/ace-deployment.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 name=deployment
 customer=apache
-master=false
\ No newline at end of file
+master=false
diff --git a/run-relay/relay.bndrun b/run-relay/relay.bndrun
index 47e198c..942737a 100644
--- a/run-relay/relay.bndrun
+++ b/run-relay/relay.bndrun
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runee: JavaSE-1.6
 -runbundles: org.apache.felix.dependencymanager,\
@@ -49,4 +51,4 @@
 	org.apache.felix.log.maxSize=1000,\
 	launch.keep=true,\
 	launch.storage.dir=bundle-cache
-	
\ No newline at end of file
+	
diff --git a/run-server-allinone/bnd.bnd b/run-server-allinone/bnd.bnd
index a433b7b..38aa298 100644
--- a/run-server-allinone/bnd.bnd
+++ b/run-server-allinone/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -nobundles: true
 Bundle-Name: Apache ACE Run ServerAllInOne
-Bundle-Description: Bnd run project for an ACE deployment including Server, Client and OBR. This projects does not generate any artifacts.
\ No newline at end of file
+Bundle-Description: Bnd run project for an ACE deployment including Server, Client and OBR. This projects does not generate any artifacts.
diff --git a/run-server-allinone/conf/org.apache.ace.client.automation.cfg b/run-server-allinone/conf/org.apache.ace.client.automation.cfg
index 69d3a6f..44b0d2d 100644
--- a/run-server-allinone/conf/org.apache.ace.client.automation.cfg
+++ b/run-server-allinone/conf/org.apache.ace.client.automation.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 registerTargetFilter       = (id=*)
 approveTargetFilter        = (id=*)
 autoApproveTargetFilter    = (id=*)
@@ -8,4 +10,4 @@
 customerName               = apache
 userName				   = d
 hostName                   = http://${org.apache.ace.server}
-endpoint                   = /repository
\ No newline at end of file
+endpoint                   = /repository
diff --git a/run-server-allinone/conf/org.apache.ace.client.repository.cfg b/run-server-allinone/conf/org.apache.ace.client.repository.cfg
index d5ebed3..7a64445 100644
--- a/run-server-allinone/conf/org.apache.ace.client.repository.cfg
+++ b/run-server-allinone/conf/org.apache.ace.client.repository.cfg
Binary files differ
diff --git a/run-server-allinone/conf/org.apache.ace.client.rest.cfg b/run-server-allinone/conf/org.apache.ace.client.rest.cfg
index 16e9f8a..78a840a 100644
--- a/run-server-allinone/conf/org.apache.ace.client.rest.cfg
+++ b/run-server-allinone/conf/org.apache.ace.client.rest.cfg
@@ -1,2 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 org.apache.ace.server.servlet.endpoint=/client
 session.timeout=300
diff --git a/run-server-allinone/conf/org.apache.ace.client.workspace.cfg b/run-server-allinone/conf/org.apache.ace.client.workspace.cfg
index 9b46bc8..a6ee0f2 100644
--- a/run-server-allinone/conf/org.apache.ace.client.workspace.cfg
+++ b/run-server-allinone/conf/org.apache.ace.client.workspace.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 repository.url=http://${org.apache.ace.server}/repository
 user.name=d
 authentication.enabled=false
diff --git a/run-server-allinone/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg b/run-server-allinone/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg
index 99e0203..1195652 100644
--- a/run-server-allinone/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg
+++ b/run-server-allinone/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 repositoryLocation = http://${org.apache.ace.server}/repository
 repositoryCustomer = apache
 repositoryName = user
diff --git a/run-server-allinone/conf/org.apache.ace.connectionfactory/auditlog.cfg b/run-server-allinone/conf/org.apache.ace.connectionfactory/auditlog.cfg
index f757161..40212b6 100644
--- a/run-server-allinone/conf/org.apache.ace.connectionfactory/auditlog.cfg
+++ b/run-server-allinone/conf/org.apache.ace.connectionfactory/auditlog.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 authentication.baseURL = http://${org.apache.ace.server}/auditlog/
 authentication.type = none
 #authentication.user.name = d
diff --git a/run-server-allinone/conf/org.apache.ace.connectionfactory/client.cfg b/run-server-allinone/conf/org.apache.ace.connectionfactory/client.cfg
index 5cb3b67..b2e5631 100644
--- a/run-server-allinone/conf/org.apache.ace.connectionfactory/client.cfg
+++ b/run-server-allinone/conf/org.apache.ace.connectionfactory/client.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 authentication.baseURL = http://${org.apache.ace.server}/client/
 authentication.type = none
 #authentication.user.name = d
diff --git a/run-server-allinone/conf/org.apache.ace.connectionfactory/deployment.cfg b/run-server-allinone/conf/org.apache.ace.connectionfactory/deployment.cfg
index ff33884..710038e 100644
--- a/run-server-allinone/conf/org.apache.ace.connectionfactory/deployment.cfg
+++ b/run-server-allinone/conf/org.apache.ace.connectionfactory/deployment.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 authentication.baseURL = http://${org.apache.ace.server}/deployment/
 authentication.type = none
 #authentication.user.name = d
diff --git a/run-server-allinone/conf/org.apache.ace.connectionfactory/obr.cfg b/run-server-allinone/conf/org.apache.ace.connectionfactory/obr.cfg
index ed27685..5847646 100644
--- a/run-server-allinone/conf/org.apache.ace.connectionfactory/obr.cfg
+++ b/run-server-allinone/conf/org.apache.ace.connectionfactory/obr.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 authentication.baseURL = http://${org.apache.ace.server}/obr/
 authentication.type = none
 #authentication.user.name = d
diff --git a/run-server-allinone/conf/org.apache.ace.connectionfactory/replication.cfg b/run-server-allinone/conf/org.apache.ace.connectionfactory/replication.cfg
index dd1440c..41f559b 100644
--- a/run-server-allinone/conf/org.apache.ace.connectionfactory/replication.cfg
+++ b/run-server-allinone/conf/org.apache.ace.connectionfactory/replication.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 authentication.baseURL = http://${org.apache.ace.server}/replication/
 authentication.type = none
 #authentication.user.name = d
diff --git a/run-server-allinone/conf/org.apache.ace.connectionfactory/repository.cfg b/run-server-allinone/conf/org.apache.ace.connectionfactory/repository.cfg
index 0f72654..f952b40 100644
--- a/run-server-allinone/conf/org.apache.ace.connectionfactory/repository.cfg
+++ b/run-server-allinone/conf/org.apache.ace.connectionfactory/repository.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 authentication.baseURL = http://${org.apache.ace.server}/repository/
 authentication.type = none
 #authentication.user.name = d
diff --git a/run-server-allinone/conf/org.apache.ace.deployment.provider.filebased.cfg b/run-server-allinone/conf/org.apache.ace.deployment.provider.filebased.cfg
index 02d0de1..77bd506 100644
--- a/run-server-allinone/conf/org.apache.ace.deployment.provider.filebased.cfg
+++ b/run-server-allinone/conf/org.apache.ace.deployment.provider.filebased.cfg
@@ -1 +1,3 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 BaseDirectoryName=store
diff --git a/run-server-allinone/conf/org.apache.ace.deployment.provider.repositorybased.cfg b/run-server-allinone/conf/org.apache.ace.deployment.provider.repositorybased.cfg
index aed4324..0d55e34 100644
--- a/run-server-allinone/conf/org.apache.ace.deployment.provider.repositorybased.cfg
+++ b/run-server-allinone/conf/org.apache.ace.deployment.provider.repositorybased.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 url = http://${org.apache.ace.server}/repository
 name = deployment
 customer = apache
diff --git a/run-server-allinone/conf/org.apache.ace.deployment.servlet.agent.cfg b/run-server-allinone/conf/org.apache.ace.deployment.servlet.agent.cfg
index 2f671d2..c63d98b 100644
--- a/run-server-allinone/conf/org.apache.ace.deployment.servlet.agent.cfg
+++ b/run-server-allinone/conf/org.apache.ace.deployment.servlet.agent.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 org.apache.ace.server.servlet.endpoint=/agent
 # OBR settings
 obr.url = http://${org.apache.ace.obr}/obr/
diff --git a/run-server-allinone/conf/org.apache.ace.deployment.servlet.cfg b/run-server-allinone/conf/org.apache.ace.deployment.servlet.cfg
index bb0a00c..1272eb2 100644
--- a/run-server-allinone/conf/org.apache.ace.deployment.servlet.cfg
+++ b/run-server-allinone/conf/org.apache.ace.deployment.servlet.cfg
@@ -1,2 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 org.apache.ace.server.servlet.endpoint=/deployment
 authentication.enabled = false
diff --git a/run-server-allinone/conf/org.apache.ace.discovery.property.cfg b/run-server-allinone/conf/org.apache.ace.discovery.property.cfg
index 9670c97..a937d20 100644
--- a/run-server-allinone/conf/org.apache.ace.discovery.property.cfg
+++ b/run-server-allinone/conf/org.apache.ace.discovery.property.cfg
@@ -1 +1,3 @@
-serverURL = http://${org.apache.ace.server}
\ No newline at end of file
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
+serverURL = http://${org.apache.ace.server}
diff --git a/run-server-allinone/conf/org.apache.ace.gogo.servlet.cfg b/run-server-allinone/conf/org.apache.ace.gogo.servlet.cfg
index 7156f03..ecddb70 100644
--- a/run-server-allinone/conf/org.apache.ace.gogo.servlet.cfg
+++ b/run-server-allinone/conf/org.apache.ace.gogo.servlet.cfg
@@ -1,3 +1,3 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 org.apache.ace.server.servlet.endpoint=/gogo
-
-
diff --git a/run-server-allinone/conf/org.apache.ace.http.redirector.factory/root-to-ace.cfg b/run-server-allinone/conf/org.apache.ace.http.redirector.factory/root-to-ace.cfg
index 884b7a0..7b8f3e4 100644
--- a/run-server-allinone/conf/org.apache.ace.http.redirector.factory/root-to-ace.cfg
+++ b/run-server-allinone/conf/org.apache.ace.http.redirector.factory/root-to-ace.cfg
@@ -1,2 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 org.apache.ace.server.servlet.endpoint=/
 org.apache.ace.webui.vaadin.redirect=/ace/
diff --git a/run-server-allinone/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg b/run-server-allinone/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg
index b38faca..989dfc9 100644
--- a/run-server-allinone/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg
+++ b/run-server-allinone/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 org.apache.ace.server.servlet.endpoint=/auditlog
 name = auditlog
 authentication.enabled = false
diff --git a/run-server-allinone/conf/org.apache.ace.log.server.store.factory/auditlog.cfg b/run-server-allinone/conf/org.apache.ace.log.server.store.factory/auditlog.cfg
index 0ca5ff0..a97a27c 100644
--- a/run-server-allinone/conf/org.apache.ace.log.server.store.factory/auditlog.cfg
+++ b/run-server-allinone/conf/org.apache.ace.log.server.store.factory/auditlog.cfg
@@ -1 +1,3 @@
-name=auditlog
\ No newline at end of file
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
+name=auditlog
diff --git a/run-server-allinone/conf/org.apache.ace.log.server.store.filebased.cfg b/run-server-allinone/conf/org.apache.ace.log.server.store.filebased.cfg
index 292a339..d42b611 100644
--- a/run-server-allinone/conf/org.apache.ace.log.server.store.filebased.cfg
+++ b/run-server-allinone/conf/org.apache.ace.log.server.store.filebased.cfg
@@ -1 +1,3 @@
-MaxEvents=0
\ No newline at end of file
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
+MaxEvents=0
diff --git a/run-server-allinone/conf/org.apache.ace.nodelauncher.amazon.cfg.example b/run-server-allinone/conf/org.apache.ace.nodelauncher.amazon.cfg.example
index b345c19..5308428 100644
--- a/run-server-allinone/conf/org.apache.ace.nodelauncher.amazon.cfg.example
+++ b/run-server-allinone/conf/org.apache.ace.nodelauncher.amazon.cfg.example
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+#
 #
 # Sample configuration file. You need to rename the extension of the file
 # and change some of the placeholders for this configuration to work.
diff --git a/run-server-allinone/conf/org.apache.ace.obr.servlet.cfg b/run-server-allinone/conf/org.apache.ace.obr.servlet.cfg
index 802e92f..24eb9d5 100644
--- a/run-server-allinone/conf/org.apache.ace.obr.servlet.cfg
+++ b/run-server-allinone/conf/org.apache.ace.obr.servlet.cfg
@@ -1,2 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 org.apache.ace.server.servlet.endpoint=/obr
 authentication.enabled = false
diff --git a/run-server-allinone/conf/org.apache.ace.obr.storage.file.cfg b/run-server-allinone/conf/org.apache.ace.obr.storage.file.cfg
index bfdb476..6cb1fa8 100644
--- a/run-server-allinone/conf/org.apache.ace.obr.storage.file.cfg
+++ b/run-server-allinone/conf/org.apache.ace.obr.storage.file.cfg
@@ -1 +1,3 @@
-fileLocation=store
\ No newline at end of file
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
+fileLocation=store
diff --git a/run-server-allinone/conf/org.apache.ace.repository.servlet.RepositoryReplicationServlet.cfg b/run-server-allinone/conf/org.apache.ace.repository.servlet.RepositoryReplicationServlet.cfg
index 384e8ac..4d02aa9 100644
--- a/run-server-allinone/conf/org.apache.ace.repository.servlet.RepositoryReplicationServlet.cfg
+++ b/run-server-allinone/conf/org.apache.ace.repository.servlet.RepositoryReplicationServlet.cfg
@@ -1,2 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 org.apache.ace.server.servlet.endpoint=/replication
 authentication.enabled = false
diff --git a/run-server-allinone/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg b/run-server-allinone/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg
index f8f283d..c0100b7 100644
--- a/run-server-allinone/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg
+++ b/run-server-allinone/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg
@@ -1,2 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 org.apache.ace.server.servlet.endpoint=/repository
 authentication.enabled = false
diff --git a/run-server-allinone/conf/org.apache.ace.scheduler.cfg b/run-server-allinone/conf/org.apache.ace.scheduler.cfg
index 42ca1f3..a5d45d8 100644
--- a/run-server-allinone/conf/org.apache.ace.scheduler.cfg
+++ b/run-server-allinone/conf/org.apache.ace.scheduler.cfg
@@ -1,2 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 auditlog = 2000
-org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask = 2000
\ No newline at end of file
+org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask = 2000
diff --git a/run-server-allinone/conf/org.apache.ace.server.repository.factory/ace-deployment.cfg b/run-server-allinone/conf/org.apache.ace.server.repository.factory/ace-deployment.cfg
index 5f4e672..1572caa 100644
--- a/run-server-allinone/conf/org.apache.ace.server.repository.factory/ace-deployment.cfg
+++ b/run-server-allinone/conf/org.apache.ace.server.repository.factory/ace-deployment.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 name=deployment
 customer=apache
-master=true
\ No newline at end of file
+master=true
diff --git a/run-server-allinone/conf/org.apache.ace.server.repository.factory/ace-shop.cfg b/run-server-allinone/conf/org.apache.ace.server.repository.factory/ace-shop.cfg
index af0383e..303e1e9 100644
--- a/run-server-allinone/conf/org.apache.ace.server.repository.factory/ace-shop.cfg
+++ b/run-server-allinone/conf/org.apache.ace.server.repository.factory/ace-shop.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 name=shop
 customer=apache
 master=true
diff --git a/run-server-allinone/conf/org.apache.ace.server.repository.factory/ace-target.cfg b/run-server-allinone/conf/org.apache.ace.server.repository.factory/ace-target.cfg
index fb43b30..7dfed87 100644
--- a/run-server-allinone/conf/org.apache.ace.server.repository.factory/ace-target.cfg
+++ b/run-server-allinone/conf/org.apache.ace.server.repository.factory/ace-target.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 name=target
 customer=apache
-master=true
\ No newline at end of file
+master=true
diff --git a/run-server-allinone/conf/org.apache.ace.server.repository.factory/ace-user.cfg b/run-server-allinone/conf/org.apache.ace.server.repository.factory/ace-user.cfg
index 75d57e8..9be7db6 100644
--- a/run-server-allinone/conf/org.apache.ace.server.repository.factory/ace-user.cfg
+++ b/run-server-allinone/conf/org.apache.ace.server.repository.factory/ace-user.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 name=user
 customer=apache
 master=true
diff --git a/run-server-allinone/conf/org.apache.ace.webui.vaadin.cfg b/run-server-allinone/conf/org.apache.ace.webui.vaadin.cfg
index 6b12864..20229eb 100644
--- a/run-server-allinone/conf/org.apache.ace.webui.vaadin.cfg
+++ b/run-server-allinone/conf/org.apache.ace.webui.vaadin.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 # The endpoint of the Vaadin UI
 org.apache.ace.server.servlet.init.productionMode = true
 org.apache.ace.server.servlet.endpoint = /ace
diff --git a/run-server-allinone/scripts/addbundles.gogo b/run-server-allinone/scripts/addbundles.gogo
index 034efb8..dfa1397 100644
--- a/run-server-allinone/scripts/addbundles.gogo
+++ b/run-server-allinone/scripts/addbundles.gogo
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+#
 #
 # Creates an additional 100 bundles and 10 configuration files
 #
diff --git a/run-server-allinone/scripts/adddist.gogo b/run-server-allinone/scripts/adddist.gogo
index 128608f..9a5c2fe 100644
--- a/run-server-allinone/scripts/adddist.gogo
+++ b/run-server-allinone/scripts/adddist.gogo
@@ -1,3 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 #
 # Adds some distributions, features and artifacts (based on setup.gogo).
 #
diff --git a/run-server-allinone/scripts/addtargets.gogo b/run-server-allinone/scripts/addtargets.gogo
index 1d8d771..b67da58 100644
--- a/run-server-allinone/scripts/addtargets.gogo
+++ b/run-server-allinone/scripts/addtargets.gogo
@@ -1,3 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 #
 # Creates 10 additional targets, with some tags, and associates them with
 # existing distributions (from setup.gogo).
diff --git a/run-server-allinone/scripts/clear.gogo b/run-server-allinone/scripts/clear.gogo
index 1c84971..741ea87 100644
--- a/run-server-allinone/scripts/clear.gogo
+++ b/run-server-allinone/scripts/clear.gogo
@@ -1,3 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 #
 # Clears a complete workspace, removing all the artifacts it finds. Does not
 # attempt to delete anything from an OBR, just all the metadata in ACE.
diff --git a/run-server-allinone/scripts/setup.gogo b/run-server-allinone/scripts/setup.gogo
index 3d387c7..fed8339 100644
--- a/run-server-allinone/scripts/setup.gogo
+++ b/run-server-allinone/scripts/setup.gogo
@@ -1,3 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 #
 # Sets up a workspace with a collection of entities for testing.
 #
diff --git a/run-server-allinone/scripts/test_perf.gogo b/run-server-allinone/scripts/test_perf.gogo
index 4f2ff6e..efd801b 100644
--- a/run-server-allinone/scripts/test_perf.gogo
+++ b/run-server-allinone/scripts/test_perf.gogo
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+#
 # Simple script to test performance of an ACE server
 #
 # usage : 
diff --git a/run-server-allinone/server-allinone.bndrun b/run-server-allinone/server-allinone.bndrun
index 03b7882..9df35ea 100644
--- a/run-server-allinone/server-allinone.bndrun
+++ b/run-server-allinone/server-allinone.bndrun
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runee: JavaSE-1.6
 -runbundles: org.apache.felix.dependencymanager,\
@@ -80,4 +82,4 @@
 -runvm: -Xmx1G
 
 # Enable Yourkit profiling
-#-runvm: -Xmx1G -agentpath:/Applications/YourKit_Java_Profiler_12.0.5.app/bin/mac/libyjpagent.jnilib
\ No newline at end of file
+#-runvm: -Xmx1G -agentpath:/Applications/YourKit_Java_Profiler_12.0.5.app/bin/mac/libyjpagent.jnilib
diff --git a/run-server/bnd.bnd b/run-server/bnd.bnd
index d16ee49..5acb4cd 100644
--- a/run-server/bnd.bnd
+++ b/run-server/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -nobundles: true
 Bundle-Name: Apache ACE Run Server
-Bundle-Description: Bnd run project for a standard ACE Server. This projects does not generate any artifacts.
\ No newline at end of file
+Bundle-Description: Bnd run project for a standard ACE Server. This projects does not generate any artifacts.
diff --git a/run-server/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg b/run-server/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg
index 99e0203..1195652 100644
--- a/run-server/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg
+++ b/run-server/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 repositoryLocation = http://${org.apache.ace.server}/repository
 repositoryCustomer = apache
 repositoryName = user
diff --git a/run-server/conf/org.apache.ace.connectionfactory/auditlog.cfg b/run-server/conf/org.apache.ace.connectionfactory/auditlog.cfg
index f757161..40212b6 100644
--- a/run-server/conf/org.apache.ace.connectionfactory/auditlog.cfg
+++ b/run-server/conf/org.apache.ace.connectionfactory/auditlog.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 authentication.baseURL = http://${org.apache.ace.server}/auditlog/
 authentication.type = none
 #authentication.user.name = d
diff --git a/run-server/conf/org.apache.ace.connectionfactory/client.cfg b/run-server/conf/org.apache.ace.connectionfactory/client.cfg
index 5cb3b67..b2e5631 100644
--- a/run-server/conf/org.apache.ace.connectionfactory/client.cfg
+++ b/run-server/conf/org.apache.ace.connectionfactory/client.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 authentication.baseURL = http://${org.apache.ace.server}/client/
 authentication.type = none
 #authentication.user.name = d
diff --git a/run-server/conf/org.apache.ace.connectionfactory/deployment.cfg b/run-server/conf/org.apache.ace.connectionfactory/deployment.cfg
index ff33884..710038e 100644
--- a/run-server/conf/org.apache.ace.connectionfactory/deployment.cfg
+++ b/run-server/conf/org.apache.ace.connectionfactory/deployment.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 authentication.baseURL = http://${org.apache.ace.server}/deployment/
 authentication.type = none
 #authentication.user.name = d
diff --git a/run-server/conf/org.apache.ace.connectionfactory/replication.cfg b/run-server/conf/org.apache.ace.connectionfactory/replication.cfg
index dd1440c..41f559b 100644
--- a/run-server/conf/org.apache.ace.connectionfactory/replication.cfg
+++ b/run-server/conf/org.apache.ace.connectionfactory/replication.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 authentication.baseURL = http://${org.apache.ace.server}/replication/
 authentication.type = none
 #authentication.user.name = d
diff --git a/run-server/conf/org.apache.ace.connectionfactory/repository.cfg b/run-server/conf/org.apache.ace.connectionfactory/repository.cfg
index 0f72654..f952b40 100644
--- a/run-server/conf/org.apache.ace.connectionfactory/repository.cfg
+++ b/run-server/conf/org.apache.ace.connectionfactory/repository.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 authentication.baseURL = http://${org.apache.ace.server}/repository/
 authentication.type = none
 #authentication.user.name = d
diff --git a/run-server/conf/org.apache.ace.deployment.provider.repositorybased.cfg b/run-server/conf/org.apache.ace.deployment.provider.repositorybased.cfg
index aed4324..0d55e34 100644
--- a/run-server/conf/org.apache.ace.deployment.provider.repositorybased.cfg
+++ b/run-server/conf/org.apache.ace.deployment.provider.repositorybased.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 url = http://${org.apache.ace.server}/repository
 name = deployment
 customer = apache
diff --git a/run-server/conf/org.apache.ace.deployment.servlet.agent.cfg b/run-server/conf/org.apache.ace.deployment.servlet.agent.cfg
index 2f671d2..c63d98b 100644
--- a/run-server/conf/org.apache.ace.deployment.servlet.agent.cfg
+++ b/run-server/conf/org.apache.ace.deployment.servlet.agent.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 org.apache.ace.server.servlet.endpoint=/agent
 # OBR settings
 obr.url = http://${org.apache.ace.obr}/obr/
diff --git a/run-server/conf/org.apache.ace.deployment.servlet.cfg b/run-server/conf/org.apache.ace.deployment.servlet.cfg
index bb0a00c..1272eb2 100644
--- a/run-server/conf/org.apache.ace.deployment.servlet.cfg
+++ b/run-server/conf/org.apache.ace.deployment.servlet.cfg
@@ -1,2 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 org.apache.ace.server.servlet.endpoint=/deployment
 authentication.enabled = false
diff --git a/run-server/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg b/run-server/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg
index b38faca..989dfc9 100644
--- a/run-server/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg
+++ b/run-server/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 org.apache.ace.server.servlet.endpoint=/auditlog
 name = auditlog
 authentication.enabled = false
diff --git a/run-server/conf/org.apache.ace.log.server.store.factory/auditlog.cfg b/run-server/conf/org.apache.ace.log.server.store.factory/auditlog.cfg
index 0ca5ff0..a97a27c 100644
--- a/run-server/conf/org.apache.ace.log.server.store.factory/auditlog.cfg
+++ b/run-server/conf/org.apache.ace.log.server.store.factory/auditlog.cfg
@@ -1 +1,3 @@
-name=auditlog
\ No newline at end of file
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
+name=auditlog
diff --git a/run-server/conf/org.apache.ace.log.server.store.filebased.cfg b/run-server/conf/org.apache.ace.log.server.store.filebased.cfg
index 292a339..d42b611 100644
--- a/run-server/conf/org.apache.ace.log.server.store.filebased.cfg
+++ b/run-server/conf/org.apache.ace.log.server.store.filebased.cfg
@@ -1 +1,3 @@
-MaxEvents=0
\ No newline at end of file
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
+MaxEvents=0
diff --git a/run-server/conf/org.apache.ace.repository.servlet.RepositoryReplicationServlet.cfg b/run-server/conf/org.apache.ace.repository.servlet.RepositoryReplicationServlet.cfg
index 384e8ac..4d02aa9 100644
--- a/run-server/conf/org.apache.ace.repository.servlet.RepositoryReplicationServlet.cfg
+++ b/run-server/conf/org.apache.ace.repository.servlet.RepositoryReplicationServlet.cfg
@@ -1,2 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 org.apache.ace.server.servlet.endpoint=/replication
 authentication.enabled = false
diff --git a/run-server/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg b/run-server/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg
index f8f283d..c0100b7 100644
--- a/run-server/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg
+++ b/run-server/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg
@@ -1,2 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 org.apache.ace.server.servlet.endpoint=/repository
 authentication.enabled = false
diff --git a/run-server/conf/org.apache.ace.scheduler.cfg b/run-server/conf/org.apache.ace.scheduler.cfg
index 42ca1f3..a5d45d8 100644
--- a/run-server/conf/org.apache.ace.scheduler.cfg
+++ b/run-server/conf/org.apache.ace.scheduler.cfg
@@ -1,2 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 auditlog = 2000
-org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask = 2000
\ No newline at end of file
+org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask = 2000
diff --git a/run-server/conf/org.apache.ace.server.repository.factory/ace-deployment.cfg b/run-server/conf/org.apache.ace.server.repository.factory/ace-deployment.cfg
index 5f4e672..1572caa 100644
--- a/run-server/conf/org.apache.ace.server.repository.factory/ace-deployment.cfg
+++ b/run-server/conf/org.apache.ace.server.repository.factory/ace-deployment.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 name=deployment
 customer=apache
-master=true
\ No newline at end of file
+master=true
diff --git a/run-server/conf/org.apache.ace.server.repository.factory/ace-shop.cfg b/run-server/conf/org.apache.ace.server.repository.factory/ace-shop.cfg
index 75cfc4e..303e1e9 100644
--- a/run-server/conf/org.apache.ace.server.repository.factory/ace-shop.cfg
+++ b/run-server/conf/org.apache.ace.server.repository.factory/ace-shop.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 name=shop
 customer=apache
-master=true
\ No newline at end of file
+master=true
diff --git a/run-server/conf/org.apache.ace.server.repository.factory/ace-target.cfg b/run-server/conf/org.apache.ace.server.repository.factory/ace-target.cfg
index fb43b30..7dfed87 100644
--- a/run-server/conf/org.apache.ace.server.repository.factory/ace-target.cfg
+++ b/run-server/conf/org.apache.ace.server.repository.factory/ace-target.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 name=target
 customer=apache
-master=true
\ No newline at end of file
+master=true
diff --git a/run-server/conf/org.apache.ace.server.repository.factory/ace-user.cfg b/run-server/conf/org.apache.ace.server.repository.factory/ace-user.cfg
index 75d57e8..9be7db6 100644
--- a/run-server/conf/org.apache.ace.server.repository.factory/ace-user.cfg
+++ b/run-server/conf/org.apache.ace.server.repository.factory/ace-user.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 name=user
 customer=apache
 master=true
diff --git a/run-server/server.bndrun b/run-server/server.bndrun
index 8b1912f..3c8fa48 100644
--- a/run-server/server.bndrun
+++ b/run-server/server.bndrun
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runee: JavaSE-1.6
 -runbundles: org.apache.felix.dependencymanager,\
@@ -47,4 +49,4 @@
 	org.apache.felix.log.maxSize=1000,\
 	launch.keep=true,\
 	launch.storage.dir=bundle-cache
-	
\ No newline at end of file
+	
diff --git a/run-target/bnd.bnd b/run-target/bnd.bnd
index e749945..4127f21 100644
--- a/run-target/bnd.bnd
+++ b/run-target/bnd.bnd
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -nobundles: true
 Bundle-Name: Apache ACE Run Target
-Bundle-Description: Bnd run project for a standard ACE Target. This projects does not generate any artifacts.
\ No newline at end of file
+Bundle-Description: Bnd run project for a standard ACE Target. This projects does not generate any artifacts.
diff --git a/run-target/conf/ace.policy b/run-target/conf/ace.policy
index f5d9ebe..dd37de9 100644
--- a/run-target/conf/ace.policy
+++ b/run-target/conf/ace.policy
@@ -1,3 +1,4 @@
+// Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
 // ACE doesn't define a security policy, but supports the creation of one.
 // Add -security when starting the ACE Management Agent to enable this policy file.
diff --git a/run-target/target.bndrun b/run-target/target.bndrun
index bf93c9c..f9996fe 100644
--- a/run-target/target.bndrun
+++ b/run-target/target.bndrun
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
 -runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runee: JavaSE-1.6
 -runbundles:  \
diff --git a/settings.gradle b/settings.gradle
index 89faa60..9d77148 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,6 @@
 /*
+ * Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+ *
  * Master Gradle initialization script
  *
  * Depends on bnd_* values from gradle.properties.