cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r742508 - in /cxf/dosgi/trunk: distribution/single-bundle/pom.xml distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java dsw/cxf-dsw/pom.xml
Date Mon, 09 Feb 2009 14:00:45 GMT
Author: davidb
Date: Mon Feb  9 14:00:45 2009
New Revision: 742508

URL: http://svn.apache.org/viewvc?rev=742508&view=rev
Log:
Fixes to the single-bundle distro.
Changed version number of Distribution Provider interface from 4.2 to 1.0

Modified:
    cxf/dosgi/trunk/distribution/single-bundle/pom.xml
    cxf/dosgi/trunk/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java
    cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml

Modified: cxf/dosgi/trunk/distribution/single-bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/single-bundle/pom.xml?rev=742508&r1=742507&r2=742508&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/single-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/single-bundle/pom.xml Mon Feb  9 14:00:45 2009
@@ -226,6 +226,7 @@
               {maven-resources}
             </Include-Resource>
             <Import-Package>
+              javax.servlet.*;version="[2.3.0,2.6.0)",
               org.osgi.*
             </Import-Package>
             <Export-Package>
@@ -234,15 +235,22 @@
             <Embed-Dependency>*;scope=compile;inline=false</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
             <_exportcontents>
-              org.jdom.*;version="1.0.0",
               javax.xml.ws.*;version="2.1.0",
+              javax.servlet.*;version="2.5.0",
               org.apache.cxf.dosgi.*;version="${pom.version}",
               org.apache.cxf.*;version="${cxf.version}",
-              org.osgi.service.distribution;version="4.2.0",
-              org.osgi.service.discovery;version="4.2.0",
+              org.jdom.*;version="1.0.0",
+              org.osgi.service.distribution;version="1.0.0",
+              org.osgi.service.discovery;version="1.0.0",
               !*
             </_exportcontents> 
             <DynamicImport-Package>*</DynamicImport-Package>
+            <_removeheaders>
+              Ignore-Package,
+              Include-Resource,
+              Private-Package,
+              Embed-Dependency
+            </_removeheaders>
           </instructions>
         </configuration>
       </plugin> 

Modified: cxf/dosgi/trunk/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java?rev=742508&r1=742507&r2=742508&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java
(original)
+++ cxf/dosgi/trunk/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java
Mon Feb  9 14:00:45 2009
@@ -93,7 +93,8 @@
         try {
             try {
                 // now lets block the default port
-                s = new ServerSocket(8080);
+                s = new ServerSocket(Integer.parseInt(
+                        AggregatedActivator.DEFAULT_HTTP_PORT));
             } catch (Exception e) {
                 // if someone else already has it, thats fine too
             }

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml?rev=742508&r1=742507&r2=742508&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml Mon Feb  9 14:00:45 2009
@@ -37,7 +37,7 @@
         <bundle.import.package>*</bundle.import.package>
         <bundle.export.package>
           org.apache.cxf.dosgi.*;version="${pom.version}",
-          org.osgi.service.distribution;version="4.2.0";-split-package:=merge-first,
+          org.osgi.service.distribution;version="1.0";-split-package:=merge-first,
           org.osgi.service.discovery;version="1.0";-split-package:=merge-first 
         </bundle.export.package>
     </properties>



Mime
View raw message