Author: dkulp
Date: Sat Jan 14 01:05:18 2012
New Revision: 1231429
URL: http://svn.apache.org/viewvc?rev=1231429&view=rev
Log:
Fragments cannot have activator so make api fragment of core
Add activator in
Modified:
cxf/trunk/api/pom.xml
cxf/trunk/parent/pom.xml
cxf/trunk/rt/core/pom.xml
Modified: cxf/trunk/api/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/pom.xml?rev=1231429&r1=1231428&r2=1231429&view=diff
==============================================================================
--- cxf/trunk/api/pom.xml (original)
+++ cxf/trunk/api/pom.xml Sat Jan 14 01:05:18 2012
@@ -34,6 +34,7 @@
</parent>
<properties>
+ <cxf.fragment.host>org.apache.cxf.bundle</cxf.fragment.host>
<cxf.osgi.import>
javax.activation;version="${cxf.osgi.javax.activation.version}",
javax.annotation;version="${cxf.osgi.javax.annotation.version}",
Modified: cxf/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1231429&r1=1231428&r2=1231429&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Sat Jan 14 01:05:18 2012
@@ -55,6 +55,7 @@
<!-- OSGi related properties -->
<cxf.fragment.host/>
+ <cxf.bundle.activator/>
<cxf.osgi.import/>
<cxf.osgi.symbolic.name>${project.groupId}.${project.artifactId}</cxf.osgi.symbolic.name>
<cxf.osgi.export>
@@ -500,6 +501,7 @@
<DynamicImport-Package>
${cxf.osgi.dynamic.import}
</DynamicImport-Package>
+
<Bundle-Activator>${cxf.bundle.activator}</Bundle-Activator>
</instructions>
</configuration>
</execution>
Modified: cxf/trunk/rt/core/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/core/pom.xml?rev=1231429&r1=1231428&r2=1231429&view=diff
==============================================================================
--- cxf/trunk/rt/core/pom.xml (original)
+++ cxf/trunk/rt/core/pom.xml Sat Jan 14 01:05:18 2012
@@ -34,7 +34,9 @@
</parent>
<properties>
- <cxf.fragment.host>org.apache.cxf.cxf-api</cxf.fragment.host>
+
<cxf.bundle.activator>org.apache.cxf.bus.osgi.CXFActivator</cxf.bundle.activator>
+
<cxf.osgi.symbolic.name>${project.groupId}.bundle</cxf.osgi.symbolic.name>
+
<cxf.osgi.import>
org.springframework*;resolution:=optional;version="${cxf.osgi.spring.version}",
javax.activation;version="${cxf.osgi.javax.activation.version}",
@@ -43,6 +45,10 @@
javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
javax.xml.stream*;version="${cxf.osgi.javax.stream.version}"
</cxf.osgi.import>
+ <cxf.osgi.export>
+ '=META-INF.cxf',
+ org.apache.cxf.*;-split-package:=first,
+ </cxf.osgi.export>
</properties>
<dependencies>
