cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject svn commit: r1517965 - in /cxf/dosgi/trunk: discovery/distributed/cxf-discovery/pom.xml discovery/distributed/zookeeper-server/pom.xml discovery/local/pom.xml distribution/multi-bundle/pom.xml dsw/cxf-dsw/pom.xml systests2/multi-bundle/pom.xml
Date Tue, 27 Aug 2013 20:07:34 GMT
Author: cschneider
Date: Tue Aug 27 20:07:34 2013
New Revision: 1517965

URL: http://svn.apache.org/r1517965
Log:
Simplify poms

Modified:
    cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml
    cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml
    cxf/dosgi/trunk/discovery/local/pom.xml
    cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
    cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml
    cxf/dosgi/trunk/systests2/multi-bundle/pom.xml

Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml?rev=1517965&r1=1517964&r2=1517965&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml Tue Aug 27 20:07:34 2013
@@ -22,7 +22,8 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cxf-dosgi-ri-discovery-distributed</artifactId>
     <packaging>bundle</packaging>
-    <name>Distributed OSGI Distributed Discovery Service Bundle</name>
+    <name>CXF DOSGi ZooKeeper-based Discovery Service Bundle</name>
+    <description>An implementation of the Distributed OSGi Discovery Service using
ZooKeeper</description>
 
     <parent>
         <groupId>org.apache.cxf.dosgi</groupId>
@@ -103,22 +104,11 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-Name>CXF ZooKeeper-based Discovery Service Bundle</Bundle-Name>
-                        <Bundle-Description>An implementation of the Distributed OSGi
Discovery Service using ZooKeeper</Bundle-Description>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
                         <Bundle-Activator>org.apache.cxf.dosgi.discovery.zookeeper.Activator</Bundle-Activator>
-                        <Import-Package>
-                            org.apache.zookeeper.*;version="[3.0.0,4.0.0)",
-                            org.apache.cxf.dosgi.discovery.local.*,
-                            org.osgi.framework;version="[1.4.0,2.0.0)",
-                            org.osgi.service.remoteserviceadmin;version="[${remote.service.admin.interfaces.version},2)",
-                            org.osgi.util.tracker;version="[1.3.0,2.0.0)",
-                            *
-                        </Import-Package>
-                        <Private-Package>
-                            org.apache.cxf.dosgi.discovery.zookeeper
-                        </Private-Package>
+                        <Export-Package>
+                            !*
+                        </Export-Package>
                     </instructions>
                 </configuration>
             </plugin>

Modified: cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml?rev=1517965&r1=1517964&r2=1517965&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml Tue Aug 27 20:07:34 2013
@@ -22,7 +22,8 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cxf-dosgi-ri-discovery-distributed-zookeeper-server</artifactId>
     <packaging>bundle</packaging>
-    <name>Distributed OSGI Distributed Discovery ZooKeeper Server Control Bundle</name>
+    <name>CXF DOSGi ZooKeeper Server Control Bundle</name>
+    <description>Runs the ZooKeeper server</description>
 
     <parent>
       <groupId>org.apache.cxf.dosgi</groupId>
@@ -87,13 +88,11 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-Name>ZooKeeper server control bundle</Bundle-Name>
-                        <Bundle-Description>Runs the ZooKeeper server</Bundle-Description>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Activator>org.apache.cxf.dosgi.discovery.zookeeper.server.Activator</Bundle-Activator>
-                        <Import-Package>*</Import-Package>
-                        <Private-Package>org.apache.cxf.dosgi.discovery.zookeeper.server.*</Private-Package>
-                        <Export-Package />
+                        <Export-Package>
+                            !*
+                        </Export-Package>
                     </instructions>
                 </configuration>
             </plugin>

Modified: cxf/dosgi/trunk/discovery/local/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/local/pom.xml?rev=1517965&r1=1517964&r2=1517965&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/local/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/local/pom.xml Tue Aug 27 20:07:34 2013
@@ -22,7 +22,8 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cxf-dosgi-ri-discovery-local</artifactId>
     <packaging>bundle</packaging>
-    <name>Distributed OSGI Local Discovery Service Bundle</name>
+    <name>CXF Local Discovery Service Bundle</name>
+    <description>The CXF Local Discovery Service Implementation</description>
 
     <parent>
         <groupId>org.apache.cxf.dosgi</groupId>
@@ -85,14 +86,8 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-Name>CXF Local Discovery Service Bundle</Bundle-Name>
-                        <Bundle-Description>The CXF Local Discovery Service Implementation</Bundle-Description>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Activator>org.apache.cxf.dosgi.discovery.local.internal.Activator</Bundle-Activator>
-                        <Import-Package>
-                            org.osgi.service.remoteserviceadmin;version="[${remote.service.admin.interfaces.version},2.0)",
-                            *
-                        </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>

Modified: cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/pom.xml?rev=1517965&r1=1517964&r2=1517965&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/pom.xml Tue Aug 27 20:07:34 2013
@@ -59,6 +59,7 @@
             </goals>
             <configuration>
               <descriptors>
+                <descriptor>mvn:org.apache.karaf.assemblies.features/standard/2.3.2/xml/features</descriptor>
                 <descriptor>mvn:org.apache.cxf.dosgi/cxf-dosgi/${project.version}/xml/features</descriptor>
               </descriptors>
               <features>

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml?rev=1517965&r1=1517964&r2=1517965&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml Tue Aug 27 20:07:34 2013
@@ -22,7 +22,8 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cxf-dosgi-ri-dsw-cxf</artifactId>
     <packaging>bundle</packaging>
-    <name>Distributed OSGi Distribution Software Bundle</name>
+    <name>CXF dOSGi Remote Service Admin Implementation</name>
+    <description>The CXF Remote Service Admin as described in the OSGi Remote Service
Admin specification</description>
 
     <parent>
         <groupId>org.apache.cxf.dosgi</groupId>
@@ -112,20 +113,17 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-Name>CXF dOSGi Remote Service Admin Implementation</Bundle-Name>
-                        <Bundle-Description>The CXF Remote Service Admin as described
in the OSGi Remote Service Admin specification</Bundle-Description>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
                         <Import-Package>
-                            org.osgi.service.remoteserviceadmin;version="[${remote.service.admin.interfaces.version},2.0)",
                             javax.servlet*;version="[0.0,4)",
-                            javax.xml.ws*;version="[2.1,3)",
                             *
                         </Import-Package>
                         <Export-Package>
                             !*
                         </Export-Package>
                         <Bundle-Activator>org.apache.cxf.dosgi.dsw.Activator</Bundle-Activator>
+                        
+                        <!-- Is currently needed to create a proxy of an interface given
in String form -->
                         <DynamicImport-Package>*</DynamicImport-Package>
                     </instructions>
                 </configuration>

Modified: cxf/dosgi/trunk/systests2/multi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/pom.xml?rev=1517965&r1=1517964&r2=1517965&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/pom.xml Tue Aug 27 20:07:34 2013
@@ -33,6 +33,12 @@
     <packaging>jar</packaging>
 
     <name>Distributed OSGi System Tests Multi-Bundle</name>
+    
+    <!-- 
+        When changing code make sure to run the distro before testing
+        or you will be testing the old code.
+     
+     -->
 
     <dependencies>
         <dependency>



Mime
View raw message