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 [2/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...
Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/LockCallBack.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/LockCallBack.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/LockCallBack.java (original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/LockCallBack.java Thu Jul 12 15:19:57 2012
@@ -1,10 +1,32 @@
+/*
+ * 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.lock;
/**
* Allows to react on events generated by the locking framework
*/
public interface LockCallBack {
+
void lockAquired();
+
void lockLost();
+
void waitingForLock();
+
}
Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/LockFactory.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/LockFactory.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/LockFactory.java (original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/LockFactory.java Thu Jul 12 15:19:57 2012
@@ -1,8 +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.
+ */
package org.apache.karaf.main.lock;
import java.util.Properties;
public class LockFactory {
+
/**
* If a lock should be used before starting the runtime
*/
@@ -26,4 +45,5 @@ public class LockFactory {
throw new RuntimeException("Exception instantiating lock class " + clz, e);
}
}
+
}
Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/LockManager.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/LockManager.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/LockManager.java (original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/LockManager.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.main.lock;
-
public class LockManager {
+
private Lock lock;
private boolean exiting = false;
Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/NoLock.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/NoLock.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/NoLock.java (original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/NoLock.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.lock;
public class NoLock implements Lock {
Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/util/ArtifactResolver.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/util/ArtifactResolver.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/util/ArtifactResolver.java (original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/util/ArtifactResolver.java Thu Jul 12 15:19:57 2012
@@ -1,7 +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.
+ */
package org.apache.karaf.main.util;
import java.net.URI;
public interface ArtifactResolver {
+
URI resolve(URI artifactUri);
+
}
Modified: karaf/trunk/main/src/test/resources/test-karaf-home/system/org/apache/karaf/features/framework/1.0.0/framework-1.0.0-features.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/test/resources/test-karaf-home/system/org/apache/karaf/features/framework/1.0.0/framework-1.0.0-features.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/main/src/test/resources/test-karaf-home/system/org/apache/karaf/features/framework/1.0.0/framework-1.0.0-features.xml (original)
+++ karaf/trunk/main/src/test/resources/test-karaf-home/system/org/apache/karaf/features/framework/1.0.0/framework-1.0.0-features.xml Thu Jul 12 15:19:57 2012
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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" name="framework-3.0.0-SNAPSHOT">
<feature description="Karaf core feature" version="3.0.0-SNAPSHOT" name="framework">
<bundle start-level="10">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.api/0.3.1</bundle>
Modified: karaf/trunk/manual/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/pom.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/manual/pom.xml (original)
+++ karaf/trunk/manual/pom.xml Thu Jul 12 15:19:57 2012
@@ -191,16 +191,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.karaf.dev</groupId>
- <artifactId>org.apache.karaf.dev.core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.dev</groupId>
- <artifactId>org.apache.karaf.dev.command</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.karaf.log</groupId>
<artifactId>org.apache.karaf.log.core</artifactId>
<version>${project.version}</version>
Modified: karaf/trunk/obr/command/src/test/java/org/apache/karaf/obr/command/ListCommandTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/command/src/test/java/org/apache/karaf/obr/command/ListCommandTest.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/obr/command/src/test/java/org/apache/karaf/obr/command/ListCommandTest.java (original)
+++ karaf/trunk/obr/command/src/test/java/org/apache/karaf/obr/command/ListCommandTest.java Thu Jul 12 15:19:57 2012
@@ -1,4 +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.obr.command;
+
import org.apache.felix.bundlerepository.RepositoryAdmin;
import org.apache.felix.bundlerepository.Resource;
import org.apache.felix.bundlerepository.impl.ResourceImpl;
@@ -6,7 +23,6 @@ import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Test;
-
public class ListCommandTest {
/**
Modified: karaf/trunk/package/core/src/test/java/org/apache/karaf/packages/core/InstallMBeantest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/package/core/src/test/java/org/apache/karaf/packages/core/InstallMBeantest.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/package/core/src/test/java/org/apache/karaf/packages/core/InstallMBeantest.java (original)
+++ karaf/trunk/package/core/src/test/java/org/apache/karaf/packages/core/InstallMBeantest.java Thu Jul 12 15:19:57 2012
@@ -1,4 +1,23 @@
+/*
+ * 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.packages.core;
+
import java.lang.management.ManagementFactory;
import javax.management.MBeanServer;
@@ -7,12 +26,12 @@ import javax.management.ObjectName;
import org.apache.karaf.packages.core.internal.Packages;
import org.junit.Test;
-
/**
- * Checks that the PackagesmBean is valid and can be installed in the MBeanServer
+ * Checks that the PackagesMBean is valid and can be installed in the MBeanServer
*
*/
public class InstallMBeantest {
+
@Test
public void test() throws Exception {
MBeanServer server = ManagementFactory.getPlatformMBeanServer();
@@ -21,4 +40,5 @@ public class InstallMBeantest {
server.registerMBean(pack, oName);
server.unregisterMBean(oName);
}
+
}
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Thu Jul 12 15:19:57 2012
@@ -1821,7 +1821,10 @@
<excludeSubProjects>false</excludeSubProjects>
<excludes>
<exclude>**/target/**/*</exclude>
+ <!-- GIT files -->
+ <exclude>**/.git/**/*</exclude>
<!-- IDEA files -->
+ <exclude>**/.idea/**/*</exclude>
<exclude>**/*.iml</exclude>
<exclude>**/*.ipr</exclude>
<exclude>**/*.iws</exclude>
@@ -1829,8 +1832,17 @@
<exclude>**/.*</exclude>
<exclude>**/eclipse-classes/**/*</exclude>
<exclude>**/dependency-reduced-pom.xml</exclude>
- <!--RAT doesn't seem to recognize MIT style licenses-->
- <exclude>manual/src/styles/print.css</exclude>
+ <!-- resources file -->
+ <exclude>**/bundle.info</exclude>
+ <exclude>**/goal.txt</exclude>
+ <exclude>**/grep.txt</exclude>
+ <exclude>**/edit.txt</exclude>
+ <exclude>**/foo</exclude>
+ <exclude>**/org.ops4j.pax.exam.TestContainerFactory</exclude>
+ <!--manual resources -->
+ <exclude>manual/**/*.css</exclude>
+ <exclude>manual/**/*.ssp</exclude>
+ <exclude>manual/**/*.conf</exclude>
</excludes>
</configuration>
</plugin>
Modified: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/PojoInfoProvider.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/PojoInfoProvider.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/PojoInfoProvider.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/PojoInfoProvider.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.shell.commands.impl.info;
import java.util.Properties;
@@ -32,4 +50,5 @@ public class PojoInfoProvider implements
public void setProperties(Properties properties) {
this.properties = properties;
}
+
}
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/CommandWithAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/CommandWithAction.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/CommandWithAction.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/CommandWithAction.java Thu Jul 12 15:19:57 2012
@@ -1,11 +1,31 @@
+/*
+ * 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.commands;
import org.apache.felix.service.command.Function;
public interface CommandWithAction extends Function {
+
Class<? extends Action> getActionClass();
Action createNewAction();
void releaseAction(Action action) throws Exception;
+
}
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/HelpOption.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/HelpOption.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/HelpOption.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/HelpOption.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.shell.commands;
import java.lang.annotation.Annotation;
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaData.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaData.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaData.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaData.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.shell.commands.meta;
import java.io.PrintStream;
@@ -21,6 +39,7 @@ import org.apache.karaf.shell.util.Shell
import org.fusesource.jansi.Ansi;
public class ActionMetaData {
+
private final Class<? extends Action> actionClass;
private final Command command;
private final Map<Option, Field> options;
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaDataFactory.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaDataFactory.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaDataFactory.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaDataFactory.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.shell.commands.meta;
import java.lang.annotation.Annotation;
@@ -13,6 +31,7 @@ import org.apache.karaf.shell.commands.C
import org.apache.karaf.shell.commands.Option;
public class ActionMetaDataFactory {
+
public ActionMetaData create(Class<? extends Action> actionClass) {
Command command = getCommand(actionClass);
Map<Option, Field> options = new HashMap<Option, Field>();
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/CommandSessionHolder.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/CommandSessionHolder.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/CommandSessionHolder.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/CommandSessionHolder.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.shell.console;
import org.apache.felix.service.command.CommandSession;
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Console.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Console.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Console.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Console.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.shell.console;
import org.apache.felix.service.command.CommandSession;
public interface Console extends Runnable {
+
CommandSession getSession();
+
void close();
+
}
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/SessionProperties.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/SessionProperties.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/SessionProperties.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/SessionProperties.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.shell.console;
public class SessionProperties {
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleFactoryService.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleFactoryService.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleFactoryService.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleFactoryService.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.shell.console.impl.jline;
import java.io.InputStream;
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/KarafFileHistory.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/KarafFileHistory.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/KarafFileHistory.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/KarafFileHistory.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.shell.console.impl.jline;
import java.io.File;
@@ -13,6 +31,7 @@ import jline.console.history.FileHistory
* user does not having write access to the history file.
*/
public final class KarafFileHistory extends FileHistory {
+
static final Logger LOGGER = LoggerFactory.getLogger(KarafFileHistory.class);
boolean failed = false;
Modified: karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommand.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommand.java (original)
+++ karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommand.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.shell.ssh;
import java.io.IOException;
Modified: karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshClientFactory.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshClientFactory.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshClientFactory.java (original)
+++ karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshClientFactory.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.shell.ssh;
import java.io.File;
Modified: karaf/trunk/shell/ssh/src/test/resources/org/apache/karaf/shell/ssh/authorized_keys
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/src/test/resources/org/apache/karaf/shell/ssh/authorized_keys?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/src/test/resources/org/apache/karaf/shell/ssh/authorized_keys (original)
+++ karaf/trunk/shell/ssh/src/test/resources/org/apache/karaf/shell/ssh/authorized_keys Thu Jul 12 15:19:57 2012
@@ -1,2 +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.
ssh-dss AAAAB3NzaC1kc3MAAACBAPY8ZOHY2yFSJA6XYC9HRwNHxaehvx5wOJ0rzZdzoSOXxbETW6ToHv8D1UJ/z+zHo9Fiko5XybZnDIaBDHtblQ+Yp7StxyltHnXF1YLfKD1G4T6JYrdHYI14Om1eg9e4NnCRleaqoZPF3UGfZia6bXrGTQf3gJq2e7Yisk/gF+1VAAAAFQDb8D5cvwHWTZDPfX0D2s9Rd7NBvQAAAIEAlN92+Bb7D4KLYk3IwRbXblwXdkPggA4pfdtW9vGfJ0/RHd+NjB4eo1D+0dix6tXwYGN7PKS5R/FXPNwxHPapcj9uL1Jn2AWQ2dsknf+i/FAAvioUPkmdMc0zuWoSOEsSNhVDtX3WdvVcGcBq9cetzrtOKWOocJmJ80qadxTRHtUAAACBAN7CY+KKv1gHpRzFwdQm7HK9bb1LAo2KwaoXnadFgeptNBQeSXG1vO+JsvphVMBJc9HSn24VYtYtsMu74qXviYjziVucWKjjKEb11juqnF0GDlB3VVmxHLmxnAz643WK42Z7dLM5sY29ouezv4Xz2PuMch5VGPP+CDqzCM4loWgV dsa-test
ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA1on8gxCGJJWSRT4uOrR13mUaUk0hRf4RzxSZ1zRbYYFw8pfGesIFoEuVth4HKyF8k1y4mRUnYHP1XNMNMJl1JcEArC2asV8sHf6zSPVffozZ5TT4SfsUu/iKy9lUcCfXzwre4WWZSXXcPff+EHtWshahu3WzBdnGxm5Xoi89zcE= rsa-test
\ No newline at end of file
Modified: karaf/trunk/system/command/src/main/java/org/apache/karaf/system/commands/AbstractSystemAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/system/command/src/main/java/org/apache/karaf/system/commands/AbstractSystemAction.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/system/command/src/main/java/org/apache/karaf/system/commands/AbstractSystemAction.java (original)
+++ karaf/trunk/system/command/src/main/java/org/apache/karaf/system/commands/AbstractSystemAction.java Thu Jul 12 15:19:57 2012
@@ -1,12 +1,30 @@
+/*
+ * 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.system.commands;
import org.apache.karaf.shell.console.AbstractAction;
import org.apache.karaf.system.SystemService;
public abstract class AbstractSystemAction extends AbstractAction {
+
protected SystemService systemService;
public void setSystemService(SystemService systemService) {
this.systemService = systemService;
}
+
}
Modified: karaf/trunk/system/core/src/test/resources/etc/system.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/system/core/src/test/resources/etc/system.properties?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/system/core/src/test/resources/etc/system.properties (original)
+++ karaf/trunk/system/core/src/test/resources/etc/system.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.
+#
+################################################################################
+
#Comment
karaf.name=oldName
#Comment2
Modified: karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/InternalKarafDistributionConfigurationOption.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/InternalKarafDistributionConfigurationOption.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/InternalKarafDistributionConfigurationOption.java (original)
+++ karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/InternalKarafDistributionConfigurationOption.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.tooling.exam.container.internal;
import java.io.File;
Modified: karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/Runner.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/Runner.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/Runner.java (original)
+++ karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/Runner.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.tooling.exam.container.internal.runner;
import java.io.File;
Modified: karaf/trunk/tooling/exam/container/src/main/resources/META-INF/versions.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/src/main/resources/META-INF/versions.properties?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/src/main/resources/META-INF/versions.properties (original)
+++ karaf/trunk/tooling/exam/container/src/main/resources/META-INF/versions.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.
+#
+################################################################################
+
options.version=${project.version}
junit.version=${junit.version}
injection.version=${injection.bundle.version}
\ No newline at end of file
Modified: karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionBaseConfigurationOption.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionBaseConfigurationOption.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionBaseConfigurationOption.java (original)
+++ karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionBaseConfigurationOption.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.tooling.exam.options;
import java.io.File;
Modified: karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/Backward224Test.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/Backward224Test.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/Backward224Test.java (original)
+++ karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/Backward224Test.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.tooling.exam.regression;
import static junit.framework.Assert.assertTrue;
@@ -54,4 +70,5 @@ public class Backward224Test {
System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXxx");
assertTrue(true);
}
+
}
Modified: karaf/trunk/tooling/karaf-maven-plugin/src/test/resources/input-features.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/test/resources/input-features.xml?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/src/test/resources/input-features.xml (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/src/test/resources/input-features.xml Thu Jul 12 15:19:57 2012
@@ -1,5 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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" name="geronimo-transaction">
<repository>http://foo.org</repository>
-
</features>
Modified: karaf/trunk/util/src/main/java/org/apache/karaf/util/CommandUtils.java
URL: http://svn.apache.org/viewvc/karaf/trunk/util/src/main/java/org/apache/karaf/util/CommandUtils.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/util/src/main/java/org/apache/karaf/util/CommandUtils.java (original)
+++ karaf/trunk/util/src/main/java/org/apache/karaf/util/CommandUtils.java Thu Jul 12 15:19:57 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.util;
/**
Modified: karaf/trunk/util/src/main/java/org/apache/karaf/util/StreamUtils.java
URL: http://svn.apache.org/viewvc/karaf/trunk/util/src/main/java/org/apache/karaf/util/StreamUtils.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/util/src/main/java/org/apache/karaf/util/StreamUtils.java (original)
+++ karaf/trunk/util/src/main/java/org/apache/karaf/util/StreamUtils.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.util;
import java.io.Closeable;
@@ -7,7 +23,6 @@ public class StreamUtils {
private StreamUtils() {
}
-
public static void close(Closeable... closeables) {
for (Closeable c : closeables) {
@@ -18,4 +33,5 @@ public class StreamUtils {
}
}
}
+
}
Modified: karaf/trunk/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/WebDetail.java
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/WebDetail.java?rev=1360720&r1=1360719&r2=1360720&view=diff
==============================================================================
--- karaf/trunk/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/WebDetail.java (original)
+++ karaf/trunk/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/WebDetail.java Thu Jul 12 15:19:57 2012
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.karaf.webconsole.http;
public class WebDetail {