Updated Branches: refs/heads/karaf-2.x 1a46c17f6 -> 9d6a8234c
[KARAF-2723] Upgrade to maven-rat-plugin 0.10 and fix issues detected by rat Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/9d6a8234 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9d6a8234 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9d6a8234 Branch: refs/heads/karaf-2.x Commit: 9d6a8234c2293d44ef635fa452c1a75799928d01 Parents: 1a46c17 Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu Jan 23 06:38:37 2014 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Jan 23 06:38:37 2014 +0100 ---------------------------------------------------------------------- .../src/main/distribution/text/etc/jmx.acl.cfg | 19 +++++++++++++++++++ .../text/etc/jmx.acl.java.lang.Memory.cfg | 19 +++++++++++++++++++ .../text/etc/jmx.acl.org.apache.karaf.bundle.cfg | 19 +++++++++++++++++++ .../text/etc/jmx.acl.org.apache.karaf.config.cfg | 19 +++++++++++++++++++ .../jmx.acl.org.apache.karaf.security.jmx.cfg | 19 +++++++++++++++++++ .../text/etc/jmx.acl.osgi.compendium.cm.cfg | 19 +++++++++++++++++++ .../jaas/modules/properties/test.properties | 19 +++++++++++++++++++ .../karaf/jdbc/internal/datasource-db2.xml | 16 ++++++++++++++++ .../karaf/jdbc/internal/datasource-derby.xml | 16 ++++++++++++++++ .../karaf/jdbc/internal/datasource-generic.xml | 16 ++++++++++++++++ .../apache/karaf/jdbc/internal/datasource-h2.xml | 16 ++++++++++++++++ .../karaf/jdbc/internal/datasource-hsql.xml | 16 ++++++++++++++++ .../karaf/jdbc/internal/datasource-mysql.xml | 16 ++++++++++++++++ .../karaf/jdbc/internal/datasource-oracle.xml | 16 ++++++++++++++++ .../karaf/jdbc/internal/datasource-postgres.xml | 16 ++++++++++++++++ .../jms/internal/connectionfactory-activemq.xml | 16 ++++++++++++++++ .../internal/connectionfactory-webspheremq.xml | 16 ++++++++++++++++ pom.xml | 2 +- .../shell/console/jline/DelayedStarted.java | 18 ++++++++++++++++++ .../META-INF/services/org/jledit/simple | 16 ++++++++++++++++ .../features/AddFeaturesToRepoMojoTest.java | 18 ++++++++++++++++++ 21 files changed, 346 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/9d6a8234/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.cfg ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.cfg b/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.cfg index 3032298..ec42f3d 100644 --- a/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.cfg +++ b/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.cfg @@ -1,3 +1,22 @@ +################################################################################ +# +# 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. +# +################################################################################ + # # Generic JMX ACL # http://git-wip-us.apache.org/repos/asf/karaf/blob/9d6a8234/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.java.lang.Memory.cfg ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.java.lang.Memory.cfg b/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.java.lang.Memory.cfg index 008191e..a58bcf5 100644 --- a/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.java.lang.Memory.cfg +++ b/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.java.lang.Memory.cfg @@ -1,3 +1,22 @@ +################################################################################ +# +# 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. +# +################################################################################ + # # JMX ACL specific to the java.lang.Memory MBean # http://git-wip-us.apache.org/repos/asf/karaf/blob/9d6a8234/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.org.apache.karaf.bundle.cfg ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.org.apache.karaf.bundle.cfg b/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.org.apache.karaf.bundle.cfg index 95c2033..b8ba95a 100644 --- a/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.org.apache.karaf.bundle.cfg +++ b/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.org.apache.karaf.bundle.cfg @@ -1,3 +1,22 @@ +################################################################################ +# +# 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. +# +################################################################################ + # # JMX ACL specific to the org.apache.karaf:type=bundle,name=* MBean which maps to the Karaf MBean # to control OSGi bundles. http://git-wip-us.apache.org/repos/asf/karaf/blob/9d6a8234/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.org.apache.karaf.config.cfg ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.org.apache.karaf.config.cfg b/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.org.apache.karaf.config.cfg index 24266cf..e6df22b 100644 --- a/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.org.apache.karaf.config.cfg +++ b/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.org.apache.karaf.config.cfg @@ -1,3 +1,22 @@ +################################################################################ +# +# 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. +# +################################################################################ + # # JMX ACL specific to the org.apache.karaf:type=config,name=* MBean which maps to the Karaf MBean to interact with the # OSGi Config Admin service. http://git-wip-us.apache.org/repos/asf/karaf/blob/9d6a8234/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.org.apache.karaf.security.jmx.cfg ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.org.apache.karaf.security.jmx.cfg b/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.org.apache.karaf.security.jmx.cfg index 2cb5804..0af2c96 100644 --- a/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.org.apache.karaf.security.jmx.cfg +++ b/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.org.apache.karaf.security.jmx.cfg @@ -1,3 +1,22 @@ +################################################################################ +# +# 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. +# +################################################################################ + # # JMX ACL specific to the org.apache.karaf:type=security,area=jmx MBean which # can be used to find out whether the currently logged in JMX user can invoke http://git-wip-us.apache.org/repos/asf/karaf/blob/9d6a8234/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.osgi.compendium.cm.cfg ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.osgi.compendium.cm.cfg b/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.osgi.compendium.cm.cfg index e549251..345d7b9 100644 --- a/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.osgi.compendium.cm.cfg +++ b/assemblies/apache-karaf/src/main/distribution/text/etc/jmx.acl.osgi.compendium.cm.cfg @@ -1,3 +1,22 @@ +################################################################################ +# +# 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. +# +################################################################################ + # # JMX ACL specific to osgi.compendium.cm MBean # http://git-wip-us.apache.org/repos/asf/karaf/blob/9d6a8234/jaas/modules/src/test/resources/org/apache/karaf/jaas/modules/properties/test.properties ---------------------------------------------------------------------- diff --git a/jaas/modules/src/test/resources/org/apache/karaf/jaas/modules/properties/test.properties b/jaas/modules/src/test/resources/org/apache/karaf/jaas/modules/properties/test.properties index 801d4ff..7d16e5b 100644 --- a/jaas/modules/src/test/resources/org/apache/karaf/jaas/modules/properties/test.properties +++ b/jaas/modules/src/test/resources/org/apache/karaf/jaas/modules/properties/test.properties @@ -1 +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. +# +################################################################################ + test=test,test \ No newline at end of file http://git-wip-us.apache.org/repos/asf/karaf/blob/9d6a8234/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-db2.xml ---------------------------------------------------------------------- diff --git a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-db2.xml b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-db2.xml index 46128ab..6ae8ea8 100644 --- a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-db2.xml +++ b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-db2.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version + 2.0 (the "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 Unless required by + applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + CONDITIONS OF ANY KIND, either express or implied. See the License for + the specific language governing permissions and limitations under the + License. + --> <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";> <bean id="dataSource" class="com.ibm.db2.jcc.DB2DataSource"> http://git-wip-us.apache.org/repos/asf/karaf/blob/9d6a8234/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-derby.xml ---------------------------------------------------------------------- diff --git a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-derby.xml b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-derby.xml index cd088dd..13e3e7f 100644 --- a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-derby.xml +++ b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-derby.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version + 2.0 (the "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 Unless required by + applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + CONDITIONS OF ANY KIND, either express or implied. See the License for + the specific language governing permissions and limitations under the + License. + --> <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; default-activation="eager"> http://git-wip-us.apache.org/repos/asf/karaf/blob/9d6a8234/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-generic.xml ---------------------------------------------------------------------- diff --git a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-generic.xml b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-generic.xml index d64405f..286d82c 100644 --- a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-generic.xml +++ b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-generic.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version + 2.0 (the "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 Unless required by + applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + CONDITIONS OF ANY KIND, either express or implied. See the License for + the specific language governing permissions and limitations under the + License. + --> <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";> <bean id="dataSource" destroy-method="close" class="org.apache.commons.dbcp.BasicDataSource"> http://git-wip-us.apache.org/repos/asf/karaf/blob/9d6a8234/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-h2.xml ---------------------------------------------------------------------- diff --git a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-h2.xml b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-h2.xml index 9fd9d1d..ff93e32 100644 --- a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-h2.xml +++ b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-h2.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version + 2.0 (the "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 Unless required by + applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + CONDITIONS OF ANY KIND, either express or implied. See the License for + the specific language governing permissions and limitations under the + License. + --> <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";> <bean id="dataSource" class="org.h2.jdbcx.JdbcDataSource"> http://git-wip-us.apache.org/repos/asf/karaf/blob/9d6a8234/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-hsql.xml ---------------------------------------------------------------------- diff --git a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-hsql.xml b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-hsql.xml index 28fa3ea..3609661 100644 --- a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-hsql.xml +++ b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-hsql.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version + 2.0 (the "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 Unless required by + applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + CONDITIONS OF ANY KIND, either express or implied. See the License for + the specific language governing permissions and limitations under the + License. + --> <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";> <bean id="dataSource" class="org.hsqldb.jdbc.JDBCDataSource"> http://git-wip-us.apache.org/repos/asf/karaf/blob/9d6a8234/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-mysql.xml ---------------------------------------------------------------------- diff --git a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-mysql.xml b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-mysql.xml index 3768cb6..203e039 100644 --- a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-mysql.xml +++ b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-mysql.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version + 2.0 (the "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 Unless required by + applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + CONDITIONS OF ANY KIND, either express or implied. See the License for + the specific language governing permissions and limitations under the + License. + --> <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";> <bean id="dataSource" class="com.mysql.jdbc.jdbc2.optional.MysqlDataSource"> http://git-wip-us.apache.org/repos/asf/karaf/blob/9d6a8234/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-oracle.xml ---------------------------------------------------------------------- diff --git a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-oracle.xml b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-oracle.xml index f9305de..d9e8853 100644 --- a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-oracle.xml +++ b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-oracle.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version + 2.0 (the "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 Unless required by + applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + CONDITIONS OF ANY KIND, either express or implied. See the License for + the specific language governing permissions and limitations under the + License. + --> <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";> <bean id="dataSource" class="oracle.jdbc.pool.OracleDataSource"> http://git-wip-us.apache.org/repos/asf/karaf/blob/9d6a8234/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-postgres.xml ---------------------------------------------------------------------- diff --git a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-postgres.xml b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-postgres.xml index 8599210..c9d2bcb 100644 --- a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-postgres.xml +++ b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-postgres.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version + 2.0 (the "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 Unless required by + applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + CONDITIONS OF ANY KIND, either express or implied. See the License for + the specific language governing permissions and limitations under the + License. + --> <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";> <bean id="dataSource" class="org.postgresql.ds.PGPoolingDataSource" destroy-method="close"> http://git-wip-us.apache.org/repos/asf/karaf/blob/9d6a8234/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-activemq.xml ---------------------------------------------------------------------- diff --git a/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-activemq.xml b/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-activemq.xml index 0201989..53d73cc 100644 --- a/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-activemq.xml +++ b/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-activemq.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version + 2.0 (the "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 Unless required by + applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + CONDITIONS OF ANY KIND, either express or implied. See the License for + the specific language governing permissions and limitations under the + License. + --> <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";> <bean id="activemqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory"> http://git-wip-us.apache.org/repos/asf/karaf/blob/9d6a8234/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-webspheremq.xml ---------------------------------------------------------------------- diff --git a/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-webspheremq.xml b/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-webspheremq.xml index 4650237..347a7c6 100644 --- a/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-webspheremq.xml +++ b/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-webspheremq.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version + 2.0 (the "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 Unless required by + applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + CONDITIONS OF ANY KIND, either express or implied. See the License for + the specific language governing permissions and limitations under the + License. + --> <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";> <bean id="wmqConnectionFactory" class="com.ibm.mq.jms.MQQueueConnectionFactory"> http://git-wip-us.apache.org/repos/asf/karaf/blob/9d6a8234/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1d65ebd..cde332a 100644 --- a/pom.xml +++ b/pom.xml @@ -1589,7 +1589,7 @@ <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <version>0.8</version> + <version>0.10</version> <executions> <execution> <phase>verify</phase> http://git-wip-us.apache.org/repos/asf/karaf/blob/9d6a8234/shell/console/src/main/java/org/apache/karaf/shell/console/jline/DelayedStarted.java ---------------------------------------------------------------------- diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/jline/DelayedStarted.java b/shell/console/src/main/java/org/apache/karaf/shell/console/jline/DelayedStarted.java index de68144..2a035fa 100644 --- a/shell/console/src/main/java/org/apache/karaf/shell/console/jline/DelayedStarted.java +++ b/shell/console/src/main/java/org/apache/karaf/shell/console/jline/DelayedStarted.java @@ -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. + */ package org.apache.karaf.shell.console.jline; import java.io.InputStream; http://git-wip-us.apache.org/repos/asf/karaf/blob/9d6a8234/shell/console/src/main/resources/META-INF/services/org/jledit/simple ---------------------------------------------------------------------- diff --git a/shell/console/src/main/resources/META-INF/services/org/jledit/simple b/shell/console/src/main/resources/META-INF/services/org/jledit/simple index 9e58ccc..29939ba 100644 --- a/shell/console/src/main/resources/META-INF/services/org/jledit/simple +++ b/shell/console/src/main/resources/META-INF/services/org/jledit/simple @@ -1 +1,17 @@ +##--------------------------------------------------------------------------- +## 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. +##--------------------------------------------------------------------------- org.jledit.simple.SimpleConsoleEditor \ No newline at end of file http://git-wip-us.apache.org/repos/asf/karaf/blob/9d6a8234/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojoTest.java ---------------------------------------------------------------------- diff --git a/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojoTest.java b/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojoTest.java index 3734a88..98ab8c9 100644 --- a/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojoTest.java +++ b/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojoTest.java @@ -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. + */ package org.apache.karaf.tooling.features; import org.apache.maven.artifact.Artifact;
