Repository: aries-rsa Updated Branches: refs/heads/master bd0352f56 -> 69bb901e9
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/69bb901e/itests/testbundle-service-tcp/src/main/java/org/apache/aries/rsa/itests/tcp/service/Activator.java ---------------------------------------------------------------------- diff --git a/itests/testbundle-service-tcp/src/main/java/org/apache/aries/rsa/itests/tcp/service/Activator.java b/itests/testbundle-service-tcp/src/main/java/org/apache/aries/rsa/itests/tcp/service/Activator.java deleted file mode 100644 index 184dd2b..0000000 --- a/itests/testbundle-service-tcp/src/main/java/org/apache/aries/rsa/itests/tcp/service/Activator.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.apache.aries.rsa.itests.tcp.service; - -import java.util.Dictionary; -import java.util.Hashtable; - -import org.apache.aries.rsa.itests.tcp.api.EchoService; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.service.remoteserviceadmin.RemoteConstants; - -public class Activator implements BundleActivator { - - @Override - public void start(BundleContext context) throws Exception { - EchoService echoService = new EchoServiceImpl(); - Dictionary<String, String> props = new Hashtable<String, String>(); - props.put(RemoteConstants.SERVICE_EXPORTED_INTERFACES, "*"); - context.registerService(EchoService.class, echoService, props); - } - - @Override - public void stop(BundleContext context) throws Exception { - } - -} http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/69bb901e/itests/testbundle-service-tcp/src/main/java/org/apache/aries/rsa/itests/tcp/service/EchoServiceImpl.java ---------------------------------------------------------------------- diff --git a/itests/testbundle-service-tcp/src/main/java/org/apache/aries/rsa/itests/tcp/service/EchoServiceImpl.java b/itests/testbundle-service-tcp/src/main/java/org/apache/aries/rsa/itests/tcp/service/EchoServiceImpl.java deleted file mode 100644 index a79abb2..0000000 --- a/itests/testbundle-service-tcp/src/main/java/org/apache/aries/rsa/itests/tcp/service/EchoServiceImpl.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.apache.aries.rsa.itests.tcp.service; - -import org.apache.aries.rsa.itests.tcp.api.EchoService; - -public class EchoServiceImpl implements EchoService { - - @Override - public String echo(String msg) { - return msg; - } - -} http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/69bb901e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c104d12..eb898cb 100644 --- a/pom.xml +++ b/pom.xml @@ -77,6 +77,7 @@ <module>topology-manager</module> <module>provider</module> <module>discovery</module> + <module>examples</module> <module>features</module> <module>itests</module> </modules> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/69bb901e/rsa/src/main/java/org/apache/aries/rsa/core/ClientServiceFactory.java ---------------------------------------------------------------------- diff --git a/rsa/src/main/java/org/apache/aries/rsa/core/ClientServiceFactory.java b/rsa/src/main/java/org/apache/aries/rsa/core/ClientServiceFactory.java index 54bbc54..b9aec0c 100644 --- a/rsa/src/main/java/org/apache/aries/rsa/core/ClientServiceFactory.java +++ b/rsa/src/main/java/org/apache/aries/rsa/core/ClientServiceFactory.java @@ -21,7 +21,6 @@ package org.apache.aries.rsa.core; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import org.apache.aries.rsa.spi.DistributionProvider; @@ -85,9 +84,6 @@ public class ClientServiceFactory implements ServiceFactory { } public void ungetService(Bundle requestingBundle, ServiceRegistration sreg, Object serviceObject) { - String[] interfaces = (String[])sreg.getReference().getProperty(org.osgi.framework.Constants.OBJECTCLASS); - LOG.info("Releasing a client object, interfaces: {}", Arrays.toString(interfaces)); - synchronized (this) { serviceCounter--; LOG.debug("Services still provided by this ServiceFactory: {}", serviceCounter); http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/69bb901e/spi/pom.xml ---------------------------------------------------------------------- diff --git a/spi/pom.xml b/spi/pom.xml index da2a348..3f3b8a7 100644 --- a/spi/pom.xml +++ b/spi/pom.xml @@ -1,3 +1,22 @@ +<?xml version='1.0' encoding='UTF-8' ?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion>
