Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1C0E417B7F for ; Mon, 19 Jan 2015 17:06:41 +0000 (UTC) Received: (qmail 47374 invoked by uid 500); 19 Jan 2015 17:06:30 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 47330 invoked by uid 500); 19 Jan 2015 17:06:30 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 47320 invoked by uid 99); 19 Jan 2015 17:06:30 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Jan 2015 17:06:30 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id E2B25AC01D7; Mon, 19 Jan 2015 17:06:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1653050 - in /felix/sandbox/pderop/dependencymanager: org.apache.felix.dependencymanager.itest/ org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/it... Date: Mon, 19 Jan 2015 17:06:25 -0000 To: commits@felix.apache.org From: pderop@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150119170625.E2B25AC01D7@hades.apache.org> Author: pderop Date: Mon Jan 19 17:06:24 2015 New Revision: 1653050 URL: http://svn.apache.org/r1653050 Log: Removed dependency between org.apache.felix.dependencymanager.itest and org.apache.felix.dependencymanager.runtime.itest (the FELIX2955_ShellCommandTest was restarting the runtime.itest bundle. Now it is restarting the "org.apache.felix.dependencymanager.itest" bundle, which is a sub-bundle of the dependencymanager.itest project). Added: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/api.bnd felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/bundle.bnd felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/Activator.java felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/TestComponent.java felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/TestService.java Modified: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2955_ShellCommandTest.java felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd Added: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/api.bnd URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/api.bnd?rev=1653050&view=auto ============================================================================== --- felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/api.bnd (added) +++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/api.bnd Mon Jan 19 17:06:24 2015 @@ -0,0 +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. +# +Private-Package: \ + org.apache.felix.dm.itest.api +Export-Package: \ + org.apache.felix.dm.itest.util \ No newline at end of file Modified: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd?rev=1653050&r1=1653049&r2=1653050&view=diff ============================================================================== --- felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd (original) +++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd Mon Jan 19 17:06:24 2015 @@ -20,8 +20,7 @@ org.apache.felix.log;version=1.0.1,\ org.apache.felix.configadmin;version=1.8.1.SNAPSHOT,\ org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest,\ - org.apache.felix.dependencymanager.runtime;version=latest + org.apache.felix.dependencymanager.shell;version=latest -runee: JavaSE-1.7 -runvm: -ea -runfw: org.apache.felix.framework @@ -34,9 +33,7 @@ ${junit} -runsystempackages: \ sun.reflect +-sub: \ + *.bnd Test-Cases: \ ${classes;CONCRETE;EXTENDS;junit.framework.TestCase} -Private-Package: \ - org.apache.felix.dm.itest.api -Export-Package: \ - org.apache.felix.dm.itest.util Added: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/bundle.bnd URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/bundle.bnd?rev=1653050&view=auto ============================================================================== --- felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/bundle.bnd (added) +++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/bundle.bnd Mon Jan 19 17:06:24 2015 @@ -0,0 +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. +# +Export-Package: \ + org.apache.felix.dm.itest.bundle +Bundle-Activator: org.apache.felix.dm.itest.bundle.Activator \ No newline at end of file Modified: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2955_ShellCommandTest.java URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2955_ShellCommandTest.java?rev=1653050&r1=1653049&r2=1653050&view=diff ============================================================================== --- felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2955_ShellCommandTest.java (original) +++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2955_ShellCommandTest.java Mon Jan 19 17:06:24 2015 @@ -39,7 +39,7 @@ public class FELIX2955_ShellCommandTest try { m_myBundleId = context.getBundle().getBundleId(); for (Bundle b : context.getBundles()) { - if (b.getSymbolicName().equals("org.apache.felix.dependencymanager.runtime")) { + if (b.getSymbolicName().equals("org.apache.felix.dependencymanager.itest.bundle")) { m_testBundle = b; b.stop(); break; @@ -72,7 +72,7 @@ public class FELIX2955_ShellCommandTest e.waitForStep(5, 5000); m.remove(missing); // now start/stop our test bundle, which publishes a service that uses the dependency manager - m_testBundle.start(); + m_testBundle.start(); m_testBundle.stop(); e.step(6); e.waitForStep(7, 5000); Added: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/Activator.java URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/Activator.java?rev=1653050&view=auto ============================================================================== --- felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/Activator.java (added) +++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/Activator.java Mon Jan 19 17:06:24 2015 @@ -0,0 +1,35 @@ +/* + * 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.felix.dm.itest.bundle; + +import org.apache.felix.dm.DependencyActivatorBase; +import org.apache.felix.dm.DependencyManager; +import org.osgi.framework.BundleContext; + +public class Activator extends DependencyActivatorBase { + + @Override + public void init(BundleContext ctx, DependencyManager m) + throws Exception { + m.add(createComponent() + .setImplementation(TestComponent.class) + .setInterface(TestService.class.getName(), null)); + } + +} Added: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/TestComponent.java URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/TestComponent.java?rev=1653050&view=auto ============================================================================== --- felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/TestComponent.java (added) +++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/TestComponent.java Mon Jan 19 17:06:24 2015 @@ -0,0 +1,26 @@ +/* + * 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.felix.dm.itest.bundle; + +/** + * Test Component used by the FELIX2955_ShellCommandTest test. + */ +public class TestComponent implements TestService { + +} Added: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/TestService.java URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/TestService.java?rev=1653050&view=auto ============================================================================== --- felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/TestService.java (added) +++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/TestService.java Mon Jan 19 17:06:24 2015 @@ -0,0 +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.felix.dm.itest.bundle; + +public interface TestService { + +} Modified: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd?rev=1653050&r1=1653049&r2=1653050&view=diff ============================================================================== --- felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd (original) +++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd Mon Jan 19 17:06:24 2015 @@ -21,7 +21,7 @@ org.apache.felix.dependencymanager.annotation;version=latest,\ org.apache.felix.dependencymanager;version=latest,\ org.apache.felix.dependencymanager.runtime;version=latest,\ - org.apache.felix.dependencymanager.itest;version=latest + org.apache.felix.dependencymanager.itest.api;version=latest -runbundles: \ org.apache.felix.configadmin;version=1.8.1.SNAPSHOT,\ org.apache.felix.metatype;version=1.0.4,\