Author: sergeyb
Date: Mon Oct 13 09:06:45 2008
New Revision: 704146
URL: http://svn.apache.org/viewvc?rev=704146&view=rev
Log:
DOSGI : applying CXF-1862 patch on behalf of David B.
Added:
cxf/sandbox/dosgi/felix/framework/src/main/java/org/osgi/service/distribution/
cxf/sandbox/dosgi/felix/framework/src/main/java/org/osgi/service/distribution/DistributionProvider.java
- copied, changed from r703569,
cxf/sandbox/dosgi/felix/framework/src/main/java/org/osgi/service/dsw/DistributionProvider.java
Removed:
cxf/sandbox/dosgi/felix/framework/src/main/java/org/osgi/service/dsw/
Modified:
cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Activator.java
cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/CxfDistributionProvider.java
cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/DistributionProviderImpl.java
cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/ActivatorTest.java
cxf/sandbox/dosgi/felix/framework/pom.xml
cxf/sandbox/dosgi/felix/main/pom.xml
cxf/sandbox/dosgi/felix/main/src/main/resources/config.properties
Modified:
cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Activator.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Activator.java?rev=704146&r1=704145&r2=704146&view=diff
==============================================================================
---
cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Activator.java
(original)
+++
cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Activator.java
Mon Oct 13 09:06:45 2008
@@ -42,7 +42,7 @@
import org.osgi.framework.hooks.service.ListenerHook;
import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.cm.ManagedService;
-import org.osgi.service.dsw.DistributionProvider;
+import org.osgi.service.distribution.DistributionProvider;
public class Activator implements BundleActivator, ServiceListener,
ManagedService {
Modified:
cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/CxfDistributionProvider.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/CxfDistributionProvider.java?rev=704146&r1=704145&r2=704146&view=diff
==============================================================================
---
cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/CxfDistributionProvider.java
(original)
+++
cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/CxfDistributionProvider.java
Mon Oct 13 09:06:45 2008
@@ -21,7 +21,7 @@
import java.util.Map;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.dsw.DistributionProvider;
+import org.osgi.service.distribution.DistributionProvider;
public interface CxfDistributionProvider extends DistributionProvider {
void addExposedService(ServiceReference serviceReference, Map<String,
String> publicationProperties);
Modified:
cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/DistributionProviderImpl.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/DistributionProviderImpl.java?rev=704146&r1=704145&r2=704146&view=diff
==============================================================================
---
cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/DistributionProviderImpl.java
(original)
+++
cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/DistributionProviderImpl.java
Mon Oct 13 09:06:45 2008
@@ -25,7 +25,7 @@
import java.util.Set;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.dsw.DistributionProvider;
+import org.osgi.service.distribution.DistributionProvider;
public class DistributionProviderImpl implements DistributionProvider,
CxfDistributionProvider {
Modified:
cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/ActivatorTest.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/ActivatorTest.java?rev=704146&r1=704145&r2=704146&view=diff
==============================================================================
---
cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/ActivatorTest.java
(original)
+++
cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/ActivatorTest.java
Mon Oct 13 09:06:45 2008
@@ -19,7 +19,7 @@
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.dsw.DistributionProvider;
+import org.osgi.service.distribution.DistributionProvider;
public class ActivatorTest extends TestCase{
Modified: cxf/sandbox/dosgi/felix/framework/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/felix/framework/pom.xml?rev=704146&r1=704145&r2=704146&view=diff
==============================================================================
--- cxf/sandbox/dosgi/felix/framework/pom.xml (original)
+++ cxf/sandbox/dosgi/felix/framework/pom.xml Mon Oct 13 09:06:45 2008
@@ -86,7 +86,7 @@
<Bundle-Name>Apache Felix Framework</Bundle-Name>
<Bundle-Description>OSGi R4 framework
implementation.</Bundle-Description>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
-
<Export-Package>org.osgi.framework;-split-package:=merge-first,org.osgi.framework.hooks.service;-split-package:=merge-first,org.osgi.service.packageadmin,org.osgi.service.url,org.osgi.service.discovery,org.osgi.service.dsw,org.osgi.service.startlevel,org.osgi.util.tracker</Export-Package>
+
<Export-Package>org.osgi.framework;-split-package:=merge-first,org.osgi.framework.hooks.service;-split-package:=merge-first,org.osgi.service.packageadmin,org.osgi.service.url,org.osgi.service.discovery,org.osgi.service.distribution,org.osgi.service.startlevel,org.osgi.util.tracker</Export-Package>
<Private-Package>org.apache.felix.moduleloader.*,org.apache.felix.framework.*</Private-Package>
<Import-Package>!*</Import-Package>
<Include-Resource>META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,{src/main/resources/},org/osgi/framework/=target/classes/org/osgi/framework/</Include-Resource>
Copied:
cxf/sandbox/dosgi/felix/framework/src/main/java/org/osgi/service/distribution/DistributionProvider.java
(from r703569,
cxf/sandbox/dosgi/felix/framework/src/main/java/org/osgi/service/dsw/DistributionProvider.java)
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/felix/framework/src/main/java/org/osgi/service/distribution/DistributionProvider.java?p2=cxf/sandbox/dosgi/felix/framework/src/main/java/org/osgi/service/distribution/DistributionProvider.java&p1=cxf/sandbox/dosgi/felix/framework/src/main/java/org/osgi/service/dsw/DistributionProvider.java&r1=703569&r2=704146&rev=704146&view=diff
==============================================================================
---
cxf/sandbox/dosgi/felix/framework/src/main/java/org/osgi/service/dsw/DistributionProvider.java
(original)
+++
cxf/sandbox/dosgi/felix/framework/src/main/java/org/osgi/service/distribution/DistributionProvider.java
Mon Oct 13 09:06:45 2008
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.osgi.service.dsw;
+package org.osgi.service.distribution;
import java.util.Map;
Modified: cxf/sandbox/dosgi/felix/main/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/felix/main/pom.xml?rev=704146&r1=704145&r2=704146&view=diff
==============================================================================
--- cxf/sandbox/dosgi/felix/main/pom.xml (original)
+++ cxf/sandbox/dosgi/felix/main/pom.xml Mon Oct 13 09:06:45 2008
@@ -165,7 +165,7 @@
<Bundle-Name>Apache Felix</Bundle-Name>
<Bundle-Description>OSGi R4 framework.</Bundle-Description>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
-
<Private-Package>org.apache.felix.main.*,org.apache.felix.moduleloader.*;-split-package:=merge-first,org.apache.felix.framework.*;-split-package:=merge-first,org.osgi.framework;-split-package:=merge-first,org.osgi.framework.hooks.service;-split-package:=merge-first,org.osgi.service.packageadmin;-split-package:=merge-first,org.osgi.service.startlevel;-split-package:=merge-first,org.osgi.service.url;-split-package:=merge-first,org.osgi.service.discovery;-split-package:=merge-first,org.osgi.service.dsw;-split-package:=merge-first,org.osgi.util.tracker;-split-package:=merge-first</Private-Package>
+
<Private-Package>org.apache.felix.main.*,org.apache.felix.moduleloader.*;-split-package:=merge-first,org.apache.felix.framework.*;-split-package:=merge-first,org.osgi.framework;-split-package:=merge-first,org.osgi.framework.hooks.service;-split-package:=merge-first,org.osgi.service.packageadmin;-split-package:=merge-first,org.osgi.service.startlevel;-split-package:=merge-first,org.osgi.service.url;-split-package:=merge-first,org.osgi.service.discovery;-split-package:=merge-first,org.osgi.service.distribution;-split-package:=merge-first,org.osgi.util.tracker;-split-package:=merge-first</Private-Package>
<Import-Package>!*</Import-Package>
<Include-Resource>META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,{src/main/resources/}</Include-Resource>
<!-- Include these properties here because we want them
Modified: cxf/sandbox/dosgi/felix/main/src/main/resources/config.properties
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/felix/main/src/main/resources/config.properties?rev=704146&r1=704145&r2=704146&view=diff
==============================================================================
--- cxf/sandbox/dosgi/felix/main/src/main/resources/config.properties (original)
+++ cxf/sandbox/dosgi/felix/main/src/main/resources/config.properties Mon Oct
13 09:06:45 2008
@@ -24,7 +24,7 @@
org.osgi.service.startlevel; version=1.0.0, \
org.osgi.service.url; version=1.0.0, \
org.osgi.service.discovery, \
- org.osgi.service.dsw, \
+ org.osgi.service.distribution, \
org.osgi.util.tracker; version=1.3.2 \
${jre-${java.specification.version}}
