Author: sergeyb
Date: Wed Jan 25 11:24:41 2012
New Revision: 1235719
URL: http://svn.apache.org/viewvc?rev=1235719&view=rev
Log:
Removing all the refs to the local remote service admin module
Modified:
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml
cxf/dosgi/trunk/discovery/local/pom.xml
cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_buildsystem_config.xslt
cxf/dosgi/trunk/distribution/single-bundle/pom.xml
cxf/dosgi/trunk/distribution/sources/src/main/release/release_notes.txt
cxf/dosgi/trunk/dsw/cxf-dsw/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=1235719&r1=1235718&r2=1235719&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml Wed Jan 25
11:24:41 2012
@@ -58,9 +58,9 @@
</dependency>
<dependency>
- <groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-remote-service-admin-interfaces</artifactId>
- <version>${project.version}</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.enterprise</artifactId>
+ <version>${osgi.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=1235719&r1=1235718&r2=1235719&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/local/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/local/pom.xml Wed Jan 25 11:24:41 2012
@@ -51,9 +51,9 @@
</dependency>
<dependency>
- <groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-remote-service-admin-interfaces</artifactId>
- <version>${project.version}</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.enterprise</artifactId>
+ <version>${osgi.version}</version>
</dependency>
<dependency>
Modified:
cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_buildsystem_config.xslt
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_buildsystem_config.xslt?rev=1235719&r1=1235718&r2=1235719&view=diff
==============================================================================
---
cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_buildsystem_config.xslt
(original)
+++
cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_buildsystem_config.xslt
Wed Jan 25 11:24:41 2012
@@ -6,7 +6,6 @@
<xsl:template match="/">
org.ops4j.pax.web.session.timeout=30
org.osgi.framework.startlevel.beginning=<xsl:value-of
select="count(//bundles/felix_deps) + count(//bundles/bundle) + $Offset"/>
-felix.auto.start.<xsl:value-of
select="$Offset"/>=http://repo2.maven.org/maven2/org/osgi/org.osgi.compendium/4.2.0/org.osgi.compendium-4.2.0.jar
<xsl:for-each select="//bundles/bundle">
<xsl:variable name="i" select="position() + count(//bundles/felix_deps)
+ $Offset"/>
felix.auto.start.<xsl:value-of select="$i"/>=file:<xsl:if
test="not(starts-with($TargetDir,'/'))"><xsl:value-of
select="'/'"/></xsl:if><xsl:value-of select="$TargetDir"/><xsl:value-of
select="text()"/>
Modified: cxf/dosgi/trunk/distribution/single-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/single-bundle/pom.xml?rev=1235719&r1=1235718&r2=1235719&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/single-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/single-bundle/pom.xml Wed Jan 25 11:24:41 2012
@@ -349,7 +349,6 @@
org.apache.cxf.dosgi.*;version="${project.version}",
org.apache.cxf.*;version="${cxf.version}",
org.jdom.*;version="1.1.0",
- org.osgi.service.cm;version="1.2",
org.osgi.service.remoteserviceadmin;version="1.0.0",
!*
</_exportcontents>
Modified:
cxf/dosgi/trunk/distribution/sources/src/main/release/release_notes.txt
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/sources/src/main/release/release_notes.txt?rev=1235719&r1=1235718&r2=1235719&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/sources/src/main/release/release_notes.txt
(original)
+++ cxf/dosgi/trunk/distribution/sources/src/main/release/release_notes.txt Wed
Jan 25 11:24:41 2012
@@ -16,19 +16,20 @@ Many dependencies have been updated, inc
Additionally, a number of bugs has been fixed including:
-DOSGI-82 Populate custom servicename, portname and targetnamespace for
jax-ws
+DOSGI-108 service.exported.interfaces doesn't support comma-seperated String
value
DOSGI-107 Support for a 'wsdl' configuration type
-DOSGI-97 Automatically unregister HTTP servlets/resources if exported
service goes down
-DOSGI-75 CXF Distributed OSGi isn't using
org.apache.cxf.common.logging.LogUtils
+DOSGI-105 Update greeter_rest demo to use OSGI HttpService
+DOSGI-103 Improve multi-bundle distro configuration for Felix
DOSGI-102 DOSGI RI can not map invocation exceptions to custom exceptions on
the client side
-DOSGI-91 DOSGI RS Proxies ignore ResponseExceptionMapper providers
-DOSGI-76 EndpointListener.endpointRemoved
+DOSGI-97 Automatically unregister HTTP servlets/resources if exported
service goes down
DOSGI-94 Enhancement to deal with registered services that might have been
proxied
-DOSGI-103 Improve multi-bundle distro configuration for Felix
-DOSGI-77 NullPointerException from Distributed OSGI when bundle with wanted
properties is started.
-DOSGI-79 RemoteServiceAdmin.getImportedEndpoints() returns collection of
incorrect type
+DOSGI-91 DOSGI RS Proxies ignore ResponseExceptionMapper providers
DOSGI-85 Unable to export services started after Topology manager
-DOSGI-105 Update greeter_rest demo to use OSGI HttpService
+DOSGI-82 Populate custom servicename, portname and targetnamespace for
jax-ws
+DOSGI-79 RemoteServiceAdmin.getImportedEndpoints() returns collection of
incorrect type
+DOSGI-77 NullPointerException from Distributed OSGI when bundle with wanted
properties is started.
+DOSGI-76 EndpointListener.endpointRemoved
+DOSGI-75 CXF Distributed OSGi isn't using
org.apache.cxf.common.logging.LogUtils
Apache CXF Distributed OSGi 1.2 Release Notes
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml?rev=1235719&r1=1235718&r2=1235719&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml Wed Jan 25 11:24:41 2012
@@ -48,9 +48,9 @@
<dependencies>
<dependency>
- <groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-remote-service-admin-interfaces</artifactId>
- <version>${project.version}</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.enterprise</artifactId>
+ <version>${osgi.version}</version>
</dependency>
<dependency>
