You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by an...@apache.org on 2015/01/25 13:30:40 UTC
karaf git commit: added license header
Repository: karaf
Updated Branches:
refs/heads/master 0f3cbbe6e -> 2ea9a36be
added license header
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/2ea9a36b
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/2ea9a36b
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/2ea9a36b
Branch: refs/heads/master
Commit: 2ea9a36beabb42e0324ec391d4da95aef71be8bf
Parents: 0f3cbbe
Author: anierbeck <bc...@googlemail.com>
Authored: Sun Jan 25 13:30:32 2015 +0100
Committer: anierbeck <bc...@googlemail.com>
Committed: Sun Jan 25 13:30:32 2015 +0100
----------------------------------------------------------------------
.../src/main/asciidoc/users-guide/adociguration.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/cdi.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/console.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/deployers.adoc | 14 ++++++++++++++
.../asciidoc/users-guide/directory-structure.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/ejb.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/enterprise.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/failover.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/features.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/http.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/index.adoc | 14 ++++++++++++++
.../src/main/asciidoc/users-guide/installation.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/instances.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/jdbc.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/jms.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/jndi.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/jpa.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/jta.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/kar.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/log.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/migration.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/monitoring.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/obr.adoc | 14 ++++++++++++++
.../asciidoc/users-guide/provisioning-schema.adoc | 14 ++++++++++++++
.../src/main/asciidoc/users-guide/provisioning.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/remote.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/security.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/start-stop.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/tuning.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/update.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/urls.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/webconsole.adoc | 14 ++++++++++++++
.../src/main/asciidoc/users-guide/webcontainer.adoc | 14 ++++++++++++++
manual/src/main/asciidoc/users-guide/wrapper.adoc | 14 ++++++++++++++
pom.xml | 2 +-
35 files changed, 477 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/adociguration.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/adociguration.adoc b/manual/src/main/asciidoc/users-guide/adociguration.adoc
index c5d48c3..c66a538 100644
--- a/manual/src/main/asciidoc/users-guide/adociguration.adoc
+++ b/manual/src/main/asciidoc/users-guide/adociguration.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= Configuration
== Files
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/cdi.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/cdi.adoc b/manual/src/main/asciidoc/users-guide/cdi.adoc
index b23a148..43b3123 100644
--- a/manual/src/main/asciidoc/users-guide/cdi.adoc
+++ b/manual/src/main/asciidoc/users-guide/cdi.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= CDI
This section described how to add support of CDI, and embed a CDI container in Apache Karaf. It doesn't describe
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/console.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/console.adoc b/manual/src/main/asciidoc/users-guide/console.adoc
index b4d228d..92a6531 100644
--- a/manual/src/main/asciidoc/users-guide/console.adoc
+++ b/manual/src/main/asciidoc/users-guide/console.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= Using the console
== Available commands
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/deployers.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/deployers.adoc b/manual/src/main/asciidoc/users-guide/deployers.adoc
index 2c346eb..34403ff 100644
--- a/manual/src/main/asciidoc/users-guide/deployers.adoc
+++ b/manual/src/main/asciidoc/users-guide/deployers.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= Deployers
The following picture describes the architecture of the deployers.
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/directory-structure.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/directory-structure.adoc b/manual/src/main/asciidoc/users-guide/directory-structure.adoc
index bdd5a91..639cc6a 100644
--- a/manual/src/main/asciidoc/users-guide/directory-structure.adoc
+++ b/manual/src/main/asciidoc/users-guide/directory-structure.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= Directory structure
The directory layout of a Karaf installation is as follows:
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/ejb.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/ejb.adoc b/manual/src/main/asciidoc/users-guide/ejb.adoc
index 4316062..57b742a 100644
--- a/manual/src/main/asciidoc/users-guide/ejb.adoc
+++ b/manual/src/main/asciidoc/users-guide/ejb.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= EJB
This section describes how to add support of EJB in Apache Karaf. It doesn't describe how to develop EJB applications.
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/enterprise.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/enterprise.adoc b/manual/src/main/asciidoc/users-guide/enterprise.adoc
index c2aaefc..a8c54c1 100644
--- a/manual/src/main/asciidoc/users-guide/enterprise.adoc
+++ b/manual/src/main/asciidoc/users-guide/enterprise.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= Enterprise
Apache Karaf provides a set of enterprise class features.
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/failover.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/failover.adoc b/manual/src/main/asciidoc/users-guide/failover.adoc
index fa3f964..680e213 100644
--- a/manual/src/main/asciidoc/users-guide/failover.adoc
+++ b/manual/src/main/asciidoc/users-guide/failover.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= HA/failover and cluster
Apache Karaf natively provides a failover mechanism. It uses a kind of master/slave topology where one instance is active
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/features.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/features.adoc b/manual/src/main/asciidoc/users-guide/features.adoc
index 881e75f..b3cde46 100644
--- a/manual/src/main/asciidoc/users-guide/features.adoc
+++ b/manual/src/main/asciidoc/users-guide/features.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= Features
== Standard Features
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/http.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/http.adoc b/manual/src/main/asciidoc/users-guide/http.adoc
index add8e8e..4a30d80 100644
--- a/manual/src/main/asciidoc/users-guide/http.adoc
+++ b/manual/src/main/asciidoc/users-guide/http.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= Http Service
The Karaf http feature enables the Pax Web implementation of the OSGi HTTPService.
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/index.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/index.adoc b/manual/src/main/asciidoc/users-guide/index.adoc
index a4d1aae..1169960 100644
--- a/manual/src/main/asciidoc/users-guide/index.adoc
+++ b/manual/src/main/asciidoc/users-guide/index.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
Users Guide
===========
Apache Software Foundation
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/installation.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/installation.adoc b/manual/src/main/asciidoc/users-guide/installation.adoc
index df6346c..ee0cc1c 100644
--- a/manual/src/main/asciidoc/users-guide/installation.adoc
+++ b/manual/src/main/asciidoc/users-guide/installation.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= Installation
:doctype: book
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/instances.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/instances.adoc b/manual/src/main/asciidoc/users-guide/instances.adoc
index 877ae59..636245e 100644
--- a/manual/src/main/asciidoc/users-guide/instances.adoc
+++ b/manual/src/main/asciidoc/users-guide/instances.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= Instances
A instance is a complete new Apache Karaf runtime, isolated from the other ones.
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/jdbc.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/jdbc.adoc b/manual/src/main/asciidoc/users-guide/jdbc.adoc
index 798e3e9..bfac7e0 100644
--- a/manual/src/main/asciidoc/users-guide/jdbc.adoc
+++ b/manual/src/main/asciidoc/users-guide/jdbc.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= DataSources (JDBC)
The Apache Karaf DataSources (JDBC) is an optional enterprise feature.
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/jms.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/jms.adoc b/manual/src/main/asciidoc/users-guide/jms.adoc
index 587bd44..276980b 100644
--- a/manual/src/main/asciidoc/users-guide/jms.adoc
+++ b/manual/src/main/asciidoc/users-guide/jms.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= MOM (JMS)
The Apache Karaf MOM (Messaging Oriented Middleware/JMS) is an optional enterprise feature.
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/jndi.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/jndi.adoc b/manual/src/main/asciidoc/users-guide/jndi.adoc
index 33867d8..2537dd2 100644
--- a/manual/src/main/asciidoc/users-guide/jndi.adoc
+++ b/manual/src/main/asciidoc/users-guide/jndi.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= Naming (JNDI)
The Apache Karaf Naming (JNDI) is an optional enterprise feature.
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/jpa.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/jpa.adoc b/manual/src/main/asciidoc/users-guide/jpa.adoc
index 6baf4e7..7edfa1d 100644
--- a/manual/src/main/asciidoc/users-guide/jpa.adoc
+++ b/manual/src/main/asciidoc/users-guide/jpa.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= Persistence (JPA)
Apache Karaf provides JPA persistence providers (such as Apache OpenJPA) to be easy to use (in a OSGi way) and provide
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/jta.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/jta.adoc b/manual/src/main/asciidoc/users-guide/jta.adoc
index e8f473b..137b809 100644
--- a/manual/src/main/asciidoc/users-guide/jta.adoc
+++ b/manual/src/main/asciidoc/users-guide/jta.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= Transaction (JTA)
Apache Karaf provides container managed transactions, available as OSGi services.
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/kar.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/kar.adoc b/manual/src/main/asciidoc/users-guide/kar.adoc
index 12f2ff0..c5d2f47 100644
--- a/manual/src/main/asciidoc/users-guide/kar.adoc
+++ b/manual/src/main/asciidoc/users-guide/kar.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= KAR
As described in the [Provisioning section|provisioning], Apache Karaf features describe applications.
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/log.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/log.adoc b/manual/src/main/asciidoc/users-guide/log.adoc
index 07db14a..95c3304 100644
--- a/manual/src/main/asciidoc/users-guide/log.adoc
+++ b/manual/src/main/asciidoc/users-guide/log.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= Log
Apache Karaf provides a very dynamic and powerful logging system.
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/migration.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/migration.adoc b/manual/src/main/asciidoc/users-guide/migration.adoc
index 57091a4..f4d30a1 100644
--- a/manual/src/main/asciidoc/users-guide/migration.adoc
+++ b/manual/src/main/asciidoc/users-guide/migration.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= Migration from Karaf 2.x to 3.x
This section shows the necessary changes you have to consider when upgrading karaf.
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/monitoring.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/monitoring.adoc b/manual/src/main/asciidoc/users-guide/monitoring.adoc
index ab940b2..7afcf4b 100644
--- a/manual/src/main/asciidoc/users-guide/monitoring.adoc
+++ b/manual/src/main/asciidoc/users-guide/monitoring.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= Monitoring and Management using JMX
Apache Karaf provides a complete JMX layer.
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/obr.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/obr.adoc b/manual/src/main/asciidoc/users-guide/obr.adoc
index 60e6542..ce40226 100644
--- a/manual/src/main/asciidoc/users-guide/obr.adoc
+++ b/manual/src/main/asciidoc/users-guide/obr.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= OBR
The goal of OBR (OSGi Bundle Repository) is:
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/provisioning-schema.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/provisioning-schema.adoc b/manual/src/main/asciidoc/users-guide/provisioning-schema.adoc
index ea45211..41af73a 100644
--- a/manual/src/main/asciidoc/users-guide/provisioning-schema.adoc
+++ b/manual/src/main/asciidoc/users-guide/provisioning-schema.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= Features XML Schemas (provisioning)
Apache Karaf 3.0.0 supports different versions of the features XML schemas.
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/provisioning.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/provisioning.adoc b/manual/src/main/asciidoc/users-guide/provisioning.adoc
index 1c3f5f7..32449d7 100644
--- a/manual/src/main/asciidoc/users-guide/provisioning.adoc
+++ b/manual/src/main/asciidoc/users-guide/provisioning.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= Provisioning
Apache Karaf is OSGi powered container.
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/remote.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/remote.adoc b/manual/src/main/asciidoc/users-guide/remote.adoc
index 250515f..05fe439 100644
--- a/manual/src/main/asciidoc/users-guide/remote.adoc
+++ b/manual/src/main/asciidoc/users-guide/remote.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= Remote
Apache Karaf supports a complete remote mechanism allowing you to remotely connect to a running Apache Karaf instance.
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/security.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/security.adoc b/manual/src/main/asciidoc/users-guide/security.adoc
index 04f18f2..072400e 100644
--- a/manual/src/main/asciidoc/users-guide/security.adoc
+++ b/manual/src/main/asciidoc/users-guide/security.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= Security
Apache Karaf provides an advanced and flexible security system, powered by JAAS (Java Authentication and Authorization
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/start-stop.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/start-stop.adoc b/manual/src/main/asciidoc/users-guide/start-stop.adoc
index e9b4dcb..984d1dd 100644
--- a/manual/src/main/asciidoc/users-guide/start-stop.adoc
+++ b/manual/src/main/asciidoc/users-guide/start-stop.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= Start, stop, restart, connect
== Start
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/tuning.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/tuning.adoc b/manual/src/main/asciidoc/users-guide/tuning.adoc
index 7fec318..ea71304 100644
--- a/manual/src/main/asciidoc/users-guide/tuning.adoc
+++ b/manual/src/main/asciidoc/users-guide/tuning.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= Tuning
== Garbage Collection
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/update.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/update.adoc b/manual/src/main/asciidoc/users-guide/update.adoc
index c2c230c..2b0217b 100644
--- a/manual/src/main/asciidoc/users-guide/update.adoc
+++ b/manual/src/main/asciidoc/users-guide/update.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= Update procedure
== From Karaf 3.0.x to Karaf 3.0.x
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/urls.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/urls.adoc b/manual/src/main/asciidoc/users-guide/urls.adoc
index 6bb72cb..481cb49 100644
--- a/manual/src/main/asciidoc/users-guide/urls.adoc
+++ b/manual/src/main/asciidoc/users-guide/urls.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= Artifacts repositories and URLs
// TODO temp
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/webconsole.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/webconsole.adoc b/manual/src/main/asciidoc/users-guide/webconsole.adoc
index 38d4b7e..bc35816 100644
--- a/manual/src/main/asciidoc/users-guide/webconsole.adoc
+++ b/manual/src/main/asciidoc/users-guide/webconsole.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= WebConsole
Apache Karaf provides an optional WebConsole.
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/webcontainer.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/webcontainer.adoc b/manual/src/main/asciidoc/users-guide/webcontainer.adoc
index acede29..8a2dbc7 100644
--- a/manual/src/main/asciidoc/users-guide/webcontainer.adoc
+++ b/manual/src/main/asciidoc/users-guide/webcontainer.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= WebContainer (JSP/Servlet)
Apache Karaf can act a complete WebContainer, fully supporting JSP/Servlet specification.
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/manual/src/main/asciidoc/users-guide/wrapper.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/users-guide/wrapper.adoc b/manual/src/main/asciidoc/users-guide/wrapper.adoc
index 2765259..d3ea788 100644
--- a/manual/src/main/asciidoc/users-guide/wrapper.adoc
+++ b/manual/src/main/asciidoc/users-guide/wrapper.adoc
@@ -1,3 +1,17 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
= Integration in the operating system: the Service Wrapper
In the previous chapter, we saw the different scripts and commands to start, stop, restart Apache Karaf.
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea9a36b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 139e019..7cd141a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -234,7 +234,7 @@
<pax.logging.version>1.8.1</pax.logging.version>
<pax.base.version>1.5.0</pax.base.version>
<pax.url.version>2.3.0</pax.url.version>
- <pax.web.version>4.0.0</pax.web.version>
+ <pax.web.version>4.1.0-SNAPSHOT</pax.web.version>
<pax.tinybundle.version>2.1.0</pax.tinybundle.version>
<portlet-api.version>2.0</portlet-api.version>
<slf4j.version>1.7.7</slf4j.version>