[maven-release-plugin] copy for tag cxf-dosgi-ri-1.0
git-svn-id: https://svn.apache.org/repos/asf/cxf/dosgi/tags/cxf-dosgi-ri-1.0@772613 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/discovery/local/src/main/java/org/osgi/service/discovery/ServicePublication.java b/discovery/local/src/main/java/org/osgi/service/discovery/ServicePublication.java
index 40c9641..ac34470 100644
--- a/discovery/local/src/main/java/org/osgi/service/discovery/ServicePublication.java
+++ b/discovery/local/src/main/java/org/osgi/service/discovery/ServicePublication.java
@@ -48,7 +48,6 @@
* mechanisms has to succeed.
*
* @ThreadSafe
- * @version $Revision: 6845 $
*/
public interface ServicePublication {
@@ -60,7 +59,7 @@
* Value of this property is of type
* <code>Collection (<? extends String>)</code>.
*/
- public static final String SERVICE_INTERFACE_NAME = "osgi.remote.interfaces";
+ public static final String SERVICE_INTERFACE_NAME = "osgi.remote.service.interfaces";
/**
* Optional ServiceRegistration property which contains a collection of
@@ -74,7 +73,7 @@
* <code>Collection (<? extends String>)</code>, may be
* <code>null</code> or empty.
*/
- public static final String SERVICE_INTERFACE_VERSION = "osgi.remote.interfaces.version";
+ public static final String SERVICE_INTERFACE_VERSION = "osgi.remote.service.interfaces.version";
/**
* Optional ServiceRegistration property which contains a collection of
diff --git a/distribution/multi-bundle/pom.xml b/distribution/multi-bundle/pom.xml
index 6accbac..b6a112a 100644
--- a/distribution/multi-bundle/pom.xml
+++ b/distribution/multi-bundle/pom.xml
@@ -33,6 +33,7 @@
</parent>
<properties>
+ <dosgi.version>${pom.version}</dosgi.version>
<topDirectoryLocation>../..</topDirectoryLocation>
</properties>
diff --git a/distribution/multi-bundle/src/main/assembly/assembly.xml b/distribution/multi-bundle/src/main/assembly/assembly.xml
index 53ce22e..c2868b5 100644
--- a/distribution/multi-bundle/src/main/assembly/assembly.xml
+++ b/distribution/multi-bundle/src/main/assembly/assembly.xml
@@ -26,32 +26,32 @@
<fileSets>
<fileSet>
<directory>target/distribution_bundles</directory>
- <outputDirectory>dosgi_bundles</outputDirectory>
+ <outputDirectory>apache-cxf-dosgi-ri-${dosgi.version}/dosgi_bundles</outputDirectory>
</fileSet>
<fileSet>
<directory>target/distribution_configs</directory>
- <outputDirectory>conf</outputDirectory>
+ <outputDirectory>apache-cxf-dosgi-ri-${dosgi.version}/conf</outputDirectory>
</fileSet>
<fileSet>
<directory>target/maven-shared-archive-resources/META-INF</directory>
<excludes>
<exclude>DEPENDENCIES</exclude>
</excludes>
- <outputDirectory></outputDirectory>
+ <outputDirectory>apache-cxf-dosgi-ri-${dosgi.version}</outputDirectory>
</fileSet>
<fileSet>
<directory>src/main/resources/META-INF</directory>
<includes>
<include>NOTICE.jdom</include>
</includes>
- <outputDirectory></outputDirectory>
+ <outputDirectory>apache-cxf-dosgi-ri-${dosgi.version}</outputDirectory>
</fileSet>
<fileSet>
<directory>src/main/release</directory>
<includes>
<include>README</include>
</includes>
- <outputDirectory></outputDirectory>
+ <outputDirectory>apache-cxf-dosgi-ri-${dosgi.version}</outputDirectory>
</fileSet>
</fileSets>
</assembly>
diff --git a/distribution/multi-bundle/src/main/release/README b/distribution/multi-bundle/src/main/release/README
index c7eafd4..b80a854 100644
--- a/distribution/multi-bundle/src/main/release/README
+++ b/distribution/multi-bundle/src/main/release/README
@@ -13,7 +13,13 @@
1. Multi-bundle distro: cxf-dosgi-ri-multibundle-distribution-1.0.{tar.gaz|zip}
Contains the dOSGi implementation and all 3rd party dependencies as
-separate bundles within an archive.
+separate bundles within an archive. The current distribution is an
+instance of this type. The easiest way to get started is to explode
+this archive into your Felix or Equinox installation tree. Then
+append the contents of the felix.config.properties.append or
+equinox.config.ini.append snippets found in the conf directory to
+your felix.config.properties or equinox.config.ini. This will cause
+all the required bundles to be loaded on start-up.
2. Single-bundle distro: cxf-dosgi-ri-singlebundle-distribution-1.0.jar
diff --git a/distribution/multi-bundle/src/main/resources/distro_bundles.xml b/distribution/multi-bundle/src/main/resources/distro_bundles.xml
index a184ca2..7f1bb18 100644
--- a/distribution/multi-bundle/src/main/resources/distro_bundles.xml
+++ b/distribution/multi-bundle/src/main/resources/distro_bundles.xml
@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<bundles>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/geronimo-annotation_1.0_spec-1.1.1.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/geronimo-activation_1.1_spec-1.0.2.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/geronimo-javamail_1.4_spec-1.2.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/geronimo-ws-metadata_2.0_spec-1.1.2.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/com.springsource.org.apache.commons.logging-1.1.1.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/com.springsource.org.jdom-1.0.0.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/spring-core-${spring.version}.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/spring-beans-${spring.version}.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/spring-context-${spring.version}.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/com.springsource.org.aopalliance-1.0.0.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/spring-aop-${spring.version}.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/spring-osgi-io-${spring.osgi.version}.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/spring-osgi-core-${spring.osgi.version}.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/spring-osgi-extender-${spring.osgi.version}.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/pax-web-service-0.5.1.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/org.apache.servicemix.bundles.jaxb-impl-${jaxbimpl.bundle.version}.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/org.apache.servicemix.bundles.wsdl4j-${wsdl4j.bundle.version}.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/org.apache.servicemix.bundles.xmlsec-${xmlsec.bundle.version}.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/org.apache.servicemix.bundles.xmlschema-${xmlschema.bundle.version}.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/org.apache.servicemix.bundles.asm-${asm.bundle.version}.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/org.apache.servicemix.bundles.xmlresolver-${xmlresolver.bundle.version}.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/org.apache.servicemix.bundles.neethi-${neethi.bundle.version}.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/org.apache.servicemix.bundles.woodstox-${woodstox.bundle.version}.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/cxf-bundle-minimal-${cxf.version}.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/org.apache.servicemix.specs.saaj-api-1.3-${servicemix.specs.version}.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/org.apache.servicemix.specs.stax-api-1.0-${servicemix.specs.version}.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/org.apache.servicemix.specs.jaxb-api-2.1-${servicemix.specs.version}.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/org.apache.servicemix.specs.jaxws-api-2.1-${servicemix.specs.version}.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/cxf-dosgi-ri-discovery-local-${pom.version}.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/cxf-dosgi-ri-dsw-cxf-${pom.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-annotation_1.0_spec-1.1.1.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-activation_1.1_spec-1.0.2.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-javamail_1.4_spec-1.2.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-ws-metadata_2.0_spec-1.1.2.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.org.apache.commons.logging-1.1.1.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.org.jdom-1.0.0.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-core-${spring.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-beans-${spring.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-context-${spring.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.org.aopalliance-1.0.0.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-aop-${spring.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-osgi-io-${spring.osgi.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-osgi-core-${spring.osgi.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-osgi-extender-${spring.osgi.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/pax-web-service-0.5.1.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.jaxb-impl-${jaxbimpl.bundle.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.wsdl4j-${wsdl4j.bundle.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.xmlsec-${xmlsec.bundle.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.xmlschema-${xmlschema.bundle.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.asm-${asm.bundle.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.xmlresolver-${xmlresolver.bundle.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.neethi-${neethi.bundle.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.woodstox-${woodstox.bundle.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-bundle-minimal-${cxf.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.saaj-api-1.3-${servicemix.specs.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.stax-api-1.0-${servicemix.specs.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.jaxb-api-2.1-${servicemix.specs.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.jaxws-api-2.1-${servicemix.specs.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-discovery-local-${pom.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-dsw-cxf-${pom.version}.jar</bundle>
</bundles>
diff --git a/distribution/multi-bundle/src/main/xsl/equinox_distro_config.xslt b/distribution/multi-bundle/src/main/xsl/equinox_distro_config.xslt
index 956da64..fa50e20 100644
--- a/distribution/multi-bundle/src/main/xsl/equinox_distro_config.xslt
+++ b/distribution/multi-bundle/src/main/xsl/equinox_distro_config.xslt
@@ -5,7 +5,7 @@
org.ops4j.pax.web.session.timeout=30
osgi.bundles=org.eclipse.osgi.services@start, \
-<xsl:for-each select="//bundles/bundle">../dosgi_bundles/<xsl:value-of select="substring-after(text(), '.dir/dosgi_bundles/')"/><xsl:value-of select="string('@start, ')"/></xsl:for-each>
+<xsl:for-each select="//bundles/bundle">../apache-cxf-dosgi-ri-1.0/dosgi_bundles/<xsl:value-of select="substring-after(text(), '.dir/apache-cxf-dosgi-ri-1.0/dosgi_bundles/')"/><xsl:value-of select="string('@start, ')"/></xsl:for-each>
</xsl:template>
</xsl:transform>
diff --git a/distribution/multi-bundle/src/main/xsl/felix_distro_config.xslt b/distribution/multi-bundle/src/main/xsl/felix_distro_config.xslt
index f118f56..377d06c 100644
--- a/distribution/multi-bundle/src/main/xsl/felix_distro_config.xslt
+++ b/distribution/multi-bundle/src/main/xsl/felix_distro_config.xslt
@@ -7,7 +7,7 @@
felix.auto.start.2=http://www.apache.org/dist/felix/org.osgi.compendium-1.2.0.jar
<xsl:for-each select="//bundles/bundle">
<xsl:variable name="i" select="position() + count(//bundles/felix_deps) + 2"/>
-felix.auto.start.<xsl:value-of select="$i"/>=file:dosgi_bundles/<xsl:value-of select="substring-after(text(), '.dir/dosgi_bundles/')"/>
+felix.auto.start.<xsl:value-of select="$i"/>=file:apache-cxf-dosgi-ri-1.0/dosgi_bundles/<xsl:value-of select="substring-after(text(), '.dir/apache-cxf-dosgi-ri-1.0/dosgi_bundles/')"/>
</xsl:for-each>
</xsl:template>
</xsl:transform>
diff --git a/distribution/single-bundle/src/main/resources/META-INF/README b/distribution/single-bundle/src/main/resources/META-INF/README
new file mode 100644
index 0000000..d67ed18
--- /dev/null
+++ b/distribution/single-bundle/src/main/resources/META-INF/README
@@ -0,0 +1,53 @@
+Welcome to the Apache CXF Distributed OSGi DSW Reference Implementation
+=======================================================================
+
+
+The dOSGi subproject of Apache CXF provides the Reference Implementation
+of the Distribution Software (DSW) component of the Distributed OSGi
+Specification[1].
+
+
+This release is provided for your convenience in three different
+distribution formats:
+
+1. Multi-bundle distro: cxf-dosgi-ri-multibundle-distribution-1.0.{tar.gaz|zip}
+
+Contains the dOSGi implementation and all 3rd party dependencies as
+separate bundles within an archive.
+
+
+2. Single-bundle distro: cxf-dosgi-ri-singlebundle-distribution-1.0.jar
+
+Contains the dOSGi implementation and all 3rd party dependencies wrapped
+in a single OSGi bundle so as to allow direct installation in your favourite
+OSGi container in one fell swoop. The current distribution is an instance
+of this type.
+
+
+3. Source distro: cxf-dosgi-ri-source-distribution-1.1-SNAPSHOT.{tar.gz|zip}
+
+Contains the entire source tree for dOSGi.
+
+
+The best starting point for using dOSGi is the Getting Started Guide[2].
+
+Also note the very detailed walk-through of the greeter demo[3].
+
+If you need more help, or want to provide any feedback, please feel free
+to drop us a note on the CXF dev or users list[4].
+
+If you trip over any problems with dOSGi, don't hesitate to submit an issue
+to the CXF JIRA[5] with the component set to "Distributed-OSGi".
+
+
+Thanks for using dOSGi!
+
+Regards,
+The CXF dOSGi team.
+
+
+[1] See RFC 119 in http://www.osgi.org/download/osgi-4.2-early-draft3.pdf
+[2] http://cxf.apache.org/distributed-osgi.html#DistributedOSGi-GettingStarted
+[3] http://cxf.apache.org/distributed-osgi-greeter-demo-walkthrough.htm
+[4] http://cxf.apache.org/mailing-lists.html
+[5] https://issues.apache.org/jira/browse/CXF
diff --git a/distribution/sources/src/main/assembly/src.xml b/distribution/sources/src/main/assembly/src.xml
index 2a3293e..d579ce5 100644
--- a/distribution/sources/src/main/assembly/src.xml
+++ b/distribution/sources/src/main/assembly/src.xml
@@ -59,8 +59,9 @@
<includes>
<include>LICENSE</include>
<include>NOTICE</include>
+ <include>README</include>
</includes>
- <outputDirectory></outputDirectory>
+ <outputDirectory>apache-cxf-dosgi-ri-${dosgi.version}</outputDirectory>
</fileSet>
</fileSets>
</assembly>
diff --git a/distribution/sources/src/main/release/README b/distribution/sources/src/main/release/README
new file mode 100644
index 0000000..6162d5c
--- /dev/null
+++ b/distribution/sources/src/main/release/README
@@ -0,0 +1,57 @@
+Welcome to the Apache CXF Distributed OSGi DSW Reference Implementation
+=======================================================================
+
+
+The dOSGi subproject of Apache CXF provides the Reference Implementation
+of the Distribution Software (DSW) component of the Distributed OSGi
+Specification[1].
+
+
+This release is provided for your convenience in three different
+distribution formats:
+
+1. Multi-bundle distro: cxf-dosgi-ri-multibundle-distribution-1.0.{tar.gaz|zip}
+
+Contains the dOSGi implementation and all 3rd party dependencies as
+separate bundles within an archive. The current distribution is an
+instance of this type.
+
+
+2. Single-bundle distro: cxf-dosgi-ri-singlebundle-distribution-1.0.jar
+
+Contains the dOSGi implementation and all 3rd party dependencies wrapped
+in a single OSGi bundle so as to allow direct installation in your favourite
+OSGi container in one fell swoop.
+
+
+3. Source distro: cxf-dosgi-ri-source-distribution-1.1-SNAPSHOT.{tar.gz|zip}
+
+Contains the entire source tree for dOSGi. The current distribution is
+an instance of this type. It may be built by running "mvn install" from
+the top level directory. Ensure you have maven installed, version 2.0.9
+or higher is recommended. Also a JDK of version 1.5.0_13 or higher is
+required.
+
+
+The best starting point for using dOSGi is the Getting Started Guide[2].
+
+Also note the very detailed walk-through of the greeter demo[3].
+
+If you need more help, or want to provide any feedback, please feel free
+to drop us a note on the CXF dev or users list[4].
+
+If you trip over any problems with dOSGi, don't hesitate to submit an issue
+to the CXF JIRA[5] with the component set to "Distributed-OSGi".
+
+
+Thanks for using dOSGi!
+
+Regards,
+The CXF dOSGi team.
+
+
+[1] See RFC 119 in http://www.osgi.org/download/osgi-4.2-early-draft3.pdf
+[2] http://cxf.apache.org/distributed-osgi.html#DistributedOSGi-GettingStarted
+[3] http://cxf.apache.org/distributed-osgi-greeter-demo-walkthrough.htm
+[4] http://cxf.apache.org/mailing-lists.html
+[5] https://issues.apache.org/jira/browse/CXF
diff --git a/dsw/cxf-dsw/src/main/java/org/osgi/service/discovery/ServicePublication.java b/dsw/cxf-dsw/src/main/java/org/osgi/service/discovery/ServicePublication.java
index 40c9641..ac34470 100644
--- a/dsw/cxf-dsw/src/main/java/org/osgi/service/discovery/ServicePublication.java
+++ b/dsw/cxf-dsw/src/main/java/org/osgi/service/discovery/ServicePublication.java
@@ -48,7 +48,6 @@
* mechanisms has to succeed.
*
* @ThreadSafe
- * @version $Revision: 6845 $
*/
public interface ServicePublication {
@@ -60,7 +59,7 @@
* Value of this property is of type
* <code>Collection (<? extends String>)</code>.
*/
- public static final String SERVICE_INTERFACE_NAME = "osgi.remote.interfaces";
+ public static final String SERVICE_INTERFACE_NAME = "osgi.remote.service.interfaces";
/**
* Optional ServiceRegistration property which contains a collection of
@@ -74,7 +73,7 @@
* <code>Collection (<? extends String>)</code>, may be
* <code>null</code> or empty.
*/
- public static final String SERVICE_INTERFACE_VERSION = "osgi.remote.interfaces.version";
+ public static final String SERVICE_INTERFACE_VERSION = "osgi.remote.service.interfaces.version";
/**
* Optional ServiceRegistration property which contains a collection of
