Add incubator disclaimer to NOTICE files and License headers to poms and property files (FELIX-144).
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@469157 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/etc/all.policy b/framework/etc/all.policy
index dc85222..3511a6c 100644
--- a/framework/etc/all.policy
+++ b/framework/etc/all.policy
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
grant {
permission java.security.AllPermission;
};
diff --git a/framework/etc/config.properties.gui b/framework/etc/config.properties.gui
index fb62d12..bcf5158 100644
--- a/framework/etc/config.properties.gui
+++ b/framework/etc/config.properties.gui
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
felix.auto.start.1=file:bundle/shell.jar file:bundle/tablelayout.jar \
file:bundle/shellgui.jar file:bundle/shellplugin.jar \
file:bundle/bundlerepository.jar
diff --git a/framework/etc/config.properties.text b/framework/etc/config.properties.text
index 0486a4d..19a2976 100644
--- a/framework/etc/config.properties.text
+++ b/framework/etc/config.properties.text
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
felix.auto.start.1=file:bundle/shell.jar file:bundle/shelltui.jar \
file:bundle/bundlerepository.jar
diff --git a/framework/etc/example.policy b/framework/etc/example.policy
index 961318a..1c8a7cf 100644
--- a/framework/etc/example.policy
+++ b/framework/etc/example.policy
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
grant codeBase "file:bundle/shellgui.jar" {
permission org.osgi.framework.ServicePermission "org.ungoverned.osgi.bundle.shellgui.Plugin", "get";
};
diff --git a/framework/etc/felix.bat b/framework/etc/felix.bat
index ed82503..2fd52ef 100644
--- a/framework/etc/felix.bat
+++ b/framework/etc/felix.bat
@@ -1,16 +1,33 @@
-@echo off
-
-rem
-rem The following 'set' command should be automatically
-rem assigned during install, if not, edit it to reflect
-rem your Java installation.
-rem
-
-set JAVA_HOME="%%Java directory%%"
-
-rem
-rem You do not need to edit the following.
-rem
-
-%JAVA_HOME%\bin\java -jar lib\felix.jar
-
+@echo off
+
+rem Licensed to the Apache Software Foundation (ASF) under one
+rem or more contributor license agreements. See the NOTICE file
+rem distributed with this work for additional information
+rem regarding copyright ownership. The ASF licenses this file
+rem to you under the Apache License, Version 2.0 (the
+rem "License"); you may not use this file except in compliance
+rem with the License. You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing,
+rem software distributed under the License is distributed on an
+rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+rem KIND, either express or implied. See the License for the
+rem specific language governing permissions and limitations
+rem under the License.
+
+rem
+rem The following 'set' command should be automatically
+rem assigned during install, if not, edit it to reflect
+rem your Java installation.
+rem
+
+set JAVA_HOME="%%Java directory%%"
+
+rem
+rem You do not need to edit the following.
+rem
+
+%JAVA_HOME%\bin\java -jar lib\felix.jar
+
diff --git a/framework/etc/felix.sh b/framework/etc/felix.sh
index 9ec3e09..b71d4de 100644
--- a/framework/etc/felix.sh
+++ b/framework/etc/felix.sh
@@ -1,5 +1,22 @@
#!/bin/sh
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
#
# The following variable should be automatically
# assigned during install, if not, edit it to reflect
diff --git a/framework/pom.xml b/framework/pom.xml
index 268f5fd..4a21c7b 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -1,3 +1,21 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project>
<parent>
<groupId>org.apache.felix</groupId>
diff --git a/framework/src/main/java/org/apache/felix/framework/Felix.java b/framework/src/main/java/org/apache/felix/framework/Felix.java
index f64a2ab..f8c8e1d 100644
--- a/framework/src/main/java/org/apache/felix/framework/Felix.java
+++ b/framework/src/main/java/org/apache/felix/framework/Felix.java
@@ -20,7 +20,6 @@
import java.io.*;
import java.net.URL;
-import java.net.URLConnection;
import java.net.URLStreamHandler;
import java.security.CodeSource;
import java.security.ProtectionDomain;
diff --git a/framework/src/main/resources/NOTICE b/framework/src/main/resources/NOTICE
index d686177..ef7a957 100644
--- a/framework/src/main/resources/NOTICE
+++ b/framework/src/main/resources/NOTICE
@@ -1,5 +1,15 @@
Apache Felix Framework
Copyright 2006 The Apache Software Foundation
+Apache Felix is an effort undergoing incubation at
+The Apache Software Foundation (ASF). Incubation is
+required of all newly accepted projects until a further
+review indicates that the infrastructure, communications,
+and decision making process have stabilized in a manner
+consistent with other successful ASF projects. While
+incubation status is not necessarily a reflection of the
+completeness or stability of the code, it does indicate
+that the project has yet to be fully endorsed by the ASF.
+
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).