You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/07/12 17:19:59 UTC
svn commit: r1360720 [1/2] - in /karaf/trunk: ./
archetypes/assembly/src/main/resources/archetype-resources/
archetypes/assembly/src/test/resources/projects/assembly/
archetypes/blueprint/src/main/resources/archetype-resources/
archetypes/blueprint/src...
Author: jbonofre
Date: Thu Jul 12 15:19:57 2012
New Revision: 1360720
URL: http://svn.apache.org/viewvc?rev=1360720&view=rev
Log:
[KARAF-1624] Fix RAT check failures
Modified:
karaf/trunk/archetypes/assembly/src/main/resources/archetype-resources/pom.xml
karaf/trunk/archetypes/assembly/src/test/resources/projects/assembly/archetype.properties
karaf/trunk/archetypes/blueprint/src/main/resources/archetype-resources/pom.xml
karaf/trunk/archetypes/blueprint/src/main/resources/archetype-resources/src/main/java/MyService.java
karaf/trunk/archetypes/blueprint/src/main/resources/archetype-resources/src/main/java/MyServiceImpl.java
karaf/trunk/archetypes/blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/my-service.xml
karaf/trunk/archetypes/blueprint/src/test/resources/projects/blueprint/archetype.properties
karaf/trunk/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
karaf/trunk/archetypes/bundle/src/main/resources/archetype-resources/src/main/java/Activator.java
karaf/trunk/archetypes/bundle/src/test/resources/projects/bundle/archetype.properties
karaf/trunk/archetypes/command/src/main/resources/archetype-resources/pom.xml
karaf/trunk/archetypes/command/src/main/resources/archetype-resources/src/test/java/__command__Test.java
karaf/trunk/archetypes/command/src/test/resources/projects/command/archetype.properties
karaf/trunk/archetypes/feature/src/main/resources/archetype-resources/pom.xml
karaf/trunk/archetypes/feature/src/main/resources/archetype-resources/src/main/feature/feature.xml
karaf/trunk/archetypes/feature/src/test/resources/projects/feature/archetype.properties
karaf/trunk/archetypes/kar/src/main/resources/archetype-resources/pom.xml
karaf/trunk/archetypes/kar/src/main/resources/archetype-resources/src/main/feature/feature.xml
karaf/trunk/archetypes/kar/src/test/resources/projects/kar/archetype.properties
karaf/trunk/assemblies/apache-karaf/src/main/resources/extra/jetty.xml
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.features.repos.cfg
karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/MavenConfigService.java
karaf/trunk/client/src/main/java/org/apache/karaf/client/ClientConfig.java
karaf/trunk/client/src/main/java/org/slf4j/impl/SimpleLoggerFactory.java
karaf/trunk/client/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
karaf/trunk/demos/deployer/kar/src/main/resources/features.xml
karaf/trunk/demos/deployer/kar/src/main/resources/maven-metadata-local.xml
karaf/trunk/deployer/kar/src/test/resources/badFeaturesXml.xml
karaf/trunk/deployer/kar/src/test/resources/goodKarFile/org/foo/goodFeaturesXml.xml
karaf/trunk/deployer/kar/src/test/resources/karFileAsZip/org/foo/goodFeaturesXml.xml
karaf/trunk/deployer/kar/src/test/resources/karFileAsZipNoManifest/org/foo/goodFeaturesXml.xml
karaf/trunk/deployer/kar/src/test/resources/log4j.properties
karaf/trunk/deployer/kar/src/test/resources/malformedXml.xml
karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/completers/AvailableRepoNameCompleter.java
karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f01.xml
karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f02.xml
karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f03.xml
karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f04.xml
karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f05.xml
karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/repo1.xml
karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/ServletService.java
karaf/trunk/instance/core/src/test/resources/etc/startup.properties
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/RealmCompleter.java
karaf/trunk/jaas/jasypt/src/test/resources/org/apache/karaf/jaas/jasypt/handler/test.xml
karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/FeatureDetector.java
karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/Kar.java
karaf/trunk/main/src/main/java/org/apache/karaf/main/BundleInfo.java
karaf/trunk/main/src/main/java/org/apache/karaf/main/ConfigProperties.java
karaf/trunk/main/src/main/java/org/apache/karaf/main/InstanceHelper.java
karaf/trunk/main/src/main/java/org/apache/karaf/main/KarafActivatorManager.java
karaf/trunk/main/src/main/java/org/apache/karaf/main/ShutdownSocketThread.java
karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/LockCallBack.java
karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/LockFactory.java
karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/LockManager.java
karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/NoLock.java
karaf/trunk/main/src/main/java/org/apache/karaf/main/util/ArtifactResolver.java
karaf/trunk/main/src/test/resources/test-karaf-home/system/org/apache/karaf/features/framework/1.0.0/framework-1.0.0-features.xml
karaf/trunk/manual/pom.xml
karaf/trunk/obr/command/src/test/java/org/apache/karaf/obr/command/ListCommandTest.java
karaf/trunk/package/core/src/test/java/org/apache/karaf/packages/core/InstallMBeantest.java
karaf/trunk/pom.xml
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/PojoInfoProvider.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/CommandWithAction.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/HelpOption.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaData.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaDataFactory.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/CommandSessionHolder.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Console.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/SessionProperties.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleFactoryService.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/KarafFileHistory.java
karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommand.java
karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshClientFactory.java
karaf/trunk/shell/ssh/src/test/resources/org/apache/karaf/shell/ssh/authorized_keys
karaf/trunk/system/command/src/main/java/org/apache/karaf/system/commands/AbstractSystemAction.java
karaf/trunk/system/core/src/test/resources/etc/system.properties
karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/InternalKarafDistributionConfigurationOption.java
karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/Runner.java
karaf/trunk/tooling/exam/container/src/main/resources/META-INF/versions.properties
karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionBaseConfigurationOption.java
karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/Backward224Test.java
karaf/trunk/tooling/karaf-maven-plugin/src/test/resources/input-features.xml
karaf/trunk/util/src/main/java/org/apache/karaf/util/CommandUtils.java
karaf/trunk/util/src/main/java/org/apache/karaf/util/StreamUtils.java
karaf/trunk/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/WebDetail.java
Modified: karaf/trunk/archetypes/assembly/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/assembly/src/main/resources/archetype-resources/pom.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/archetypes/assembly/src/main/resources/archetype-resources/pom.xml (original)
+++ karaf/trunk/archetypes/assembly/src/main/resources/archetype-resources/pom.xml Thu Jul 12 15:19:57 2012
@@ -1,6 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
<modelVersion>4.0.0</modelVersion>
<groupId>${groupId}</groupId>
Modified: karaf/trunk/archetypes/assembly/src/test/resources/projects/assembly/archetype.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/assembly/src/test/resources/projects/assembly/archetype.properties?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/archetypes/assembly/src/test/resources/projects/assembly/archetype.properties (original)
+++ karaf/trunk/archetypes/assembly/src/test/resources/projects/assembly/archetype.properties Thu Jul 12 15:19:57 2012
@@ -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.
+#
+################################################################################
+
groupId=archetype.it
artifactId=assembly
version=0.1-SNAPSHOT
Modified: karaf/trunk/archetypes/blueprint/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/blueprint/src/main/resources/archetype-resources/pom.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/archetypes/blueprint/src/main/resources/archetype-resources/pom.xml (original)
+++ karaf/trunk/archetypes/blueprint/src/main/resources/archetype-resources/pom.xml Thu Jul 12 15:19:57 2012
@@ -1,6 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
<modelVersion>4.0.0</modelVersion>
<groupId>${groupId}</groupId>
Modified: karaf/trunk/archetypes/blueprint/src/main/resources/archetype-resources/src/main/java/MyService.java
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/blueprint/src/main/resources/archetype-resources/src/main/java/MyService.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/archetypes/blueprint/src/main/resources/archetype-resources/src/main/java/MyService.java (original)
+++ karaf/trunk/archetypes/blueprint/src/main/resources/archetype-resources/src/main/java/MyService.java Thu Jul 12 15:19:57 2012
@@ -1,3 +1,19 @@
+/*
+ * 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 ${package};
public interface MyService {
Modified: karaf/trunk/archetypes/blueprint/src/main/resources/archetype-resources/src/main/java/MyServiceImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/blueprint/src/main/resources/archetype-resources/src/main/java/MyServiceImpl.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/archetypes/blueprint/src/main/resources/archetype-resources/src/main/java/MyServiceImpl.java (original)
+++ karaf/trunk/archetypes/blueprint/src/main/resources/archetype-resources/src/main/java/MyServiceImpl.java Thu Jul 12 15:19:57 2012
@@ -1,3 +1,19 @@
+/*
+ * 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 ${package};
public class MyServiceImpl implements MyService {
Modified: karaf/trunk/archetypes/blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/my-service.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/my-service.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/archetypes/blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/my-service.xml (original)
+++ karaf/trunk/archetypes/blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/my-service.xml Thu Jul 12 15:19:57 2012
@@ -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" default-activation="lazy">
<bean id="serviceBean" class="${package}.MyServiceImpl"/>
Modified: karaf/trunk/archetypes/blueprint/src/test/resources/projects/blueprint/archetype.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/blueprint/src/test/resources/projects/blueprint/archetype.properties?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/archetypes/blueprint/src/test/resources/projects/blueprint/archetype.properties (original)
+++ karaf/trunk/archetypes/blueprint/src/test/resources/projects/blueprint/archetype.properties Thu Jul 12 15:19:57 2012
@@ -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.
+#
+################################################################################
+
groupId=archetype.it
artifactId=blueprint
version=1.0-SNAPSHOT
Modified: karaf/trunk/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/bundle/src/main/resources/archetype-resources/pom.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/archetypes/bundle/src/main/resources/archetype-resources/pom.xml (original)
+++ karaf/trunk/archetypes/bundle/src/main/resources/archetype-resources/pom.xml Thu Jul 12 15:19:57 2012
@@ -1,6 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
+
<modelVersion>4.0.0</modelVersion>
<groupId>${groupId}</groupId>
Modified: karaf/trunk/archetypes/bundle/src/main/resources/archetype-resources/src/main/java/Activator.java
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/bundle/src/main/resources/archetype-resources/src/main/java/Activator.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/archetypes/bundle/src/main/resources/archetype-resources/src/main/java/Activator.java (original)
+++ karaf/trunk/archetypes/bundle/src/main/resources/archetype-resources/src/main/java/Activator.java Thu Jul 12 15:19:57 2012
@@ -1,3 +1,19 @@
+/*
+ * 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 ${package};
import org.osgi.framework.BundleActivator;
Modified: karaf/trunk/archetypes/bundle/src/test/resources/projects/bundle/archetype.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/bundle/src/test/resources/projects/bundle/archetype.properties?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/archetypes/bundle/src/test/resources/projects/bundle/archetype.properties (original)
+++ karaf/trunk/archetypes/bundle/src/test/resources/projects/bundle/archetype.properties Thu Jul 12 15:19:57 2012
@@ -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.
+#
+################################################################################
+
groupId=archetype.it
artifactId=bundle
version=1.0-SNAPSHOT
Modified: karaf/trunk/archetypes/command/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/command/src/main/resources/archetype-resources/pom.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/archetypes/command/src/main/resources/archetype-resources/pom.xml (original)
+++ karaf/trunk/archetypes/command/src/main/resources/archetype-resources/pom.xml Thu Jul 12 15:19:57 2012
@@ -1,6 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
<modelVersion>4.0.0</modelVersion>
<groupId>${groupId}</groupId>
Modified: karaf/trunk/archetypes/command/src/main/resources/archetype-resources/src/test/java/__command__Test.java
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/command/src/main/resources/archetype-resources/src/test/java/__command__Test.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/archetypes/command/src/main/resources/archetype-resources/src/test/java/__command__Test.java (original)
+++ karaf/trunk/archetypes/command/src/main/resources/archetype-resources/src/test/java/__command__Test.java Thu Jul 12 15:19:57 2012
@@ -17,7 +17,6 @@
#set( $symbol_pound = '#' )
#set( $symbol_dollar = '$' )
#set( $symbol_escape = '\' )
-
package ${package};
Modified: karaf/trunk/archetypes/command/src/test/resources/projects/command/archetype.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/command/src/test/resources/projects/command/archetype.properties?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/archetypes/command/src/test/resources/projects/command/archetype.properties (original)
+++ karaf/trunk/archetypes/command/src/test/resources/projects/command/archetype.properties Thu Jul 12 15:19:57 2012
@@ -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.
+#
+################################################################################
+
groupId=archetype.it
artifactId=command
version=1.0-SNAPSHOT
Modified: karaf/trunk/archetypes/feature/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/feature/src/main/resources/archetype-resources/pom.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/archetypes/feature/src/main/resources/archetype-resources/pom.xml (original)
+++ karaf/trunk/archetypes/feature/src/main/resources/archetype-resources/pom.xml Thu Jul 12 15:19:57 2012
@@ -1,6 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
<modelVersion>4.0.0</modelVersion>
<groupId>${groupId}</groupId>
Modified: karaf/trunk/archetypes/feature/src/main/resources/archetype-resources/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/feature/src/main/resources/archetype-resources/src/main/feature/feature.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/archetypes/feature/src/main/resources/archetype-resources/src/main/feature/feature.xml (original)
+++ karaf/trunk/archetypes/feature/src/main/resources/archetype-resources/src/main/feature/feature.xml Thu Jul 12 15:19:57 2012
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,7 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<features name="${project.artifactId}-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
<feature name='${project.artifactId}' description='${project.name}' version='${project.version}'>
Modified: karaf/trunk/archetypes/feature/src/test/resources/projects/feature/archetype.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/feature/src/test/resources/projects/feature/archetype.properties?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/archetypes/feature/src/test/resources/projects/feature/archetype.properties (original)
+++ karaf/trunk/archetypes/feature/src/test/resources/projects/feature/archetype.properties Thu Jul 12 15:19:57 2012
@@ -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.
+#
+################################################################################
+
groupId=archetype.it
artifactId=feature
version=1.0-SNAPSHOT
Modified: karaf/trunk/archetypes/kar/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/kar/src/main/resources/archetype-resources/pom.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/archetypes/kar/src/main/resources/archetype-resources/pom.xml (original)
+++ karaf/trunk/archetypes/kar/src/main/resources/archetype-resources/pom.xml Thu Jul 12 15:19:57 2012
@@ -1,6 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
<modelVersion>4.0.0</modelVersion>
<groupId>${groupId}</groupId>
Modified: karaf/trunk/archetypes/kar/src/main/resources/archetype-resources/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/kar/src/main/resources/archetype-resources/src/main/feature/feature.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/archetypes/kar/src/main/resources/archetype-resources/src/main/feature/feature.xml (original)
+++ karaf/trunk/archetypes/kar/src/main/resources/archetype-resources/src/main/feature/feature.xml Thu Jul 12 15:19:57 2012
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,7 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<features name="${project.artifactId}-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
<feature name='${project.artifactId}' description='${project.name}' version='${project.version}' resolver="${resolver}">
Modified: karaf/trunk/archetypes/kar/src/test/resources/projects/kar/archetype.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/kar/src/test/resources/projects/kar/archetype.properties?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/archetypes/kar/src/test/resources/projects/kar/archetype.properties (original)
+++ karaf/trunk/archetypes/kar/src/test/resources/projects/kar/archetype.properties Thu Jul 12 15:19:57 2012
@@ -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.
+#
+################################################################################
+
groupId=archetype.it
artifactId=kar
version=1.0-SNAPSHOT
Modified: karaf/trunk/assemblies/apache-karaf/src/main/resources/extra/jetty.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/resources/extra/jetty.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/assemblies/apache-karaf/src/main/resources/extra/jetty.xml (original)
+++ karaf/trunk/assemblies/apache-karaf/src/main/resources/extra/jetty.xml Thu Jul 12 15:19:57 2012
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ 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.
+-->
<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//
DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
Modified: karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.features.repos.cfg
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.features.repos.cfg?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.features.repos.cfg (original)
+++ karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.features.repos.cfg Thu Jul 12 15:19:57 2012
@@ -1,3 +1,27 @@
+################################################################################
+#
+# 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.
+#
+################################################################################
+
+#
+# This file describes the features repository URL
+# It could be directly installed using feature:repo-add command
+#
+
camel=org.apache.camel.karaf:apache-camel:xml:features:(0,]
cxf=org.apache.cxf.karaf:apache-cxf:xml:features:(0,]
activemq=org.apache.activemq:activemq-karaf:xml:features:(0,]
Modified: karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/MavenConfigService.java
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/MavenConfigService.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/MavenConfigService.java (original)
+++ karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/MavenConfigService.java Thu Jul 12 15:19:57 2012
@@ -1,3 +1,19 @@
+/*
+ * 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.bundle.core.internal;
import java.io.File;
@@ -15,6 +31,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class MavenConfigService {
+
private final Logger logger = LoggerFactory.getLogger(BundleWatcherImpl.class);
private final ConfigurationAdmin configurationAdmin;
@@ -53,4 +70,5 @@ public class MavenConfigService {
}
return mavenConfiguration;
}
+
}
Modified: karaf/trunk/client/src/main/java/org/apache/karaf/client/ClientConfig.java
URL: http://svn.apache.org/viewvc/karaf/trunk/client/src/main/java/org/apache/karaf/client/ClientConfig.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/client/src/main/java/org/apache/karaf/client/ClientConfig.java (original)
+++ karaf/trunk/client/src/main/java/org/apache/karaf/client/ClientConfig.java Thu Jul 12 15:19:57 2012
@@ -1,3 +1,19 @@
+/*
+ * 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.client;
import org.slf4j.impl.SimpleLogger;
@@ -90,6 +106,5 @@ public class ClientConfig {
public String getCommand() {
return command;
}
-
-
+
}
Modified: karaf/trunk/client/src/main/java/org/slf4j/impl/SimpleLoggerFactory.java
URL: http://svn.apache.org/viewvc/karaf/trunk/client/src/main/java/org/slf4j/impl/SimpleLoggerFactory.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/client/src/main/java/org/slf4j/impl/SimpleLoggerFactory.java (original)
+++ karaf/trunk/client/src/main/java/org/slf4j/impl/SimpleLoggerFactory.java Thu Jul 12 15:19:57 2012
@@ -1,26 +1,18 @@
-/**
- * Copyright (c) 2004-2011 QOS.ch
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
+/*
+ * 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
*
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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.slf4j.impl;
Modified: karaf/trunk/client/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
URL: http://svn.apache.org/viewvc/karaf/trunk/client/src/main/java/org/slf4j/impl/StaticLoggerBinder.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/client/src/main/java/org/slf4j/impl/StaticLoggerBinder.java (original)
+++ karaf/trunk/client/src/main/java/org/slf4j/impl/StaticLoggerBinder.java Thu Jul 12 15:19:57 2012
@@ -1,26 +1,18 @@
-/**
- * Copyright (c) 2004-2011 QOS.ch
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
+/*
+ * 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
*
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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.slf4j.impl;
Modified: karaf/trunk/demos/deployer/kar/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/demos/deployer/kar/src/main/resources/features.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/demos/deployer/kar/src/main/resources/features.xml (original)
+++ karaf/trunk/demos/deployer/kar/src/main/resources/features.xml Thu Jul 12 15:19:57 2012
@@ -1,4 +1,22 @@
<?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.
+-->
<features>
<feature name="my-kar" version="1.0">
Modified: karaf/trunk/demos/deployer/kar/src/main/resources/maven-metadata-local.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/demos/deployer/kar/src/main/resources/maven-metadata-local.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/demos/deployer/kar/src/main/resources/maven-metadata-local.xml (original)
+++ karaf/trunk/demos/deployer/kar/src/main/resources/maven-metadata-local.xml Thu Jul 12 15:19:57 2012
@@ -1,4 +1,22 @@
<?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.
+-->
<metadata modelVersion="1.1.0">
<groupId>org.apache.karaf.demos</groupId>
<artifactId>my-kar</artifactId>
Modified: karaf/trunk/deployer/kar/src/test/resources/badFeaturesXml.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/kar/src/test/resources/badFeaturesXml.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/deployer/kar/src/test/resources/badFeaturesXml.xml (original)
+++ karaf/trunk/deployer/kar/src/test/resources/badFeaturesXml.xml Thu Jul 12 15:19:57 2012
@@ -1 +1,18 @@
+<!--
+
+ 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.
+-->
<message>This is not a features file!</message>
\ No newline at end of file
Modified: karaf/trunk/deployer/kar/src/test/resources/goodKarFile/org/foo/goodFeaturesXml.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/kar/src/test/resources/goodKarFile/org/foo/goodFeaturesXml.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/deployer/kar/src/test/resources/goodKarFile/org/foo/goodFeaturesXml.xml (original)
+++ karaf/trunk/deployer/kar/src/test/resources/goodKarFile/org/foo/goodFeaturesXml.xml Thu Jul 12 15:19:57 2012
@@ -1,4 +1,21 @@
<?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.
+-->
<features name="goodFeaturesRepo">
<feature name='goodFeature' version='1.0.0'>
</feature>
Modified: karaf/trunk/deployer/kar/src/test/resources/karFileAsZip/org/foo/goodFeaturesXml.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/kar/src/test/resources/karFileAsZip/org/foo/goodFeaturesXml.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/deployer/kar/src/test/resources/karFileAsZip/org/foo/goodFeaturesXml.xml (original)
+++ karaf/trunk/deployer/kar/src/test/resources/karFileAsZip/org/foo/goodFeaturesXml.xml Thu Jul 12 15:19:57 2012
@@ -1,4 +1,21 @@
<?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.
+-->
<features>
<feature name='goodFeature' version='1.0.0'>
</feature>
Modified: karaf/trunk/deployer/kar/src/test/resources/karFileAsZipNoManifest/org/foo/goodFeaturesXml.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/kar/src/test/resources/karFileAsZipNoManifest/org/foo/goodFeaturesXml.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/deployer/kar/src/test/resources/karFileAsZipNoManifest/org/foo/goodFeaturesXml.xml (original)
+++ karaf/trunk/deployer/kar/src/test/resources/karFileAsZipNoManifest/org/foo/goodFeaturesXml.xml Thu Jul 12 15:19:57 2012
@@ -1,4 +1,21 @@
<?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.
+-->
<features>
<feature name='goodFeature' version='1.0.0'>
</feature>
Modified: karaf/trunk/deployer/kar/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/kar/src/test/resources/log4j.properties?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/deployer/kar/src/test/resources/log4j.properties (original)
+++ karaf/trunk/deployer/kar/src/test/resources/log4j.properties Thu Jul 12 15:19:57 2012
@@ -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.
+#
+################################################################################
+
log4j.rootLogger=DEBUG, stdout
#The logging properties used during tests..
Modified: karaf/trunk/deployer/kar/src/test/resources/malformedXml.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/kar/src/test/resources/malformedXml.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/deployer/kar/src/test/resources/malformedXml.xml (original)
+++ karaf/trunk/deployer/kar/src/test/resources/malformedXml.xml Thu Jul 12 15:19:57 2012
@@ -1 +1,18 @@
+<!--
+
+ 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.
+-->
<This is malformed XML.
\ No newline at end of file
Modified: karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/completers/AvailableRepoNameCompleter.java
URL: http://svn.apache.org/viewvc/karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/completers/AvailableRepoNameCompleter.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/completers/AvailableRepoNameCompleter.java (original)
+++ karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/completers/AvailableRepoNameCompleter.java Thu Jul 12 15:19:57 2012
@@ -1,3 +1,19 @@
+/*
+ * 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.features.command.completers;
import java.util.Arrays;
Modified: karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f01.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f01.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f01.xml (original)
+++ karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f01.xml Thu Jul 12 15:19:57 2012
@@ -1,6 +1,5 @@
<?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.
Modified: karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f02.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f02.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f02.xml (original)
+++ karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f02.xml Thu Jul 12 15:19:57 2012
@@ -1,6 +1,5 @@
<?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.
Modified: karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f03.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f03.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f03.xml (original)
+++ karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f03.xml Thu Jul 12 15:19:57 2012
@@ -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.
+-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
<feature name="spring" version="2.5.6.SEC02" resolver="(obr)">
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0_4</bundle>
Modified: karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f04.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f04.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f04.xml (original)
+++ karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f04.xml Thu Jul 12 15:19:57 2012
@@ -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.
+-->
<features name="karaf" xmlns="http://karaf.apache.org/xmlns/features/v1.1.0">
<feature name="spring" version="2.5.6.SEC02" resolver="(obr)">
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0_4</bundle>
Modified: karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f05.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f05.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f05.xml (original)
+++ karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f05.xml Thu Jul 12 15:19:57 2012
@@ -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.
+-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.1.0">
<feature name="spring" version="2.5.6.SEC02" resolver="(obr)">
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0_4</bundle>
Modified: karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/repo1.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/repo1.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/repo1.xml (original)
+++ karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/repo1.xml Thu Jul 12 15:19:57 2012
@@ -1,5 +1,5 @@
+<?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.
Modified: karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/ServletService.java
URL: http://svn.apache.org/viewvc/karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/ServletService.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/ServletService.java (original)
+++ karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/ServletService.java Thu Jul 12 15:19:57 2012
@@ -1,7 +1,25 @@
+/*
+ * 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.http.core;
import java.util.List;
public interface ServletService {
+
List<ServletInfo> getServlets();
+
}
Modified: karaf/trunk/instance/core/src/test/resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/test/resources/etc/startup.properties?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/instance/core/src/test/resources/etc/startup.properties (original)
+++ karaf/trunk/instance/core/src/test/resources/etc/startup.properties Thu Jul 12 15:19:57 2012
@@ -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.
+#
+################################################################################
+
# Fake startup.properties for unit tests as the startup properties in generated by the karaf-maven-plugin
\ No newline at end of file
Modified: karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/RealmCompleter.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/RealmCompleter.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/RealmCompleter.java (original)
+++ karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/RealmCompleter.java Thu Jul 12 15:19:57 2012
@@ -1,3 +1,19 @@
+/*
+ * 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.jaas.command.completers;
import org.apache.karaf.jaas.config.JaasRealm;
Modified: karaf/trunk/jaas/jasypt/src/test/resources/org/apache/karaf/jaas/jasypt/handler/test.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/jasypt/src/test/resources/org/apache/karaf/jaas/jasypt/handler/test.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/jaas/jasypt/src/test/resources/org/apache/karaf/jaas/jasypt/handler/test.xml (original)
+++ karaf/trunk/jaas/jasypt/src/test/resources/org/apache/karaf/jaas/jasypt/handler/test.xml Thu Jul 12 15:19:57 2012
@@ -1,3 +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:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"
xmlns:enc="http://karaf.apache.org/xmlns/jasypt/v1.0.0">
Modified: karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/FeatureDetector.java
URL: http://svn.apache.org/viewvc/karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/FeatureDetector.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/FeatureDetector.java (original)
+++ karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/FeatureDetector.java Thu Jul 12 15:19:57 2012
@@ -1,3 +1,19 @@
+/*
+ * 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.kar.internal;
import java.io.File;
@@ -14,9 +30,9 @@ import org.xml.sax.SAXParseException;
/**
* Simple helper to determine if a file is a feature repo
- *
*/
class FeatureDetector {
+
private static final Logger LOGGER = LoggerFactory.getLogger(FeatureDetector.class);
private DocumentBuilderFactory dbf;
@@ -67,4 +83,5 @@ class FeatureDetector {
});
return db.parse(artifact);
}
+
}
Modified: karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/Kar.java
URL: http://svn.apache.org/viewvc/karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/Kar.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/Kar.java (original)
+++ karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/Kar.java Thu Jul 12 15:19:57 2012
@@ -1,3 +1,19 @@
+/*
+ * 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.kar.internal;
import java.io.File;
@@ -39,6 +55,7 @@ import org.slf4j.LoggerFactory;
*
*/
public class Kar {
+
public static final Logger LOGGER = LoggerFactory.getLogger(KarServiceImpl.class);
public static final String MANIFEST_ATTR_KARAF_FEATURE_START = "Karaf-Feature-Start";
public static final String MANIFEST_ATTR_KARAF_FEATURE_REPOS = "Karaf-Feature-Repos";
@@ -53,8 +70,7 @@ public class Kar {
/**
* Extract a kar from a given URI into a repository dir and resource dir
* and populate shouldInstallFeatures and featureRepos
- *
- * @param karUri uri to read the kar from
+ *
* @param repoDir directory to write the repository contents of the kar to
* @param resourceDir directory to write the resource contents of the kar to
*/
@@ -161,7 +177,6 @@ public class Kar {
}
return count;
}
-
public String getKarName() {
try {
@@ -185,5 +200,4 @@ public class Kar {
return featureRepos;
}
-
}
Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/BundleInfo.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/BundleInfo.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/BundleInfo.java (original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/BundleInfo.java Thu Jul 12 15:19:57 2012
@@ -1,8 +1,29 @@
+/*
+ * 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.main;
import java.net.URI;
class BundleInfo {
+
URI uri;
+
Integer startLevel;
+
}
Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/ConfigProperties.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/ConfigProperties.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/ConfigProperties.java (original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/ConfigProperties.java Thu Jul 12 15:19:57 2012
@@ -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.main;
import java.io.File;
Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/InstanceHelper.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/InstanceHelper.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/InstanceHelper.java (original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/InstanceHelper.java Thu Jul 12 15:19:57 2012
@@ -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.main;
import java.io.File;
Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/KarafActivatorManager.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/KarafActivatorManager.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/KarafActivatorManager.java (original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/KarafActivatorManager.java Thu Jul 12 15:19:57 2012
@@ -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.main;
import java.io.IOException;
@@ -15,7 +33,9 @@ import org.osgi.framework.BundleActivato
import org.osgi.framework.launch.Framework;
public class KarafActivatorManager {
+
public static final String KARAF_ACTIVATOR = "Karaf-Activator";
+
Logger LOG = Logger.getLogger(this.getClass().getName());
private List<BundleActivator> karafActivators = new ArrayList<BundleActivator>();
@@ -67,4 +87,5 @@ public class KarafActivatorManager {
}
}
}
+
}
Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/ShutdownSocketThread.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/ShutdownSocketThread.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/ShutdownSocketThread.java (original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/ShutdownSocketThread.java Thu Jul 12 15:19:57 2012
@@ -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.main;
import java.io.IOException;
@@ -12,11 +30,9 @@ import java.util.logging.Logger;
import org.osgi.framework.launch.Framework;
class ShutdownSocketThread extends Thread {
+
Logger LOG = Logger.getLogger(this.getClass().getName());
- /**
- *
- */
private final String shutdown;
private Random random = null;
private ServerSocket shutdownSocket;
@@ -99,4 +115,5 @@ class ShutdownSocketThread extends Threa
}
}
}
+
}
\ No newline at end of file