Author: pderop
Date: Sat Feb 20 21:44:59 2016
New Revision: 1731476
URL: http://svn.apache.org/viewvc?rev=1731476&view=rev
Log:
Javadoc. Added missing license headers. Fixed some bnd descriptors in dm-lambda
samples.
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELI5155_AdapterCallbackInstanceCalledTwice.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/bnd.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/build.gradle
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithCallbackInstanceTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithInstanceBoundDependencyTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithoutPropagationTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectBaseTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AutoConfigTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependenciesTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependencyTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleServiceDependencyTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/TemporalServiceDependencyTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/TestBase.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/bnd.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/build.gradle
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/compositefactory.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/compositefactory.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/device.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/device.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/dictionary.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/dictionary.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/factory.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/factory.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/future.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/future.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/hello.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/hello.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/compositefactory/Configurator.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/factory/ProviderFactory.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/future/PageLinks.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/future/PageLinksImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/hello/Configurator.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/BundleAdapterBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/BundleDependencyBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ComponentBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ConfigurationDependencyBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/DependencyBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/DependencyManagerActivator.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/FactoryPidAdapterBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/FluentProperty.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/FutureDependencyBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceAdapterBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceAspectBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceCallbacksBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceDependencyBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/Cb.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbBundle.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbBundleComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbConfiguration.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbConfigurationComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbDictionary.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbDictionaryComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbFuture.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbRefServiceRefService.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbRefServiceRefServiceComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbService.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbServiceComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbServiceComponentRef.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbServiceDict.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbServiceMap.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbServiceRef.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbServiceService.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbServiceServiceComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCb.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbBundle.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbBundleComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbConfiguration.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbConfigurationComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbDictionary.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbDictionaryComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbFuture.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbRefServiceRefService.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbRefServiceRefServiceComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbService.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbServiceComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbServiceComponentRef.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbServiceDict.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbServiceMap.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbServiceRef.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbServiceService.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbServiceServiceComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/SerializableLambda.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/AdapterBase.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/BundleAdapterBuilderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/BundleDependencyBuilderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/CompletableFutureDependencyImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/ComponentBuilderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/ConfigurationDependencyBuilderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/FactoryPidAdapterBuilderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/Helpers.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/SRefAsDictionary.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/SRefAsMap.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/ServiceAdapterBuilderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/ServiceAspectBuilderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/ServiceCallbacksBuilderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/ServiceDependencyBuilderImpl.java
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELI5155_AdapterCallbackInstanceCalledTwice.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELI5155_AdapterCallbackInstanceCalledTwice.java?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELI5155_AdapterCallbackInstanceCalledTwice.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELI5155_AdapterCallbackInstanceCalledTwice.java
Sat Feb 20 21:44:59 2016
@@ -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.felix.dm.itest.api;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/bnd.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/bnd.bnd?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/bnd.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/bnd.bnd
Sat Feb 20 21:44:59 2016
@@ -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.
+#
-buildpath: \
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.shell;version=latest,\
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/build.gradle
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/build.gradle?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/build.gradle
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/build.gradle
Sat Feb 20 21:44:59 2016
@@ -1,3 +1,22 @@
- tasks.withType(JavaCompile) {
+/*
+ * 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.
+ */
+
+tasks.withType(JavaCompile) {
options.compilerArgs << "-parameters" << "-Xdiags:verbose"
}
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithCallbackInstanceTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithCallbackInstanceTest.java?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithCallbackInstanceTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithCallbackInstanceTest.java
Sat Feb 20 21:44:59 2016
@@ -126,7 +126,7 @@ public class AdapterWithCallbackInstance
static class ServiceProvider implements OriginalService {
private final Ensure m_ensure;
- private volatile ServiceRegistration m_registration; // auto injected
when started.
+ private volatile ServiceRegistration<?> m_registration; // auto
injected when started.
public ServiceProvider(Ensure e) {
m_ensure = e;
}
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithInstanceBoundDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithInstanceBoundDependencyTest.java?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithInstanceBoundDependencyTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithInstanceBoundDependencyTest.java
Sat Feb 20 21:44:59 2016
@@ -100,7 +100,6 @@ public class AdapterWithInstanceBoundDep
private volatile ServiceInterface m_originalService;
private volatile ServiceInterface2 m_injectedService;
private volatile Component m_component;
- private volatile DependencyManager m_manager;
public ServiceAdapter(Ensure e) {
m_ensure = e;
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithoutPropagationTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithoutPropagationTest.java?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithoutPropagationTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithoutPropagationTest.java
Sat Feb 20 21:44:59 2016
@@ -111,7 +111,7 @@ public class AdapterWithoutPropagationTe
}
static class ServiceProvider implements OriginalService {
- private volatile ServiceRegistration m_registration; // auto injected
when started.
+ private volatile ServiceRegistration<?> m_registration; // auto
injected when started.
public ServiceProvider(Ensure e) {
}
public void changeServiceProperties() {
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectBaseTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectBaseTest.java?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectBaseTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectBaseTest.java
Sat Feb 20 21:44:59 2016
@@ -41,7 +41,7 @@ public class AspectBaseTest extends Test
Ensure e = new Ensure();
// create a service provider and consumer
- ServiceProvider p = new ServiceProvider(e, "a");
+ ServiceProvider p = new ServiceProvider("a");
ServiceConsumer c = new ServiceConsumer(e);
Component sp =
component(m).impl(p).provides(ServiceInterface.class).properties(name ->
"a").build();
@@ -76,7 +76,7 @@ public class AspectBaseTest extends Test
Ensure e = new Ensure();
// create a service provider and consumer
- ServiceProvider p = new ServiceProvider(e, "a");
+ ServiceProvider p = new ServiceProvider("a");
ServiceConsumer c = new ServiceConsumer(e);
Component sp =
component(m).impl(p).provides(ServiceInterface.class).properties(name ->
"a").build();
@@ -106,14 +106,13 @@ public class AspectBaseTest extends Test
clearComponents();
}
- @SuppressWarnings("serial")
public void testSingleAspectThatAlreadyExisted() {
DependencyManager m = new DependencyManager(context);
// helper class that ensures certain steps get executed in sequence
Ensure e = new Ensure();
// create a service provider and consumer
- ServiceProvider p = new ServiceProvider(e, "a");
+ ServiceProvider p = new ServiceProvider("a");
ServiceConsumer c = new ServiceConsumer(e);
Component sp =
component(m).impl(p).provides(ServiceInterface.class).properties(name ->
"a").build();
Component sc = component(m).impl(c).withSvc(ServiceInterface.class,
srv -> srv.add("add").remove("remove").autoConfig("m_service")).build();
@@ -154,7 +153,7 @@ public class AspectBaseTest extends Test
Ensure e = new Ensure();
// create a service provider and consumer
- ServiceProvider p = new ServiceProvider(e, "a");
+ ServiceProvider p = new ServiceProvider("a");
ServiceConsumer c = new ServiceConsumer(e);
Component sp =
component(m).impl(p).provides(ServiceInterface.class).properties(name ->
"a").build();
@@ -197,8 +196,8 @@ public class AspectBaseTest extends Test
// create service providers and consumers
ServiceConsumer c = new ServiceConsumer(e);
- Component sp = component(m).impl(new ServiceProvider(e,
"a")).provides(ServiceInterface.class).properties(name -> "a").build();
- Component sp2 = component(m).impl(new ServiceProvider(e,
"b")).provides(ServiceInterface.class).properties(name -> "b").build();
+ Component sp = component(m).impl(new
ServiceProvider("a")).provides(ServiceInterface.class).properties(name ->
"a").build();
+ Component sp2 = component(m).impl(new
ServiceProvider("b")).provides(ServiceInterface.class).properties(name ->
"b").build();
Component sc = component(m).impl(c).withSvc(ServiceInterface.class,
srv -> srv.add("add").remove("remove")).build();
Component sa = aspect(m,
ServiceInterface.class).rank(20).impl(ServiceAspect.class).build();
@@ -239,8 +238,8 @@ public class AspectBaseTest extends Test
// create service providers and consumers
ServiceConsumer c = new ServiceConsumer(e);
- Component sp = component(m).impl(new ServiceProvider(e,
"a")).provides(ServiceInterface.class).properties(name -> "a").build();
- Component sp2 = component(m).impl(new ServiceProvider(e,
"b")).provides(ServiceInterface.class).properties(name -> "b").build();
+ Component sp = component(m).impl(new
ServiceProvider("a")).provides(ServiceInterface.class).properties(name ->
"a").build();
+ Component sp2 = component(m).impl(new
ServiceProvider("b")).provides(ServiceInterface.class).properties(name ->
"b").build();
Component sc = component(m).impl(c).withSvc(ServiceInterface.class,
srv -> srv.add(c::addRef).remove(c::removeRef)).build();
Component sa = aspect(m,
ServiceInterface.class).rank(20).impl(ServiceAspect.class).build();
@@ -279,10 +278,8 @@ public class AspectBaseTest extends Test
}
public static class ServiceProvider implements ServiceInterface {
- private final Ensure m_ensure;
private final String m_name;
- public ServiceProvider(Ensure e, String name) {
- m_ensure = e;
+ public ServiceProvider(String name) {
m_name = name;
}
public String invoke(String input) {
@@ -292,7 +289,7 @@ public class AspectBaseTest extends Test
public static class ServiceAspect implements ServiceInterface {
private volatile ServiceInterface m_originalService;
- private volatile ServiceRegistration m_registration;
+ private volatile ServiceRegistration<?> m_registration;
public String invoke(String input) {
String result = m_originalService.invoke(input);
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AutoConfigTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AutoConfigTest.java?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AutoConfigTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AutoConfigTest.java
Sat Feb 20 21:44:59 2016
@@ -36,7 +36,7 @@ import org.osgi.framework.Constants;
/**
* @author <a href="mailto:[email protected]";>Felix Project Team</a>
*/
-@SuppressWarnings({"unchecked", "rawtypes"})
+@SuppressWarnings("rawtypes")
public class AutoConfigTest extends TestBase {
private final Ensure m_ensure = new Ensure();
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependenciesTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependenciesTest.java?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependenciesTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependenciesTest.java
Sat Feb 20 21:44:59 2016
@@ -27,7 +27,6 @@ import org.junit.Assert;
/**
* @author <a href="mailto:[email protected]";>Felix Project Team</a>
*/
-@SuppressWarnings({"unchecked", "rawtypes"})
public class MultipleExtraDependenciesTest extends TestBase {
/**
* Check that list of extra dependencies (defined from init method) are
handled properly.
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependencyTest.java?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependencyTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependencyTest.java
Sat Feb 20 21:44:59 2016
@@ -28,7 +28,6 @@ import org.apache.felix.dm.DependencyMan
*
* @author <a href="mailto:[email protected]";>Felix Project Team</a>
*/
-@SuppressWarnings({"unchecked", "rawtypes", "serial"})
public class MultipleExtraDependencyTest extends TestBase {
public void testMultipleExtraDependencies()
{
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleServiceDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleServiceDependencyTest.java?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleServiceDependencyTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleServiceDependencyTest.java
Sat Feb 20 21:44:59 2016
@@ -27,7 +27,6 @@ import org.osgi.framework.Constants;
/**
* @author <a href="mailto:[email protected]";>Felix Project Team</a>
*/
-@SuppressWarnings({"unchecked", "rawtypes", "serial"})
public class MultipleServiceDependencyTest extends TestBase {
public void testMultipleServiceRegistrationAndConsumption() {
DependencyManager m = getDM();
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/TemporalServiceDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/TemporalServiceDependencyTest.java?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/TemporalServiceDependencyTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/TemporalServiceDependencyTest.java
Sat Feb 20 21:44:59 2016
@@ -34,7 +34,6 @@ import org.junit.Assert;
@SuppressWarnings({"unchecked", "rawtypes", "serial"})
public class TemporalServiceDependencyTest extends TestBase {
public void testServiceConsumptionAndIntermittentAvailability() {
- if (true) return;
final DependencyManager m = getDM();
// helper class that ensures certain steps get executed in sequence
Ensure e = new Ensure();
@@ -66,7 +65,6 @@ public class TemporalServiceDependencyTe
}
public void
testServiceConsumptionWithCallbackAndIntermittentAvailability() {
- if (true) return;
final DependencyManager m = getDM();
// helper class that ensures certain steps get executed in sequence
Ensure e = new Ensure();
@@ -103,7 +101,6 @@ public class TemporalServiceDependencyTe
// Same test as
testServiceConsumptionWithCallbackAndIntermittentAvailability, but the consumer
is now
// an adapter for the Adaptee interface.
public void
testFELIX4858_ServiceAdapterConsumptionWithCallbackAndIntermittentAvailability()
{
- if (true) return;
final DependencyManager m = getDM();
// helper class that ensures certain steps get executed in sequence
Ensure e = new Ensure();
@@ -143,7 +140,6 @@ public class TemporalServiceDependencyTe
}
public void testFelix4602_PropagateServiceInvocationException() {
- if (true) return;
final DependencyManager m = getDM();
final Ensure ensure = new Ensure();
Runnable provider = new Runnable() {
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/TestBase.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/TestBase.java?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/TestBase.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/TestBase.java
Sat Feb 20 21:44:59 2016
@@ -62,7 +62,7 @@ public abstract class TestBase extends T
private volatile boolean m_errorsLogged;
// We implement OSGI log service.
- protected ServiceRegistration logService;
+ protected ServiceRegistration<LogService> logService;
// Our bundle context
protected BundleContext context;
@@ -71,7 +71,7 @@ public abstract class TestBase extends T
protected volatile DependencyManager m_dm;
// The Registration for the DM threadpool.
- private ServiceRegistration m_componentExecutorFactoryReg;
+ private ServiceRegistration<?> m_componentExecutorFactoryReg;
public TestBase() {
}
@@ -85,7 +85,7 @@ public abstract class TestBase extends T
context = FrameworkUtil.getBundle(this.getClass()).getBundleContext();
Hashtable<String, Object> props = new Hashtable<>();
props.put(Constants.SERVICE_RANKING, new Integer(Integer.MAX_VALUE));
- logService = context.registerService(LogService.class.getName(), this,
props);
+ logService = context.registerService(LogService.class, this, props);
context.addFrameworkListener(this);
m_dm = new DependencyManager(context);
if (m_parallel) {
@@ -130,8 +130,8 @@ public abstract class TestBase extends T
/**
* Creates and provides an Ensure object with a name service property into
the OSGi service registry.
*/
- protected ServiceRegistration register(Ensure e, String name) {
- Hashtable<String, String> props = new Hashtable<String, String>();
+ protected ServiceRegistration<?> register(Ensure e, String name) {
+ Hashtable<String, String> props = new Hashtable<>();
props.put("name", name);
return context.registerService(Ensure.class.getName(), e, props);
}
@@ -230,6 +230,7 @@ public abstract class TestBase extends T
}
}
+ @SuppressWarnings("rawtypes")
public void log(ServiceReference sr, int level, String message) {
checkError(level, null);
if (LOG_LEVEL >= level) {
@@ -240,6 +241,7 @@ public abstract class TestBase extends T
}
}
+ @SuppressWarnings("rawtypes")
public void log(ServiceReference sr, int level, String message, Throwable
exception) {
checkError(level, exception);
if (LOG_LEVEL >= level) {
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/bnd.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/bnd.bnd?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/bnd.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/bnd.bnd
Sat Feb 20 21:44:59 2016
@@ -12,7 +12,3 @@ Bundle-Version: 0.0.0.${tstamp}
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-DocURL:
http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html
Bundle-Vendor: The Apache Software Foundation
--runproperties: \
- org.apache.felix.dependencymanager.loglevel=2,\
- org.apache.felix.log.maxSize=100000,\
- org.apache.felix.log.storeDebug=true
\ No newline at end of file
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/build.gradle
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/build.gradle?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/build.gradle
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/build.gradle
Sat Feb 20 21:44:59 2016
@@ -1,3 +1,22 @@
- tasks.withType(JavaCompile) {
+/*
+ * 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.
+ */
+
+tasks.withType(JavaCompile) {
options.compilerArgs << "-parameters"
}
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/compositefactory.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/compositefactory.bnd?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/compositefactory.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/compositefactory.bnd
Sat Feb 20 21:44:59 2016
@@ -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.
+#
Private-Package: org.apache.felix.dm.lambda.samples.compositefactory
-Bundle-Activator: org.apache.felix.dm.lambda.samples.compositefactory.Activator
\ No newline at end of file
+Bundle-Activator: org.apache.felix.dm.lambda.samples.compositefactory.Activator
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/compositefactory.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/compositefactory.bndrun?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/compositefactory.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/compositefactory.bndrun
Sat Feb 20 21:44:59 2016
@@ -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.
+#
-runfw: org.apache.felix.framework;version='[5.2.0,5.2.0]'
-runee: JavaSE-1.8
-runsystemcapabilities: ${native_capability}
@@ -16,4 +32,7 @@
org.apache.felix.dependencymanager.shell;version=4.0.3,\
org.apache.felix.dependencymanager.lambda;version=latest
-
\ No newline at end of file
+-runproperties: \
+ org.apache.felix.dependencymanager.loglevel=2,\
+ org.apache.felix.log.maxSize=100000,\
+ org.apache.felix.log.storeDebug=true
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/device.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/device.bnd?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/device.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/device.bnd
Sat Feb 20 21:44:59 2016
@@ -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.
+#
Private-Package: org.apache.felix.dm.lambda.samples.device
-Bundle-Activator: org.apache.felix.dm.lambda.samples.device.Activator
\ No newline at end of file
+Bundle-Activator: org.apache.felix.dm.lambda.samples.device.Activator
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/device.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/device.bndrun?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/device.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/device.bndrun
Sat Feb 20 21:44:59 2016
@@ -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.
+#
-runfw: org.apache.felix.framework;version='[5.2.0,5.2.0]'
-runee: JavaSE-1.8
-runsystemcapabilities: ${native_capability}
@@ -16,4 +32,7 @@
org.apache.felix.dependencymanager.shell;version=4.0.3,\
org.apache.felix.dependencymanager.lambda;version=latest
-
\ No newline at end of file
+-runproperties: \
+ org.apache.felix.dependencymanager.loglevel=2,\
+ org.apache.felix.log.maxSize=100000,\
+ org.apache.felix.log.storeDebug=true
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/dictionary.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/dictionary.bnd?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/dictionary.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/dictionary.bnd
Sat Feb 20 21:44:59 2016
@@ -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.
+#
Private-Package: org.apache.felix.dm.lambda.samples.dictionary
-Bundle-Activator: org.apache.felix.dm.lambda.samples.dictionary.Activator
\ No newline at end of file
+Bundle-Activator: org.apache.felix.dm.lambda.samples.dictionary.Activator
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/dictionary.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/dictionary.bndrun?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/dictionary.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/dictionary.bndrun
Sat Feb 20 21:44:59 2016
@@ -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.
+#
-runfw: org.apache.felix.framework;version='[5.2.0,5.2.0]'
-runee: JavaSE-1.8
-runsystemcapabilities: ${native_capability}
@@ -23,4 +39,7 @@
org.apache.felix.http.jetty;version="[2.3.0,2.3.0]"
-
\ No newline at end of file
+-runproperties: \
+ org.apache.felix.dependencymanager.loglevel=2,\
+ org.apache.felix.log.maxSize=100000,\
+ org.apache.felix.log.storeDebug=true
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/factory.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/factory.bnd?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/factory.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/factory.bnd
Sat Feb 20 21:44:59 2016
@@ -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.
+#
Private-Package: org.apache.felix.dm.lambda.samples.factory
-Bundle-Activator: org.apache.felix.dm.lambda.samples.factory.Activator
\ No newline at end of file
+Bundle-Activator: org.apache.felix.dm.lambda.samples.factory.Activator
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/factory.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/factory.bndrun?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/factory.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/factory.bndrun
Sat Feb 20 21:44:59 2016
@@ -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.
+#
-runfw: org.apache.felix.framework;version='[5.2.0,5.2.0]'
-runee: JavaSE-1.8
-runsystemcapabilities: ${native_capability}
@@ -16,4 +32,7 @@
org.apache.felix.dependencymanager.shell;version=4.0.3,\
org.apache.felix.dependencymanager.lambda;version=latest
-
\ No newline at end of file
+-runproperties: \
+ org.apache.felix.dependencymanager.loglevel=2,\
+ org.apache.felix.log.maxSize=100000,\
+ org.apache.felix.log.storeDebug=true
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/future.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/future.bnd?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/future.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/future.bnd
Sat Feb 20 21:44:59 2016
@@ -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.
+#
Private-Package: org.apache.felix.dm.lambda.samples.future
Bundle-Activator: org.apache.felix.dm.lambda.samples.future.Activator
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/future.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/future.bndrun?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/future.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/future.bndrun
Sat Feb 20 21:44:59 2016
@@ -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.
+#
-runfw: org.apache.felix.framework;version='[5.2.0,5.2.0]'
-runee: JavaSE-1.8
-runsystemcapabilities: ${native_capability}
@@ -15,3 +31,8 @@
org.apache.felix.dependencymanager;version=4.2.0,\
org.apache.felix.dependencymanager.shell;version=4.0.3,\
org.apache.felix.dependencymanager.lambda;version=latest
+
+-runproperties: \
+ org.apache.felix.dependencymanager.loglevel=2,\
+ org.apache.felix.log.maxSize=100000,\
+ org.apache.felix.log.storeDebug=true
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/hello.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/hello.bnd?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/hello.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/hello.bnd
Sat Feb 20 21:44:59 2016
@@ -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.
+#
Private-Package: org.apache.felix.dm.lambda.samples.hello
-Bundle-Activator: org.apache.felix.dm.lambda.samples.hello.Activator
\ No newline at end of file
+Bundle-Activator: org.apache.felix.dm.lambda.samples.hello.Activator
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/hello.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/hello.bndrun?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/hello.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/hello.bndrun
Sat Feb 20 21:44:59 2016
@@ -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.
+#
-runfw: org.apache.felix.framework;version='[5.2.0,5.2.0]'
-runee: JavaSE-1.8
-runsystemcapabilities: ${native_capability}
@@ -17,4 +33,7 @@
org.apache.felix.dependencymanager.lambda;version=latest,\
org.apache.felix.eventadmin;version=1.4.4
-
\ No newline at end of file
+-runproperties: \
+ org.apache.felix.dependencymanager.loglevel=2,\
+ org.apache.felix.log.maxSize=100000,\
+ org.apache.felix.log.storeDebug=true
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/compositefactory/Configurator.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/compositefactory/Configurator.java?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/compositefactory/Configurator.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/compositefactory/Configurator.java
Sat Feb 20 21:44:59 2016
@@ -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.felix.dm.lambda.samples.compositefactory;
import java.io.IOException;
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/factory/ProviderFactory.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/factory/ProviderFactory.java?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/factory/ProviderFactory.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/factory/ProviderFactory.java
Sat Feb 20 21:44:59 2016
@@ -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.felix.dm.lambda.samples.factory;
public class ProviderFactory {
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/future/PageLinks.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/future/PageLinks.java?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/future/PageLinks.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/future/PageLinks.java
Sat Feb 20 21:44:59 2016
@@ -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.felix.dm.lambda.samples.future;
import java.util.List;
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/future/PageLinksImpl.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/future/PageLinksImpl.java?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/future/PageLinksImpl.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/future/PageLinksImpl.java
Sat Feb 20 21:44:59 2016
@@ -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.felix.dm.lambda.samples.future;
import static org.apache.felix.dm.lambda.DependencyManagerActivator.component;
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/hello/Configurator.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/hello/Configurator.java?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/hello/Configurator.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/hello/Configurator.java
Sat Feb 20 21:44:59 2016
@@ -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.felix.dm.lambda.samples.hello;
import java.io.IOException;
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd
Sat Feb 20 21:44:59 2016
@@ -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.
+#
javac.source: 1.8
javac.target: 1.8
Bundle-Version: 1.0.0
@@ -10,4 +26,4 @@ Export-Package: \
org.apache.felix.dm.lambda.callbacks
-runfw: org.apache.felix.framework;version='[4.4.1,4.4.1]'
-runee: JavaSE-1.8
-Private-Package: org.apache.felix.dm.lambda.impl
\ No newline at end of file
+Private-Package: org.apache.felix.dm.lambda.impl
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/BundleAdapterBuilder.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/BundleAdapterBuilder.java?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/BundleAdapterBuilder.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/BundleAdapterBuilder.java
Sat Feb 20 21:44:59 2016
@@ -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.felix.dm.lambda;
import org.apache.felix.dm.lambda.callbacks.CbBundle;
@@ -6,7 +24,7 @@ import org.apache.felix.dm.lambda.callba
import org.apache.felix.dm.lambda.callbacks.InstanceCbBundleComponent;
/**
- * Builds a Dependency Manager bundle adapter. The adapter created by this
builder will be applied to any bundle that matches the specified
+ * Builds a Dependency Manager bundle adapter. <p> The adapter created by this
builder will be applied to any bundle that matches the specified
* bundle state mask and filter condition. For each matching bundle an adapter
service will be created based on the adapter implementation class.
* The adapter will be registered with the specified interface and existing
properties from the original bundle plus any extra properties
* you supply here. The bundle is injected by reflection in adapter class
fields having a Bundle type, or using a callback method that you can
@@ -163,7 +181,7 @@ public interface BundleAdapterBuilder ex
* The method reference must point to a Component implementation class
method, it is called when the bundle is added
* and takes as argument a Bundle.
*
- * @param <T> the type of the component instance class on which the
callback is invoked.
+ * @param <T> the type of the component implementation class on which the
callback is invoked.
* @param add the method reference invoked when a bundle is added.
* @return this builder
*/
@@ -174,7 +192,7 @@ public interface BundleAdapterBuilder ex
* The method reference must point to a Component implementation class
method, it is called when the bundle is changed
* and takes as argument a Bundle.
*
- * @param <T> the type of the component instance class on which the
callback is invoked.
+ * @param <T> the type of the component implementation class on which the
callback is invoked.
* @param change the method reference invoked when a bundle has changed.
* @return this builder
*/
@@ -185,7 +203,7 @@ public interface BundleAdapterBuilder ex
* The method reference must point to a Component implementation class
method, it is called when the bundle is removed
* and takes as argument a Bundle.
*
- * @param <T> the type of the component instance class on which the
callback is invoked.
+ * @param <T> the type of the component implementation class on which the
callback is invoked.
* @param remove the method reference invoked when a bundle is removed.
* @return this builder
*/
@@ -196,7 +214,7 @@ public interface BundleAdapterBuilder ex
* The method reference must point to a Component implementation class
method, it is called when the bundle is added
* and takes as argument a Bundle and a Component.
*
- * @param <T> the type of the component instance class on which the
callback is invoked.
+ * @param <T> the type of the component implementation class on which the
callback is invoked.
* @param add the method reference invoked when a bundle is added.
* @return this builder
*/
@@ -207,7 +225,7 @@ public interface BundleAdapterBuilder ex
* The method reference must point to a Component implementation class
method, it is called when the bundle is changed
* and takes as argument a Bundle and a Component.
*
- * @param <T> the type of the component instance class on which the
callback is invoked.
+ * @param <T> the type of the component implementation class on which the
callback is invoked.
* @param change the method reference invoked when a bundle has changed.
* @return this builder
*/
@@ -218,7 +236,7 @@ public interface BundleAdapterBuilder ex
* The method reference must point to a Component implementation class
method, it is called when the bundle is removed
* and takes as argument a Bundle and a Component.
*
- * @param <T> the type of the component instance class on which the
callback is invoked.
+ * @param <T> the type of the component implementation class on which the
callback is invoked.
* @param remove the method reference invoked when a bundle is removed.
* @return this builder
*/
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/BundleDependencyBuilder.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/BundleDependencyBuilder.java?rev=1731476&r1=1731475&r2=1731476&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/BundleDependencyBuilder.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/BundleDependencyBuilder.java
Sat Feb 20 21:44:59 2016
@@ -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.felix.dm.lambda;
import java.util.Dictionary;
@@ -12,9 +30,7 @@ import org.osgi.framework.Bundle;
/**
* Builds a Dependency Manager Bundle Dependency.
- * The Dependency is required by default, but you can
- * control the default mode (required or optional) using the
"org.apache.felix.dependencymanager.lambda.dependencymode"
- * system property which can be set to either "required" or "optional"
("required" by default).
+ * When a bundle dependency is not explicitly defined as "required" or
"optional", then it is assumed to be required by default.
*
* <p> Example of a Pojo Component which tracks a started bundle having a
given bundle symbolic name:
*
@@ -25,7 +41,6 @@ import org.osgi.framework.Bundle;
* component(comp -> comp
* .impl(Pojo.class)
* .withBundle(b ->
b.mask(Bundle.ACTIVE).filter("(Bundle-SymbolicName=" + BSN +
")").add(Pojo::add).remove(Pojo::remove)));
- *
* }
* }
* } </pre>
@@ -51,17 +66,14 @@ public interface BundleDependencyBuilder
public BundleDependencyBuilder autoConfig();
/**
- * Sets the dependency to be required. By default, the dependency is
required, but you can specify the default mode
- * using the "org.apache.felix.dependencymanager.lambda.dependencymode"
system property.
- *
- * @param required <code>true</code> if this bundle dependency is required
(true by default).
+ * Sets the dependency to be required.
+ * @param required <code>true</code> if this bundle dependency is required.
* @return the bundle dependency builder
*/
public BundleDependencyBuilder required(boolean required);
/**
- * Sets the dependency to be required. By default, the dependency is
required, but you can specify the default mode
- * using the "org.apache.felix.dependencymanager.lambda.dependencymode"
system property.
+ * Sets the dependency to be required.
*
* @return the bundle dependency builder
*/
