Author: davidb
Date: Fri Jan 16 06:31:21 2009
New Revision: 735027
URL: http://svn.apache.org/viewvc?rev=735027&view=rev
Log:
Fix for CXF-1967.
Import/export definition updated to:
<Include-Resource>
@cxf-bundle-minimal-${cxf.version}.jar!/META-INF/spring.*,
{maven-resources}
</Include-Resource>
<Import-Package>
org.osgi.*
</Import-Package>
<Export-Package>
org.apache.cxf.dosgi.singlebundle;version="${pom.version}"
</Export-Package>
<_exportcontents>
org.apache.cxf.dosgi.*;version="${pom.version}",
org.osgi.service.distribution;version="4.2.0",
org.osgi.service.discovery;version="4.2.0",
!*
</_exportcontents>
Package of the AggregatedActivator changed to org.apache.cxf.dosgi.single-bundle
Added:
cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/
cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivator.java
(contents, props changed)
- copied, changed from r734196, cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/AggregatedActivator.java
cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/SPIActivator.java
(contents, props changed)
- copied, changed from r734196, cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/SPIActivator.java
cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/singlebundle/
cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/singlebundle/activators.list
(props changed)
- copied unchanged from r734196, cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/activators.list
cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/
cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java
(contents, props changed)
- copied, changed from r735002, cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/AggregatedActivatorTest.java
Removed:
cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/AggregatedActivator.java
cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/SPIActivator.java
cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/activators.list
cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/old_activators.list
cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/AggregatedActivatorTest.java
Modified:
cxf/sandbox/dosgi/distribution/single-bundle/pom.xml
cxf/sandbox/dosgi/samples/greeter/interface/pom.xml
Modified: cxf/sandbox/dosgi/distribution/single-bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/distribution/single-bundle/pom.xml?rev=735027&r1=735026&r2=735027&view=diff
==============================================================================
--- cxf/sandbox/dosgi/distribution/single-bundle/pom.xml (original)
+++ cxf/sandbox/dosgi/distribution/single-bundle/pom.xml Fri Jan 16 06:31:21 2009
@@ -224,21 +224,25 @@
<Bundle-Name>Distributed OSGi Distribution Software Single-Bundle Distribution</Bundle-Name>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
- <Bundle-Activator>org.apache.cxf.dosgi.AggregatedActivator</Bundle-Activator>
+ <Bundle-Activator>org.apache.cxf.dosgi.singlebundle.AggregatedActivator</Bundle-Activator>
+ <Include-Resource>
+ @cxf-bundle-minimal-${cxf.version}.jar!/META-INF/spring.*,
+ {maven-resources}
+ </Include-Resource>
<Import-Package>
- !.,
- !bsh,
- org.osgi.*,
- *;resolution:=optional
+ org.osgi.*
</Import-Package>
<Export-Package>
- org.apache.cxf.dosgi,
- org.osgi.service.distribution;version="1.0",
- org.osgi.service.discovery;version="1.0"
+ org.apache.cxf.dosgi.singlebundle;version="${pom.version}"
</Export-Package>
<Embed-Dependency>*;scope=compile;inline=false</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
- <_exportcontents>*</_exportcontents>
+ <_exportcontents>
+ org.apache.cxf.dosgi.*;version="${pom.version}",
+ org.osgi.service.distribution;version="4.2.0",
+ org.osgi.service.discovery;version="4.2.0",
+ !*
+ </_exportcontents>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions>
</configuration>
Copied: cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivator.java
(from r734196, cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/AggregatedActivator.java)
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivator.java?p2=cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivator.java&p1=cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/AggregatedActivator.java&r1=734196&r2=735027&rev=735027&view=diff
==============================================================================
--- cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/AggregatedActivator.java
(original)
+++ cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivator.java
Fri Jan 16 06:31:21 2009
@@ -1,4 +1,22 @@
-package org.apache.cxf.dosgi;
+/**
+ * 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.singlebundle;
import java.io.BufferedReader;
import java.io.IOException;
@@ -24,11 +42,9 @@
for (String s : getActivators()) {
try {
- System.out.println("Activator class name " + s);
Class<?> clazz = getClass().getClassLoader().loadClass(s);
Object o = clazz.newInstance();
if (o instanceof BundleActivator) {
- System.out.println("Starting " + s);
BundleActivator ba = (BundleActivator) o;
activators.add(ba);
ba.start(ctx);
Propchange: cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivator.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivator.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/SPIActivator.java
(from r734196, cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/SPIActivator.java)
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/SPIActivator.java?p2=cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/SPIActivator.java&p1=cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/SPIActivator.java&r1=734196&r2=735027&rev=735027&view=diff
==============================================================================
--- cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/SPIActivator.java
(original)
+++ cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/SPIActivator.java
Fri Jan 16 06:31:21 2009
@@ -1,4 +1,22 @@
-package org.apache.cxf.dosgi;
+/**
+ * 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.singlebundle;
import java.io.BufferedReader;
import java.io.IOException;
Propchange: cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/SPIActivator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/SPIActivator.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/SPIActivator.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/singlebundle/activators.list
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java
(from r735002, cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/AggregatedActivatorTest.java)
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java?p2=cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java&p1=cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/AggregatedActivatorTest.java&r1=735002&r2=735027&rev=735027&view=diff
==============================================================================
--- cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/AggregatedActivatorTest.java
(original)
+++ cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java
Fri Jan 16 06:31:21 2009
@@ -1,4 +1,4 @@
-package org.apache.cxf.dosgi;
+package org.apache.cxf.dosgi.singlebundle;
import java.util.Arrays;
Propchange: cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: cxf/sandbox/dosgi/samples/greeter/interface/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/samples/greeter/interface/pom.xml?rev=735027&r1=735026&r2=735027&view=diff
==============================================================================
--- cxf/sandbox/dosgi/samples/greeter/interface/pom.xml (original)
+++ cxf/sandbox/dosgi/samples/greeter/interface/pom.xml Fri Jan 16 06:31:21 2009
@@ -33,7 +33,7 @@
</parent>
<properties>
- <bundle.import.package>*,com.sun.xml.bind.v2</bundle.import.package>
+ <bundle.import.package>*</bundle.import.package>
<bundle.export.package>org.apache.cxf.dosgi.samples.greeter</bundle.export.package>
</properties>
|