You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by da...@apache.org on 2009/12/18 16:29:25 UTC
svn commit: r892276 - in /cxf/dosgi/trunk:
discovery/distributed/cxf-discovery/ discovery/local/
discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/
dsw/cxf-dsw/ dsw/cxf-osgi-remote-service-admin-interfaces/
dsw/cxf-topology-manager/
Author: davidb
Date: Fri Dec 18 15:29:22 2009
New Revision: 892276
URL: http://svn.apache.org/viewvc?rev=892276&view=rev
Log:
Changed version number of Remote Service Admin interfaces bundle to 1.2.0-SNAPSHOT.
Hopefully this will fix the deploy build.
This commit also contains some WIP for local discovery.
Added:
cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/LocalDiscovery.java (with props)
Modified:
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml
cxf/dosgi/trunk/discovery/local/pom.xml
cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/Activator.java
cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml
cxf/dosgi/trunk/dsw/cxf-osgi-remote-service-admin-interfaces/pom.xml
cxf/dosgi/trunk/dsw/cxf-topology-manager/pom.xml
Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml?rev=892276&r1=892275&r2=892276&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml Fri Dec 18 15:29:22 2009
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.cxf.dosgi</groupId>
<artifactId>cxf-dosgi-remote-service-admin-interfaces</artifactId>
- <version>${remote.service.admin.interfaces.version}</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
Modified: cxf/dosgi/trunk/discovery/local/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/local/pom.xml?rev=892276&r1=892275&r2=892276&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/local/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/local/pom.xml Fri Dec 18 15:29:22 2009
@@ -27,21 +27,16 @@
<version>1.2-SNAPSHOT</version>
<parent>
- <groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
- <relativePath>../../parent/pom.xml</relativePath>
+ <groupId>org.apache.cxf.dosgi</groupId>
+ <artifactId>cxf-dosgi-ri-parent</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<properties>
<topDirectoryLocation>../..</topDirectoryLocation>
- <bundle.import.package>*</bundle.import.package>
- <bundle.export.package>
- org.apache.cxf.dosgi.discovery.local.*;version="${pom.version}",
- org.osgi.service.discovery;version="1.0";-split-package:=merge-first
- </bundle.export.package>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -54,26 +49,34 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf.dosgi</groupId>
+ <artifactId>cxf-dosgi-remote-service-admin-interfaces</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.jdom</groupId>
<artifactId>com.springsource.org.jdom</artifactId>
<version>1.0.0</version>
</dependency>
+
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <scope>test</scope>
- </dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
- <plugins>
- <plugin>
+ <plugins>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
@@ -82,12 +85,20 @@
<Bundle-Description>This bundle contains the implementation required by the CXF Local Discovery Service Bundle</Bundle-Description>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.apache.cxf.dosgi.discovery.local.Activator</Bundle-Activator>
- <Import-Package>${bundle.import.package}</Import-Package>
- <Export-Package>${bundle.export.package}</Export-Package>
+ <Import-Package>*</Import-Package>
+ <Private-Package>org.apache.cxf.dosgi.discovery.local</Private-Package>
+ <Export-Package>
+ org.osgi.service.remoteserviceadmin;version="${remote.service.admin.interfaces.version}"
+ </Export-Package>
</instructions>
</configuration>
</plugin>
- </plugins>
+ </plugins>
</build>
+ <!-- <bundle.import.package>*</bundle.import.package>
+ <bundle.export.package>
+ org.apache.cxf.dosgi.discovery.local.*;version="${pom.version}",
+ org.osgi.service.discovery;version="1.0";-split-package:=merge-first
+ </bundle.export.package> -->
</project>
Modified: cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/Activator.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/Activator.java?rev=892276&r1=892275&r2=892276&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/Activator.java (original)
+++ cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/Activator.java Fri Dec 18 15:29:22 2009
@@ -18,34 +18,17 @@
*/
package org.apache.cxf.dosgi.discovery.local;
-
-import java.util.Hashtable;
-import java.util.logging.Logger;
-
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.discovery.Discovery;
-
public class Activator implements BundleActivator {
- private static final Logger LOG = Logger.getLogger(Activator.class.getName());
-
- private LocalDiscoveryService discoveryService;
- private ServiceRegistration discoveryServiceReg;
+ private LocalDiscovery localDiscovery;
- public void start(BundleContext context) {
- LOG.info("Registering LocalDiscoveryService service object");
- discoveryService = new LocalDiscoveryService(context);
-
- discoveryServiceReg = context.registerService(
- Discovery.class.getName(),
- discoveryService,
- new Hashtable<String, Object>());
+ public synchronized void start(BundleContext context) {
+ localDiscovery = new LocalDiscovery(context);
}
- public void stop(BundleContext context) {
- discoveryServiceReg.unregister();
- discoveryService.shutdown();
+ public synchronized void stop(BundleContext context) {
+ localDiscovery.shutDown();
}
}
Added: cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/LocalDiscovery.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/LocalDiscovery.java?rev=892276&view=auto
==============================================================================
--- cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/LocalDiscovery.java (added)
+++ cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/LocalDiscovery.java Fri Dec 18 15:29:22 2009
@@ -0,0 +1,59 @@
+/**
+ * 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.cxf.dosgi.discovery.local;
+
+import java.util.List;
+import java.util.logging.Logger;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.BundleListener;
+import org.osgi.service.remoteserviceadmin.EndpointDescription;
+
+public class LocalDiscovery implements BundleListener {
+ private static final Logger LOG = Logger.getLogger(LocalDiscovery.class.getName());
+
+ private final BundleContext bundleContext;
+
+ public LocalDiscovery(BundleContext bc) {
+ bundleContext = bc;
+
+ bundleContext.addBundleListener(this);
+ }
+
+ public void shutDown() {
+ bundleContext.removeBundleListener(this);
+ }
+
+ // BundleListener method
+ public void bundleChanged(BundleEvent be) {
+ switch (be.getType()) {
+ case BundleEvent.STARTED:
+ findDeclaredRemoteServices(be.getBundle());
+ break;
+ case BundleEvent.STOPPING:
+ break;
+ }
+ }
+
+ private void findDeclaredRemoteServices(Bundle bundle) {
+// List<EndpointDescription> refs = LocalDiscoveryUtils.getAllRemoteReferences(bundle);
+ }
+}
Propchange: cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/LocalDiscovery.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/LocalDiscovery.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml?rev=892276&r1=892275&r2=892276&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml Fri Dec 18 15:29:22 2009
@@ -26,34 +26,28 @@
<version>1.2-SNAPSHOT</version>
<parent>
- <groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
- <relativePath>../../parent/pom.xml</relativePath>
+ <groupId>org.apache.cxf.dosgi</groupId>
+ <artifactId>cxf-dosgi-ri-parent</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<properties>
<topDirectoryLocation>../..</topDirectoryLocation>
<bundle.import.package>*</bundle.import.package>
<bundle.export.package>
- org.apache.cxf.dosgi.*;version="${pom.version}",
- org.osgi.service.remoteserviceadmin;version="${remote.service.admin.interfaces.version}"
+ org.apache.cxf.dosgi.*;version="${pom.version}",
+ org.osgi.service.remoteserviceadmin;version="${remote.service.admin.interfaces.version}"
</bundle.export.package>
- <!--
- org.osgi.service.discovery;-split-package:=merge-first,
- org.osgi.service.distribution;-split-package:=merge-first
- -->
</properties>
<dependencies>
-
<dependency>
<groupId>org.apache.cxf.dosgi</groupId>
<artifactId>cxf-dosgi-remote-service-admin-interfaces</artifactId>
- <version>${remote.service.admin.interfaces.version}</version>
- <!-- <scope>provided</scope> Include the interfaces -->
+ <version>${pom.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle-minimal</artifactId>
@@ -76,25 +70,25 @@
<version>1.0.0</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <scope>test</scope>
- </dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-core</artifactId>
- <version>${spring.osgi.version}</version>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
+ <version>${spring.osgi.version}</version>
</dependency>
</dependencies>
<build>
- <plugins>
- <plugin>
+ <plugins>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
@@ -111,20 +105,17 @@
<Private-Package>org.osgi.service.discovery,org.osgi.service.distribution</Private-Package>
</instructions>
</configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/TestUtils*</exclude>
- </excludes>
- </configuration>
- </plugin>
+ </plugin>
-
- </plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/TestUtils*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
-
</project>
Modified: cxf/dosgi/trunk/dsw/cxf-osgi-remote-service-admin-interfaces/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-osgi-remote-service-admin-interfaces/pom.xml?rev=892276&r1=892275&r2=892276&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-osgi-remote-service-admin-interfaces/pom.xml (original)
+++ cxf/dosgi/trunk/dsw/cxf-osgi-remote-service-admin-interfaces/pom.xml Fri Dec 18 15:29:22 2009
@@ -21,7 +21,7 @@
<artifactId>cxf-dosgi-remote-service-admin-interfaces</artifactId>
<packaging>bundle</packaging>
<name>Distributed OSGi Remote Service Admin interfaces</name>
- <version>${remote.service.admin.interfaces.version}</version>
+ <version>1.2-SNAPSHOT</version>
<parent>
<groupId>org.apache.cxf.dosgi</groupId>
@@ -30,15 +30,11 @@
<relativePath>../../parent/pom.xml</relativePath>
</parent>
-
<properties>
<bundle.symbolicName>cxf-dosgi-remote-service-admin-interfaces</bundle.symbolicName>
<bundle.namespace>org.osgi.service.remoteserviceadmin</bundle.namespace>
</properties>
-
-
-
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -53,9 +49,6 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
-
-
<build>
<plugins>
@@ -77,7 +70,6 @@
</configuration>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/pom.xml?rev=892276&r1=892275&r2=892276&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/pom.xml (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/pom.xml Fri Dec 18 15:29:22 2009
@@ -40,11 +40,6 @@
</properties>
<dependencies>
- <!--
- <dependency> <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle-minimal</artifactId>
- <version>${cxf.version}</version> </dependency>
- -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
@@ -60,8 +55,7 @@
<dependency>
<groupId>org.apache.cxf.dosgi</groupId>
<artifactId>cxf-dosgi-remote-service-admin-interfaces</artifactId>
- <version>${remote.service.admin.interfaces.version}</version>
- <!-- <scope>provided</scope> Include the interfaces -->
+ <version>${pom.version}</version>
</dependency>
<dependency>
@@ -86,7 +80,7 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-Name>CXF dOSGi Topology Manager</Bundle-Name>
- <Bundle-Description>TODO</Bundle-Description>
+ <Bundle-Description>Default CXF Topology Manager as described in OSGi Remote Service Admin specification.</Bundle-Description>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
<Bundle-Activator>org.apache.cxf.dosgi.topologymanager.Activator</Bundle-Activator>
@@ -105,9 +99,6 @@
</excludes>
</configuration>
</plugin>
-
-
</plugins>
</build>
-
</project>