DOSGI-201 Removing old multi bundle distro, fix tests
authorChristian Schneider <cschneider@apache.org>
Mon, 26 Aug 2013 16:04:22 +0000 (16:04 +0000)
committerChristian Schneider <cschneider@apache.org>
Mon, 26 Aug 2013 16:04:22 +0000 (16:04 +0000)
git-svn-id: https://svn.apache.org/repos/asf/cxf/dosgi/trunk@1517587 13f79535-47bb-0310-9956-ffa450edef68

21 files changed:
distribution/multi-bundle/pom.xml
distribution/multi-bundle/src/main/appended-resources/META-INF/NOTICE
distribution/multi-bundle/src/main/resources/distro_bundles.xml [deleted file]
distribution/multi-bundle/src/main/resources/distro_discovery_bundles.xml [deleted file]
distribution/multi-bundle/src/main/xsl/equinox_buildsystem_config.xslt [deleted file]
distribution/multi-bundle/src/main/xsl/equinox_distro_config.xslt
distribution/multi-bundle/src/main/xsl/felix_buildsystem_config.xslt [deleted file]
distribution/multi-bundle/src/main/xsl/felix_distro_config.xslt
distribution/multi-bundle2/pom.xml [deleted file]
distribution/multi-bundle2/src/main/appended-resources/META-INF/LICENSE.vm [deleted file]
distribution/multi-bundle2/src/main/appended-resources/META-INF/NOTICE [deleted file]
distribution/multi-bundle2/src/main/assembly/assembly.xml [deleted file]
distribution/multi-bundle2/src/main/release/README [deleted file]
distribution/multi-bundle2/src/main/release/release_notes.txt [deleted file]
distribution/multi-bundle2/src/main/xsl/equinox_distro_config.xslt [deleted file]
distribution/multi-bundle2/src/main/xsl/felix_distro_config.xslt [deleted file]
distribution/pom.xml
systests2/multi-bundle/pom.xml
systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/AbstractDosgiTest.java
systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java
systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java

index bf65139..360d899 100644 (file)
@@ -21,8 +21,6 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cxf-dosgi-ri-multibundle-distribution</artifactId>
-  <!-- Do not delete version. It is read by the systests (MultiBundleTools) -->
-  <version>1.6-SNAPSHOT</version>
   <name>Distributed OSGI Multi-Bundle Distribution</name>
   <url>http://cxf.apache.org</url>
 
     <topDirectoryLocation>../..</topDirectoryLocation>
   </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-osgi-registry</artifactId>
-            <version>1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
-            <version>2.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-javamail_1.4_spec</artifactId>
-            <version>1.7.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_2.0_spec</artifactId>
-            <version>1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-            <version>1.1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_${servlet.version}_spec</artifactId>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-spi</artifactId>
-            <version>${pax.web.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-runtime</artifactId>
-            <version>${pax.web.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-api</artifactId>
-            <version>${pax.logging.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-service</artifactId>
-            <version>${pax.logging.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty.aggregate</groupId>
-            <artifactId>jetty-all-server</artifactId>
-            <version>${jetty.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-jetty</artifactId>
-            <version>${pax.web.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
-            <version>${servicemix.specs.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
-            <version>${servicemix.specs.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jaxb-api-2.2</artifactId>
-            <version>${servicemix.specs.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jaxws-api-2.2</artifactId>
-            <version>${servicemix.specs.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jsr339-api-m10</artifactId>
-            <version>${servicemix.specs.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.xmlschema</groupId>
-            <artifactId>xmlschema-core</artifactId>
-            <version>${xmlschema.bundle.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
-            <version>${xmlresolver.bundle.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.neethi</groupId>
-            <artifactId>neethi</artifactId>
-            <version>${neethi.bundle.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
-            <version>${wsdl4j.bundle.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.santuario</groupId>
-            <artifactId>xmlsec</artifactId>
-            <version>${xmlsec.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
-            <version>${jaxbimpl.bundle.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.asm</artifactId>
-            <version>${asm.bundle.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
-            <version>${commons.pool.bundle.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>stax2-api</artifactId>
-            <version>3.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>woodstox-core-asl</artifactId>
-            <version>${woodstox.bundle.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.joda-time</artifactId>
-            <version>1.5.2_4</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.aries</groupId>
-            <artifactId>org.apache.aries.util</artifactId>
-            <version>1.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.proxy</groupId>
-            <artifactId>org.apache.aries.proxy.api</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.proxy</groupId>
-            <artifactId>org.apache.aries.proxy.impl</artifactId>
-            <version>1.0.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.api</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.core</artifactId>
-            <version>1.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.cm</artifactId>
-            <version>1.0.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-api</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-core</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-simple</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-bindings-xml</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-bindings-soap</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-databinding-jaxb</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-databinding-aegis</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-ws-policy</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-http</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-rs-extension-providers</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-bundle-compatible</artifactId>
-            <version>${cxf.version}</version>
-            <!-- <exclusions> <exclusion> <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-rt-transports-jms</artifactId> </exclusion> </exclusions> -->
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.cxf.dosgi</groupId>
-            <artifactId>cxf-dosgi-ri-discovery-local</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf.dosgi</groupId>
-            <artifactId>cxf-dosgi-ri-dsw-cxf</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf.dosgi</groupId>
-            <artifactId>cxf-dosgi-ri-topology-manager</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <!-- Discovery dependencies -->
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.configadmin</artifactId>
-            <version>1.6.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.fileinstall</artifactId>
-            <version>3.2.6</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.zookeeper</groupId>
-            <artifactId>zookeeper</artifactId>
-            <version>${zookeeper.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.sun.jdmk</groupId>
-                    <artifactId>jmxtools</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.sun.jmx</groupId>
-                    <artifactId>jmxri</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf.dosgi</groupId>
-            <artifactId>cxf-dosgi-ri-discovery-distributed</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf.dosgi</groupId>
-            <artifactId>cxf-dosgi-ri-discovery-distributed-zookeeper-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf.dosgi</groupId>
-            <artifactId>cxf-dosgi-ri-discovery-distributed-zookeeper-server-config</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-    </dependencies>
-
   <build>
     <resources>
       <resource>
     <plugins>
     <plugin>
         <groupId>org.apache.karaf.tooling</groupId>
-        <artifactId>features-maven-plugin</artifactId>
-        <version>2.2.7</version>
+        <artifactId>karaf-maven-plugin</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
 
         <executions>
           <execution>
-            <id>add-features-to-repo</id>
+            <id>features-add-to-repository</id>
             <phase>generate-resources</phase>
             <goals>
-              <goal>add-features-to-repo</goal>
+              <goal>features-add-to-repository</goal>
             </goals>
             <configuration>
               <descriptors>
                 <descriptor>mvn:org.apache.cxf.dosgi/cxf-dosgi/${project.version}/xml/features</descriptor>
               </descriptors>
               <features>
+                <feature>cxf-dosgi-base</feature>
                 <feature>cxf-dosgi-discovery-distributed</feature>
+                <feature>cxf-dosgi-zookeeper-server</feature>
               </features>
-              <repository>target/dosgi</repository>
-            </configuration>
-          </execution>
-          <execution>
-            <id>add-features-to-repo2</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>add-features-to-repo</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>mvn:org.apache.cxf.dosgi/cxf-dosgi/${project.version}/xml/features</descriptor>
-              </descriptors>
-              <features>
-                <feature>cxf-dosgi-discovery-distributed</feature>
-              </features>
-              <repository>target/dosgi-discovery-zookeeper</repository>
+              <repository>target/distribution_bundles</repository>
+              <resolveDefinedRepositoriesRecursively>true</resolveDefinedRepositoriesRecursively>
+              <flatRepoLayout>true</flatRepoLayout>
+              <exportMetaData>true</exportMetaData>
+              <karafVersion>2.3.2</karafVersion>
             </configuration>
           </execution>
         </executions>
       </plugin>
+      
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
+        <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
-            <id>copy-deps</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
+            <phase>package</phase>
             <configuration>
-              <excludeTransitive>true</excludeTransitive>
-              <outputDirectory>${project.build.directory}/distribution_bundles</outputDirectory>
+              <target>
+                <path id="current.dir.path">
+                  <pathelement location="." />
+                </path>
+                <pathconvert targetos="unix" property="current.dir" refid="current.dir.path" />
+
+                <xslt processor="trax" in="target/features.xml" out="target/distribution_configs/felix.config.properties.append" style="src/main/xsl/felix_distro_config.xslt">
+                    <param name="Version" expression="${dosgi.version}" />
+                    <param name="Offset" expression="50" />
+                </xslt>
+
+                <xslt processor="trax" in="target/features.xml" out="target/distribution_configs/config.ini" style="src/main/xsl/equinox_distro_config.xslt">
+                      <param name="TargetDir" expression="${current.dir}/target/" />
+                </xslt>
+              </target>
             </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
           </execution>
         </executions>
       </plugin>
         </executions>
       </plugin>
 
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>compile</phase>
-            <configuration>
-              <target>
-                <path id="current.dir.path">
-                  <pathelement location="." />
-                </path>
-                <pathconvert targetos="unix" property="current.dir" refid="current.dir.path" />
-
-                <xslt processor="trax" in="target/classes/distro_bundles.xml" out="target/distribution_configs/felix.config.properties.append" style="src/main/xsl/felix_distro_config.xslt">
-                    <param name="Version" expression="${dosgi.version}" />
-                    <param name="Offset" expression="50" />
-                </xslt>
-
-                <xslt processor="trax" in="target/classes/distro_bundles.xml" out="target/felix.config.properties.append" style="src/main/xsl/felix_buildsystem_config.xslt">
-                      <param name="TargetDir" expression="${current.dir}/target/" />
-                      <param name="Offset" expression="50" />
-                </xslt>
-
-                <xslt processor="trax" in="target/classes/distro_bundles.xml" out="target/distribution_configs/equinox.config.ini.append" style="src/main/xsl/equinox_distro_config.xslt">
-                    <param name="Version" expression="${dosgi.version}" />
-                </xslt>
-
-                <xslt processor="trax" in="target/classes/distro_bundles.xml" out="target/equinox.config.ini.append" style="src/main/xsl/equinox_buildsystem_config.xslt">
-                      <param name="TargetDir" expression="${current.dir}/target/" />
-                </xslt>
-
-                <xslt processor="trax" in="target/classes/distro_discovery_bundles.xml" out="target/distribution_configs/felix.discovery.config.properties.append" style="src/main/xsl/felix_distro_config.xslt">
-                    <param name="Version" expression="${dosgi.version}" />
-                    <param name="Offset" expression="120" />
-                </xslt>
-
-                <xslt processor="trax" in="target/classes/distro_discovery_bundles.xml" out="target/felix.discovery.config.properties.append" style="src/main/xsl/felix_buildsystem_config.xslt">
-                      <param name="TargetDir" expression="${current.dir}/target/" />
-                      <param name="Offset" expression="120" />
-                </xslt>
-
-                <xslt processor="trax" in="target/classes/distro_discovery_bundles.xml" out="target/distribution_configs/equinox.discovery.config.ini.append" style="src/main/xsl/equinox_distro_config.xslt">
-                    <param name="Version" expression="${dosgi.version}" />
-                </xslt>
-
-                <xslt processor="trax" in="target/classes/distro_discovery_bundles.xml" out="target/equinox.discovery.config.ini.append" style="src/main/xsl/equinox_buildsystem_config.xslt">
-                      <param name="TargetDir" expression="${current.dir}/target/" />
-                </xslt>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>
index 09690f0..9eab472 100644 (file)
@@ -16,6 +16,12 @@ This product also includes WS-* schemas developed by International
    (http://www.w3.org/2005/08/addressing/ws-addr.xsd)\r
 \r
 \r
+This product contains includes JDOM:\r
+  Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.\r
+  All rights reserved.\r
+  See the NOTICE.jdom file for additional information\r
+\r
+\r
 The product contains code (StaxBuilder.java) that is\r
   Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.\r
   All rights reserved.\r
@@ -26,8 +32,10 @@ Java classes (source and binary) under org.apache.cxf.jaxws.javaee
 are generated from schema available here:\r
 (http://java.sun.com/xml/ns/javaee/javaee_5.xsd)\r
 \r
+\r
 Portions of the included XmlSchema library are Copyright 2006 International Business Machines Corp.\r
 \r
+\r
 Portions of the included xml-apis library were originally based on the following:\r
    - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.\r
    - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.\r
@@ -37,3 +45,5 @@ Portions of the included xml-apis library were originally based on the following
 Portions of the included xmlbeans library were originally based on the following:\r
    - software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.\r
 \r
+\r
+\r
diff --git a/distribution/multi-bundle/src/main/resources/distro_bundles.xml b/distribution/multi-bundle/src/main/resources/distro_bundles.xml
deleted file mode 100644 (file)
index 7d7d4f5..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bundles>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-osgi-registry-1.1.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-annotation_1.0_spec-1.1.1.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.activation-api-1.1-2.2.0.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-jpa_2.0_spec-1.1.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-javamail_1.4_spec-1.7.1.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-servlet_3.0_spec-1.0.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-ws-metadata_2.0_spec-1.1.3.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/commons-lang-2.6.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-core-${spring.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-beans-${spring.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/jetty-all-server-${jetty.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/pax-web-spi-${pax.web.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/pax-web-runtime-${pax.web.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/pax-web-jetty-${pax.web.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/pax-logging-api-${pax.logging.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/pax-logging-service-${pax.logging.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.jaxb-impl-${jaxbimpl.bundle.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.wsdl4j-${wsdl4j.bundle.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/xmlsec-${xmlsec.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/xmlschema-core-${xmlschema.bundle.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.asm-${asm.bundle.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.xmlresolver-${xmlresolver.bundle.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/neethi-${neethi.bundle.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/stax2-api-3.1.1.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/woodstox-core-asl-${woodstox.bundle.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.commons-pool-${commons.pool.bundle.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.saaj-api-1.3-${servicemix.specs.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.stax-api-1.0-${servicemix.specs.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.jaxb-api-2.2-${servicemix.specs.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.jaxws-api-2.2-${servicemix.specs.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.jsr339-api-m10-${servicemix.specs.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.joda-time-1.5.2_4.jar</bundle>
-
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.aries.util-1.1.0.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.aries.proxy.api-1.0.0.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.aries.proxy.impl-1.0.1.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.aries.blueprint.api-1.0.0.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.aries.blueprint.core-1.1.0.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.aries.blueprint.cm-1.0.1.jar</bundle>
-
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.osgi.enterprise-${osgi.enterprise.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.felix.configadmin-1.6.0.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.felix.fileinstall-3.2.6.jar</bundle>
-
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-api-${cxf.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-rt-core-${cxf.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-rt-frontend-simple-${cxf.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-rt-frontend-jaxws-${cxf.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-rt-frontend-jaxrs-${cxf.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-rt-databinding-jaxb-${cxf.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-rt-databinding-aegis-${cxf.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-rt-bindings-xml-${cxf.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-rt-bindings-soap-${cxf.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-rt-transports-http-${cxf.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-rt-transports-http-jetty-${cxf.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-rt-ws-policy-${cxf.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-rt-rs-extension-providers-${cxf.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-bundle-compatible-${cxf.version}.jar</bundle>
-
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-dsw-cxf-${project.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-topology-manager-${project.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-discovery-local-${project.version}.jar</bundle>
-</bundles>
diff --git a/distribution/multi-bundle/src/main/resources/distro_discovery_bundles.xml b/distribution/multi-bundle/src/main/resources/distro_discovery_bundles.xml
deleted file mode 100644 (file)
index 09a5856..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bundles>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/zookeeper-${zookeeper.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-discovery-distributed-${project.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-discovery-distributed-zookeeper-server-${project.version}.jar</bundle>
-</bundles>
diff --git a/distribution/multi-bundle/src/main/xsl/equinox_buildsystem_config.xslt b/distribution/multi-bundle/src/main/xsl/equinox_buildsystem_config.xslt
deleted file mode 100644 (file)
index 1ae6d82..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">\r
-  <xsl:output method="text" version="1.0" encoding="UTF-8" indent="yes"/>\r
-  <xsl:param name="TargetDir"/>\r
-  <xsl:template match="/">\r
-org.ops4j.pax.web.session.timeout=30\r
-\r
-osgi.bundles=org.eclipse.osgi.services@start, \\r
-  <xsl:for-each select="//bundles/bundle"><xsl:value-of select="$TargetDir"/><xsl:value-of select="text()"/><xsl:value-of select="string('@start, ')"/></xsl:for-each>\r
-  </xsl:template>\r
-</xsl:transform>\r
-\r
index 68e7c5f..6ef5704 100644 (file)
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">\r
   <xsl:output method="text" version="1.0" encoding="UTF-8" indent="yes"/>\r
-  <xsl:param name="Version"/>\r
-  <xsl:variable name = "Basename">-dir/apache-cxf-dosgi-ri-<xsl:value-of select="$Version"/>/dosgi_bundles/</xsl:variable>\r
-  <xsl:template match="/">\r
+<xsl:template match="/">\r
+# equinox config\r
 org.ops4j.pax.web.session.timeout=30\r
 \r
 osgi.bundles=org.eclipse.osgi.services@start, \\r
-<xsl:for-each select="//bundles/bundle">../apache-cxf-dosgi-ri-<xsl:value-of select="$Version"/>/dosgi_bundles/<xsl:value-of select="substring-after(text(), $Basename)"/><xsl:value-of select="string('@start, ')"/></xsl:for-each>\r
+../plugins/org.eclipse.equinox.console_1.0.0.v20120522-1841.jar@start, \\r
+../plugins/org.apache.felix.gogo.shell_0.8.0.v201110170705.jar@start, \\r
+../plugins/org.apache.felix.gogo.command_0.8.0.v201108120515.jar@start, \\r
+../plugins/org.apache.felix.gogo.runtime_0.8.0.v201108120515.jar@start, \\r
+<xsl:for-each select="//bundle[not(contains(@name,'cxf-karaf-commands'))]">../dosgi_bundles/<xsl:value-of select="@name"/>@start, \\r
+</xsl:for-each>\r
   </xsl:template>\r
 </xsl:transform>\r
 \r
diff --git a/distribution/multi-bundle/src/main/xsl/felix_buildsystem_config.xslt b/distribution/multi-bundle/src/main/xsl/felix_buildsystem_config.xslt
deleted file mode 100644 (file)
index d09f988..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">\r
-  <xsl:output method="text" version="1.0" encoding="UTF-8" indent="yes"/>\r
-  <xsl:param name="TargetDir"/>\r
-  <xsl:param name="Offset"/>\r
-  <xsl:template match="/">\r
-org.ops4j.pax.web.session.timeout=30\r
-org.osgi.framework.startlevel.beginning=<xsl:value-of select="count(//bundles/felix_deps) + count(//bundles/bundle) + $Offset"/>\r
-    <xsl:for-each select="//bundles/bundle">\r
-      <xsl:variable name="i" select="position() + count(//bundles/felix_deps) + $Offset"/>\r
-felix.auto.start.<xsl:value-of select="$i"/>=file:<xsl:if test="not(starts-with($TargetDir,'/'))"><xsl:value-of select="'/'"/></xsl:if><xsl:value-of select="$TargetDir"/><xsl:value-of select="text()"/>\r
-    </xsl:for-each>\r
-  </xsl:template>\r
-</xsl:transform>\r
-\r
index fe96aab..2bce78d 100644 (file)
@@ -3,29 +3,35 @@
   <xsl:output method="text" version="1.0" encoding="UTF-8" indent="yes"/>\r
   <xsl:param name="Version"/>\r
   <xsl:param name="Offset"/>\r
-  <xsl:variable name = "Basename">-dir/apache-cxf-dosgi-ri-<xsl:value-of select="$Version"/>/dosgi_bundles/</xsl:variable>\r
   <xsl:template match="/">\r
 org.ops4j.pax.web.session.timeout=30\r
-org.osgi.framework.startlevel.beginning=<xsl:value-of select="count(//bundles/felix_deps) + count(//bundles/bundle) + $Offset"/>\r
-felix.auto.start.<xsl:value-of select="$Offset"/>=http://repo2.maven.org/maven2/org/osgi/org.osgi.compendium/4.2.0/org.osgi.compendium-4.2.0.jar\r
-    <xsl:for-each select="//bundles/bundle">\r
-      <xsl:variable name="i" select="position() + count(//bundles/felix_deps) + $Offset"/>\r
-felix.auto.start.<xsl:value-of select="$i"/>=file:apache-cxf-dosgi-ri-<xsl:value-of select="$Version"/>/dosgi_bundles/<xsl:value-of select="substring-after(text(), $Basename)"/>\r
-    </xsl:for-each>\r
+org.osgi.framework.startlevel.beginning=200\r
+\r
+<xsl:for-each select="//bundle[not(contains(@name,'cxf-karaf-commands'))]">\r
+<xsl:sort select="@start-level" data-type="number"/>\r
+<xsl:variable name="i" select="position() + count(//bundles/felix_deps) + $Offset"/>\r
+felix.auto.start.<xsl:value-of select="$i"/>=file:dosgi_bundles/<xsl:value-of select="@name"/>\r
+</xsl:for-each>\r
 \r
 org.osgi.framework.system.packages=org.osgi.framework; version=1.5.0, \\r
  org.osgi.framework.launch; version=1.0.0, \\r
  org.osgi.framework.hooks.service; version=1.0.0, \\r
+ org.osgi.framework.wiring; version=1.0.0 , \\r
  org.osgi.service.packageadmin; version=1.2.0, \\r
  org.osgi.service.startlevel; version=1.1.0, \\r
  org.osgi.service.url; version=1.0.0, \\r
  org.osgi.util.tracker; version=1.4.0, \\r
  org.apache.karaf.jaas.boot; version=2.2.9, \\r
  org.apache.karaf.version; version=2.2.9, \\r
+ javax.annotation.processing, \\r
  javax.crypto, \\r
  javax.crypto.spec, \\r
  javax.imageio, \\r
  javax.imageio.stream, \\r
+ javax.lang.model, \\r
+ javax.lang.model.element, \\r
+ javax.lang.model.type, \\r
+ javax.lang.model.util, \\r
  javax.naming, \\r
  javax.xml.bind.annotation, \\r
  javax.xml.datatype, \\r
@@ -51,6 +57,9 @@ org.osgi.framework.system.packages=org.osgi.framework; version=1.5.0, \
  javax.security.auth.x500, \\r
  javax.security.cert, \\r
  javax.sql, \\r
+ javax.swing, \\r
+ javax.swing.border, \\r
+ javax.swing.tree, \\r
  javax.tools, \\r
  javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \\r
  javax.xml.transform.stax, \\r
@@ -66,4 +75,3 @@ org.osgi.framework.system.packages=org.osgi.framework; version=1.5.0, \
 \r
   </xsl:template>\r
 </xsl:transform>\r
-\r
diff --git a/distribution/multi-bundle2/pom.xml b/distribution/multi-bundle2/pom.xml
deleted file mode 100644 (file)
index bc1cd24..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-<!--
-  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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>cxf-dosgi-ri-multibundle-distribution2</artifactId>
-  <name>Distributed OSGI Multi-Bundle Distribution2</name>
-  <url>http://cxf.apache.org</url>
-
-  <parent>
-    <groupId>org.apache.cxf.dosgi</groupId>
-    <artifactId>cxf-dosgi-ri-distribution-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-
-  <properties>
-    <dosgi.version>${project.version}</dosgi.version>
-    <topDirectoryLocation>../..</topDirectoryLocation>
-  </properties>
-
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-
-    <plugins>
-    <plugin>
-        <groupId>org.apache.karaf.tooling</groupId>
-        <artifactId>karaf-maven-plugin</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-
-        <executions>
-          <execution>
-            <id>features-add-to-repository</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>features-add-to-repository</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>mvn:org.apache.cxf.dosgi/cxf-dosgi/${project.version}/xml/features</descriptor>
-              </descriptors>
-              <features>
-                <feature>cxf-dosgi-base</feature>
-                <feature>cxf-dosgi-discovery-distributed</feature>
-                <feature>cxf-dosgi-zookeeper-server</feature>
-              </features>
-              <repository>target/distribution_bundles</repository>
-              <resolveDefinedRepositoriesRecursively>true</resolveDefinedRepositoriesRecursively>
-              <flatRepoLayout>true</flatRepoLayout>
-              <exportMetaData>true</exportMetaData>
-              <karafVersion>2.3.2</karafVersion>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <configuration>
-              <target>
-                <path id="current.dir.path">
-                  <pathelement location="." />
-                </path>
-                <pathconvert targetos="unix" property="current.dir" refid="current.dir.path" />
-
-                <xslt processor="trax" in="target/features.xml" out="target/distribution_configs/felix.config.properties.append" style="src/main/xsl/felix_distro_config.xslt">
-                    <param name="Version" expression="${dosgi.version}" />
-                    <param name="Offset" expression="50" />
-                </xslt>
-
-                <xslt processor="trax" in="target/features.xml" out="target/distribution_configs/config.ini" style="src/main/xsl/equinox_distro_config.xslt">
-                      <param name="TargetDir" expression="${current.dir}/target/" />
-                </xslt>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>./src/main/assembly/assembly.xml</descriptor>
-              </descriptors>
-            </configuration>
-
-          </execution>
-        </executions>
-      </plugin>
-
-    </plugins>
-  </build>
-</project>
diff --git a/distribution/multi-bundle2/src/main/appended-resources/META-INF/LICENSE.vm b/distribution/multi-bundle2/src/main/appended-resources/META-INF/LICENSE.vm
deleted file mode 100644 (file)
index 8569572..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-##
-## 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.
-##
-## $Date: 2008-03-09 23:17:06 -0700 (Sun, 09 Mar 2008) $ $Rev: 635446 $
-##
-
-
-The $projectName
-includes a number of components and libraries with separate
-copyright notices and license terms. Your use of those components are
-subject to the terms and conditions of the following licenses.
-#set ( $apacheTxt = "The Apache Software License, Version 2.0" )
-
-#foreach ( $project in $projects )
-#foreach ( $license in $project.licenses)
-#if ( ! ($apacheTxt == $license.name) )
-
-$project.name #if ($project.url)($project.url)#end $project.artifact
-    License: $license.name #if ($license.url) ($license.url)#end
-
-#end
-#end
-#end
-
diff --git a/distribution/multi-bundle2/src/main/appended-resources/META-INF/NOTICE b/distribution/multi-bundle2/src/main/appended-resources/META-INF/NOTICE
deleted file mode 100644 (file)
index 9eab472..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-This product contains interfaces and specifications Copyright The OSGi Alliance.\r
-\r
-\r
-This product also includes schemas and specification developed by:\r
-      - the W3C consortium (http://www.w3c.org)\r
-      (http://www.w3.org/XML/1998/namespace)\r
-\r
-\r
-This product also includes WS-* schemas developed by International\r
-   Business Machines Corporation, Microsoft Corporation, BEA Systems,\r
-   TIBCO Software, SAP AG, Sonic Software, and VeriSign\r
-   (http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd)\r
-   (http://schemas.xmlsoap.org/ws/2004/08/addressing/)\r
-   (http://schemas.xmlsoap.org/wsdl/http)\r
-   (http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm.xsd)\r
-   (http://www.w3.org/2005/08/addressing/ws-addr.xsd)\r
-\r
-\r
-This product contains includes JDOM:\r
-  Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.\r
-  All rights reserved.\r
-  See the NOTICE.jdom file for additional information\r
-\r
-\r
-The product contains code (StaxBuilder.java) that is\r
-  Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.\r
-  All rights reserved.\r
-  See the NOTICE.jdom file for additional information\r
-\r
-\r
-Java classes (source and binary) under org.apache.cxf.jaxws.javaee\r
-are generated from schema available here:\r
-(http://java.sun.com/xml/ns/javaee/javaee_5.xsd)\r
-\r
-\r
-Portions of the included XmlSchema library are Copyright 2006 International Business Machines Corp.\r
-\r
-\r
-Portions of the included xml-apis library were originally based on the following:\r
-   - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.\r
-   - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.\r
-   - software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org\r
-\r
-\r
-Portions of the included xmlbeans library were originally based on the following:\r
-   - software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.\r
-\r
-\r
-\r
diff --git a/distribution/multi-bundle2/src/main/assembly/assembly.xml b/distribution/multi-bundle2/src/main/assembly/assembly.xml
deleted file mode 100644 (file)
index 2844317..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd">
-<!--
-  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.
--->
-  <id>dir</id>
-  <formats>
-    <format>tar.gz</format>
-    <format>zip</format>
-    <format>dir</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>target/distribution_bundles</directory>
-      <outputDirectory>apache-cxf-dosgi-ri-${dosgi.version}/dosgi_bundles</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>target/distribution_configs</directory>
-      <outputDirectory>apache-cxf-dosgi-ri-${dosgi.version}/conf</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>target/maven-shared-archive-resources/META-INF</directory>
-      <excludes>
-          <exclude>DEPENDENCIES</exclude>
-      </excludes>
-      <outputDirectory>apache-cxf-dosgi-ri-${dosgi.version}</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/release</directory>
-      <includes>
-        <include>README</include>
-        <include>release_notes.txt</include>
-      </includes>
-      <outputDirectory>apache-cxf-dosgi-ri-${dosgi.version}</outputDirectory>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/distribution/multi-bundle2/src/main/release/README b/distribution/multi-bundle2/src/main/release/README
deleted file mode 100644 (file)
index 40d7b0d..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-Welcome to the Apache CXF Distributed OSGi DSW Reference Implementation
-=======================================================================
-
-
-The dOSGi subproject of Apache CXF provides the Reference Implementation
-of the Remote Services Specification version 1.0, Chapter 13 in the OSGi
-Compendium Specification, and OSGi Remote Service Admin Specification
-version 1.0, Chapter 122 in the OSGi Enterprise Specification[1].
-
-
-This release is provided for your convenience in three different
-distribution formats:
-
-1. Multi-bundle distro: cxf-dosgi-ri-multibundle-distribution-1.2.{tar.gaz|zip}
-
-Contains the dOSGi implementation and all 3rd party dependencies as
-separate bundles within an archive. The current distribution is an
-instance of this type. The easiest way to get started is to explode
-this archive into your Felix or Equinox installation tree. Then
-append the contents of the felix.config.properties.append or
-equinox.config.ini.append snippets found in the conf directory to
-your felix.config.properties or equinox.config.ini. This will cause
-all the required bundles to be loaded on start-up. The bundles required
-for the Zookeeper-based Discovery Service implementation are also provided
-in this distribution, and similarly may be automatically loaded by
-appending the felix.discovery.config.properties.append or
-equinox.discovery.config.ini.append snippets as appropriate.
-
-
-2. Single-bundle distro: cxf-dosgi-ri-singlebundle-distribution-1.2.jar
-
-Contains the dOSGi implementation and all 3rd party dependencies wrapped
-in a single OSGi bundle so as to allow direct installation in your favourite
-OSGi container in one fell swoop.
-
-
-3. Source distro: cxf-dosgi-ri-source-distribution-1.2.{tar.gz|zip}
-
-Contains the entire source tree for dOSGi.
-
-
-The best starting point for using dOSGi is the Getting Started Guide[2].
-
-Also note the very detailed walk-through of the greeter demo[3].
-
-If you need more help, or want to provide any feedback, please feel free
-to drop us a note on the CXF dev or users list[4].
-
-If you trip over any problems with dOSGi, don't hesitate to submit an issue
-to the CXF JIRA[5] with the component set to "Distributed-OSGi".
-
-
-Thanks for using dOSGi!
-
-Regards,
-The CXF dOSGi team.
-
-
-[1] see chapter 122 http://www.osgi.org/Download/Release4V42
-[2] http://cxf.apache.org/distributed-osgi.html#DistributedOSGi-GettingStarted
-[3] http://cxf.apache.org/distributed-osgi-greeter-demo-walkthrough.htm
-[4] http://cxf.apache.org/mailing-lists.html
-[5] https://issues.apache.org/jira/browse/CXF
diff --git a/distribution/multi-bundle2/src/main/release/release_notes.txt b/distribution/multi-bundle2/src/main/release/release_notes.txt
deleted file mode 100644 (file)
index c5b7ba9..0000000
+++ /dev/null
@@ -1,272 +0,0 @@
-
-Release Notes - CXF Distributed OSGi - Version 1.5.0
-====================================================
-
-** Bug
-    * [DOSGI-158] - NPE on shutdown of DOSGi service
-    * [DOSGI-160] - RemoteServiceAdmin shuts itself down during startup
-    * [DOSGI-161] - services sometimes don't get exported
-    * [DOSGI-162] - Compilation errors when using OSGi core
-    * 4.3.0/4.3.1/5.0.0
-    * [DOSGI-164] - NullPointerException on export
-    * [DOSGI-165] - exported service is not properly closed and cannot be
-    * restarted
-    * [DOSGI-166] - List can not be used to register CXF providers with DSW
-    * [DOSGI-168] - RemoteServiceAdminCore service parameters handling bugs
-    * [DOSGI-172] - o.a.c.d.discovery.zookeeper package classes are not
-    * properly synchronized
-    * [DOSGI-173] - unregistering an exported service does not remove it
-    * from zookeeper (and remote clients)
-    * [DOSGI-174] - synchronization issues and resource leaks in
-    * TopologyManagerImport and related classes
-    * [DOSGI-175] - TopologyManagerImport's reference counter doesn't count
-    * [DOSGI-176] - zookeeper discovery sending multiple duplicate endpoint
-    * notifications
-    * [DOSGI-177] - stopped services still appear as available to clients
-    * [DOSGI-180] - CXF service does not disappear if exporting bundle is
-    * stopped
-    * [DOSGI-188] - services aren't re-imported after RemoteServiceAdmin
-    * restart
-    * [DOSGI-190] - NodeExistsException and missing endpoint after ZooKeeper
-    * is restarted
-    * [DOSGI-191] - ZooKeeperDiscovery instance reconnects to ZooKeeper
-    * after bundle is stopped
-    * [DOSGI-192] - Upgrade to zookeeper 3.3.2 to fix bug with zk event
-    * thread shutdown
-    * [DOSGI-195] - Exceptions in tests: ClassCastException on
-    * SpringBusFactory
-
-** Improvement
-    * [DOSGI-167] - Upgrade Aries to the 1.x version for distro
-    * [DOSGI-170] - Remove single bundle distro
-    * [DOSGI-181] - Reactivate or delete old systests
-    * [DOSGI-184] - Split Endpoint repository from TopologyManagerExport
-    * [DOSGI-193] - Split discovery.zookeeper package into subpackages
-
-
-Release Notes - CXF Distributed OSGi - Version 1.4.0
-====================================================
-
-** Bug
-    * [DOSGI-10] - Spring schema handling (intents) doesn't work properly
-    * for the single-bundle case
-    * [DOSGI-18] - RESTful Proxies can not be created in multibundle DOSGI
-    * distributions 
-    * [DOSGI-63] - The discovery can be used be used before the connection
-    * to the server is completely established
-    * [DOSGI-69] - CXF-DOSGi requires internet access when reading XML
-    * [DOSGI-90] - Do not use/assume that endpoint.id is an address
-    * [DOSGI-92] - Exception : Applying intent: SOAP via binding config
-    * [DOSGI-109] - NullPointerException in ToloplogyManager during bundle
-    * stop
-    * [DOSGI-110] - Unable to export multiple services
-    * [DOSGI-111] - DOSGi bundle attempts to load WSDL using wrong bundle in
-    * WSDL-first configuration 
-    * [DOSGI-113] - Integration with pax-logging not possible
-    * [DOSGI-114] - RemoteServiceAdmin is not available warnings in DOSGi
-    * 1.3
-    * [DOSGI-116] - Build fails when downloading Zookeeper artifacts
-    * [DOSGI-119] - Single bundle activator fails to stop all the bundles if
-    * one of the activators throws an exception
-    * [DOSGI-120] - NullPointerException on export
-    * [DOSGI-121] - Fix logging: System.out prints, printStackTrace, verbose
-    * logs
-    * [DOSGI-123] - ZooKeeper registrations are not recreated on ZooKeeper
-    * server restart
-    * [DOSGI-125] - The dead lock in TopologyManagerImport
-    * [DOSGI-129] - NPE when stopping a bundle that exports a DOSGI service
-    * [DOSGI-135] - Switch logging api to slf4j
-    * [DOSGI-136] - Refactor zookeeper server and add metatype config
-    * [DOSGI-137] - Possible bug in TopologyManagerImport when checking if
-    * an Endpoint is already imported
-    * [DOSGI-142] - Upgrade CXF to 2.7.0
-    * [DOSGI-145] - Multiple services using HTTP Service and published from
-    * the same bundle do not work 
-    * [DOSGI-150] - Update to Java 1.6
-    * [DOSGI-153] - Error starting greeter sample in karaf 2.3.0 in aegis
-    * setup: ExceptionInInitializerError ... failed to create an
-    * XPathFactory for the default object model:
-    * http://java.sun.com/jaxp/xpath/dom
-    * [DOSGI-154] - Problems with api packages since update to cxf 2.7.2
-
-** Improvement
-    * [DOSGI-70] - Reconnect automatically to Zookeeper after a connection
-    * loss / timeout
-    * [DOSGI-86] - Decouple DOSGi DSW from Spring DM.
-    * [DOSGI-126] - Allow to use the servlet transport with automatic
-    * discovery
-    * [DOSGI-127] - Default address for services should use the servlet
-    * transport
-    * [DOSGI-128] - Allow to use JAXWS/JAXB service without frontend and
-    * databinding properties
-    * [DOSGI-130] - Clean up unused code and fix warnings, use interfaces
-    * where possible in DSW
-    * [DOSGI-131] - Switch slf4j from springsource bundles to org.slf4j,
-    * update slf4j version
-    * [DOSGI-132] - Switch logging at runtime to pax logging
-    * [DOSGI-133] - Create a Karaf feature file for CXF DOSGi
-    * [DOSGI-134] - Refactoring of TopologyManager
-    * [DOSGI-138] - Refactoring of discovery distributed
-    * [DOSGI-139] - Refactor dsw-cxf to remove dep cycles
-    * [DOSGI-141] - ZooKeeper is not support cluster (ensemble) mode
-    * [DOSGI-143] - Remove all repos except for apache snapshot and central
-    * [DOSGI-146] - Allow to define intents as OSGi services
-    * [DOSGI-147] - Deprecate some Constants that are defined in the spec
-    * [DOSGI-148] - Refactoring of dsw ConfigTypeHandlers
-    * [DOSGI-149] - Optimize distributions and karaf feature
-
-** New Feature
-    * [DOSGI-115] - Use Spring DM and Eclipse Gemini Blueprint with DOSGi
-
-Apache CXF Distributed OSGi 1.3.1 Release Notes
-===============================================
-
-Fixes needed in order to pass the OSGi 4.3 Remote Service Admin TCK.
-* Fixed exports from Single Bundle Distro
-* Fixed deadlock
-* Fixed cleanup
-* Fixed ExportReferenceImpl.equals() and hashCode()
-* Fixed RemoteServiceAdminCore.exportService()
-
-Apache CXF Distributed OSGi 1.3 Release Notes
-=============================================
-
-The following modules have been removed from the destribution:
-
-* org.apache.cxf.dosgi:cxf-dosgi-ri-discovery-distributed-zookeeper-wrapper
-
-  Zookeeper 3.3.1 bundle is now available. See DOSGI-100 for more information.
-
-* org.apache.cxf.dosgi:cxf-dosgi-remote-service-admin-interfaces
-
-  org.osgi:org.osgi.enterprize:4.2.0 artifact is now available. See DOSGI-104 for more information.
-
-Many dependencies have been updated, including the update to CXF 2.5.1. See also DOSGI-96.
-
-Additionally, a number of bugs has been fixed including:
-
-DOSGI-108   service.exported.interfaces doesn't support comma-seperated String value
-DOSGI-107   Support for a 'wsdl' configuration type
-DOSGI-105   Update greeter_rest demo to use OSGI HttpService
-DOSGI-103   Improve multi-bundle distro configuration for Felix
-DOSGI-102   DOSGI RI can not map invocation exceptions to custom exceptions on the client side
-DOSGI-97    Automatically unregister HTTP servlets/resources if exported service goes down
-DOSGI-94    Enhancement to deal with registered services that might have been proxied
-DOSGI-91    DOSGI RS Proxies ignore ResponseExceptionMapper providers
-DOSGI-85    Unable to export services started after Topology manager
-DOSGI-82    Populate custom servicename, portname and targetnamespace for jax-ws
-DOSGI-79    RemoteServiceAdmin.getImportedEndpoints() returns collection of incorrect type
-DOSGI-77    NullPointerException from Distributed OSGI when bundle with wanted properties is started.
-DOSGI-76    EndpointListener.endpointRemoved
-DOSGI-75    CXF Distributed OSGi isn't using org.apache.cxf.common.logging.LogUtils
-
-
-Apache CXF Distributed OSGi 1.2 Release Notes
-=============================================
-
-In addition to providing the Reference Implementation to the OSGi Remote
-Services Specification, the CXF Distributed OSGi 1.2 release now also
-provides the Reference Implementation of the OSGi Remote Service Admin
-Specification version 1.0, Chapter 122 in the OSGi Enterprise
-Specification.
-
-To achieve compliance with the RSA specification a major refactoring has
-been done on the code base.
-
-For the new features applicable to the RSA specification, see chapter
-122 in the OSGi Enterprise Spec (http://www.osgi.org/Download/Release4V42).
-
-The following new features have been introduced:
-
-* org.apache.cxf.ws.port=[port number]
-  This configuration property can be used to change the default port
-  at which a remote service appears. When setting this property the
-  default context will still be used.
-
-* Servlet Filters (javax.servlet.Filter) can now be registered as OSGi
-  services with the "org.apache.cxf.httpservice.filter" boolean
-  property set to true and used to secure DOSGi server endpoints.
-  Endpoints can enforce the registration of the filters by setting an
-  "org.apache.cxf.httpservice.requirefilter" boolean property to true
-
-Additionally, a number of bugs has been fixed including:
-
-[DOSGI-13] - The CXF DOSGi implementation needs to be updated to support the
-             latest OSGi Remote Services Admin spec.
-[DOSGI-24] - org.apache.cxf.dosgi.dsw.ClassUtils#getInterfaceClass() method
-             should search through super class interfaces too
-[DOSGI-25] - FileNotFoundException when client-side proxy is being created
-             [META-INF/cxf/cxf.xml]
-[DOSGI-27] - Discovery problem when two dependent bundles export interfaces
-[DOSGI-28] - Consuming more than 1 service using Spring-DM doesn't work
-[DOSGI-29] - Exception when stopping DOSGi bundle
-[DOSGI-30] - ClassNotFoundException when exposing service.
-[DOSGI-31] - Distributed OSGi having a problem with a custom type method
-             argument
-[DOSGI-32] - The default amount of logging should be significantly reduced
-[DOSGI-33] - Exception when exposing remote service using DOSGi
-[DOSGI-34] - org.apache.servicemix.specs.locator-1.1.1.jar useless?
-[DOSGI-35] - ServicePublication.PROP_KEY_ENDPOINT_LOCATION is now a URI,
-             instead of a URL
-[DOSGI-37] - Fix the dependency on Equinox for the DOSGi system tests
-[DOSGI-38] - single-bundle distribution has incorrect Import-Package and
-             Export-Package declaration in the manifest
-[DOSGI-40] - Remoted service fails to register endpoint after framework is
-             restarted
-[DOSGI-41] - Remove simple-pojo demo (temporarily) as its currently not
-             supported
-[DOSGI-43] - ClassCastException with Declarative Services
-[DOSGI-44] - Existing OSGi Services are not remoted when CXF-DOSGi is started
-[DOSGI-50] - Need to automatically infer SOAP/HTTP transport intents if not
-             explicily set via osgi.remote.requires.intents
-[DOSGI-54] - RemoteServiceAdmin interfaces/classes out of sync with official
-             version
-[DOSGI-61] - The Zookeeper Discovery only supports primitive types as service
-             properties
-[DOSGI-62] - The DSW creates endpoints with localhost URLs
-[DOSGI-66] - The DSW only loads the intent map when certain spring bundles
-             are loaded and started upfront
-[DOSGI-67] - Enable filters on DOSGi endpoints
-[DOSGI-72] - DOSGI not working with HTTP Service
-[DOSGI-74] - Update CXF version to 2.2.9
-
-
-Apache CXF Distributed OSGi 1.1 Release Notes
-=============================================
-
-Specific issues, features, and improvements fixed in this version
------------------------------------------------------------------
-
-The Distributed OSGi 1.1 release provides the Reference Implementation
-of the Remote Services Specification version 1.0. Chapter 13 in the OSGi
-Compendium Specification (http://www.osgi.org/Download/Release4V42).
-
-New features in this release include:
-
-* A live Discovery System is now supported. The CXF-DOSGi implementation
-  makes use of Apache Zookeeper (http://hadoop.apache.org/zookeeper) as
-  the Discovery Server and provides client-side bundles for transparent
-  interaction with Zookeeper. See the Discovery Documentation pages
-  (http://cxf.apache.org/dosgi-discovery.html) for more details.
-
-* REST support for JAX-RS-based Remoted Services and Consumers through
-  the org.apache.cxf.rs configuration type.
-
-* Many user issues have been addressed. In addition the following bugs
-  have been fixed:
-
-[CXF-2182] - Exceptions when remoting pre-existing service
-[CXF-2337] - org.apache.cxf.dosgi.dsw.ClassUtils#getInterfaceClass() method
-             should search through super class interfaces too
-[CXF-2435] - Distributed OSGi having a problem with a custom type method
-             argument
-[CXF-2288] - Bundle cannot be restarted
-[CXF-2385] - Discovery doesn't fully translate 'localhost' into a proper
-             machine name
-[CXF-2200] - Consuming more than 1 service using Spring-DM doesn't work
-
-
-Known limitations :
-
-* Schema validation can not be done for JAX-RS-based endpoints which use
-  Aegis databinding
diff --git a/distribution/multi-bundle2/src/main/xsl/equinox_distro_config.xslt b/distribution/multi-bundle2/src/main/xsl/equinox_distro_config.xslt
deleted file mode 100644 (file)
index 6ef5704..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">\r
-  <xsl:output method="text" version="1.0" encoding="UTF-8" indent="yes"/>\r
-<xsl:template match="/">\r
-# equinox config\r
-org.ops4j.pax.web.session.timeout=30\r
-\r
-osgi.bundles=org.eclipse.osgi.services@start, \\r
-../plugins/org.eclipse.equinox.console_1.0.0.v20120522-1841.jar@start, \\r
-../plugins/org.apache.felix.gogo.shell_0.8.0.v201110170705.jar@start, \\r
-../plugins/org.apache.felix.gogo.command_0.8.0.v201108120515.jar@start, \\r
-../plugins/org.apache.felix.gogo.runtime_0.8.0.v201108120515.jar@start, \\r
-<xsl:for-each select="//bundle[not(contains(@name,'cxf-karaf-commands'))]">../dosgi_bundles/<xsl:value-of select="@name"/>@start, \\r
-</xsl:for-each>\r
-  </xsl:template>\r
-</xsl:transform>\r
-\r
diff --git a/distribution/multi-bundle2/src/main/xsl/felix_distro_config.xslt b/distribution/multi-bundle2/src/main/xsl/felix_distro_config.xslt
deleted file mode 100644 (file)
index 2bce78d..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">\r
-  <xsl:output method="text" version="1.0" encoding="UTF-8" indent="yes"/>\r
-  <xsl:param name="Version"/>\r
-  <xsl:param name="Offset"/>\r
-  <xsl:template match="/">\r
-org.ops4j.pax.web.session.timeout=30\r
-org.osgi.framework.startlevel.beginning=200\r
-\r
-<xsl:for-each select="//bundle[not(contains(@name,'cxf-karaf-commands'))]">\r
-<xsl:sort select="@start-level" data-type="number"/>\r
-<xsl:variable name="i" select="position() + count(//bundles/felix_deps) + $Offset"/>\r
-felix.auto.start.<xsl:value-of select="$i"/>=file:dosgi_bundles/<xsl:value-of select="@name"/>\r
-</xsl:for-each>\r
-\r
-org.osgi.framework.system.packages=org.osgi.framework; version=1.5.0, \\r
- org.osgi.framework.launch; version=1.0.0, \\r
- org.osgi.framework.hooks.service; version=1.0.0, \\r
- org.osgi.framework.wiring; version=1.0.0 , \\r
- org.osgi.service.packageadmin; version=1.2.0, \\r
- org.osgi.service.startlevel; version=1.1.0, \\r
- org.osgi.service.url; version=1.0.0, \\r
- org.osgi.util.tracker; version=1.4.0, \\r
- org.apache.karaf.jaas.boot; version=2.2.9, \\r
- org.apache.karaf.version; version=2.2.9, \\r
- javax.annotation.processing, \\r
- javax.crypto, \\r
- javax.crypto.spec, \\r
- javax.imageio, \\r
- javax.imageio.stream, \\r
- javax.lang.model, \\r
- javax.lang.model.element, \\r
- javax.lang.model.type, \\r
- javax.lang.model.util, \\r
- javax.naming, \\r
- javax.xml.bind.annotation, \\r
- javax.xml.datatype, \\r
- javax.xml.parsers, \\r
- javax.xml.namespace, \\r
- javax.xml.transform, \\r
- javax.xml.transform.dom, \\r
- javax.xml.transform.sax, \\r
- javax.xml.transform.stream, \\r
- javax.xml.validation, \\r
- javax.xml.xpath, \\r
- javax.management, \\r
- javax.management.modelmbean, \\r
- javax.management.remote, \\r
- javax.naming.directory, \\r
- javax.naming.spi, \\r
- javax.net, \\r
- javax.net.ssl, \\r
- javax.security.auth, \\r
- javax.security.auth.callback, \\r
- javax.security.auth.login, \\r
- javax.security.auth.spi, \\r
- javax.security.auth.x500, \\r
- javax.security.cert, \\r
- javax.sql, \\r
- javax.swing, \\r
- javax.swing.border, \\r
- javax.swing.tree, \\r
- javax.tools, \\r
- javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \\r
- javax.xml.transform.stax, \\r
- javax.wsdl, \\r
- javax.wsdl.extensions, \\r
- org.ietf.jgss, \\r
- org.xml.sax, \\r
- org.xml.sax.ext, \\r
- org.xml.sax.helpers, \\r
- org.w3c.dom, \\r
- org.w3c.dom.bootstrap, \\r
- org.w3c.dom.ls\r
-\r
-  </xsl:template>\r
-</xsl:transform>\r
index f34166e..4909df1 100644 (file)
@@ -39,7 +39,7 @@
 
     <modules>
       <module>features</module>
-      <module>multi-bundle2</module>
+      <module>multi-bundle</module>
       <module>sources</module>
     </modules>
 </project>
index 56d3614..1ac1477 100644 (file)
             <version>${exam.version}</version>
             <scope>test</scope>
         </dependency>
-        
+
+        <dependency>
+            <groupId>org.eclipse</groupId>
+            <artifactId>org.eclipse.osgi</artifactId>
+            <version>3.8.0.v20120529-1548</version>
+        </dependency>
+<!-- 
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
             <version>${felix.version}</version>
             <scope>test</scope>
         </dependency>
+         -->
 
         <dependency>
             <groupId>org.ops4j.pax.swissbox</groupId>
             <artifactId>pax-swissbox-tinybundles</artifactId>
             <version>1.3.1</version>
         </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.cxf.dosgi.systests</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        
     </dependencies>
 
     <build>
         <plugins>
-    <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-            <execution>
-                <id>unpack</id>
-                <phase>generate-resources</phase>
-                <goals>
-                    <goal>unpack</goal>
-                </goals>
-                <configuration>
-                    <artifactItems>
-                        <artifactItem>
-                            <groupId>org.apache.cxf.dosgi</groupId>
-                            <artifactId>cxf-dosgi-ri-multibundle-distribution2</artifactId>
-                            <version>1.6-SNAPSHOT</version>
-                            <type>zip</type>
-                            <classifier>dir</classifier>
-                        </artifactItem>
-                    </artifactItems>
-                </configuration>
-            </execution>
-        </executions>
-    </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.cxf.dosgi</groupId>
+                                    <artifactId>cxf-dosgi-ri-multibundle-distribution</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>zip</type>
+                                    <classifier>dir</classifier>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 
             <!-- use pax exam maven plugin -->
 
-            <!-- Note: settings and dependencies for the final osgi runtime
-                (TESTS) are just used in TestCases that annotated with this: @RunWith( MavenConfiguredJUnit4TestRunner.class
-                ) All other testcases will use their own settings/provisioning inside @Configure
+            <!-- Note: settings and dependencies for the final osgi runtime 
+                (TESTS) are just used in TestCases that annotated with this: @RunWith( MavenConfiguredJUnit4TestRunner.class 
+                ) All other testcases will use their own settings/provisioning inside @Configure 
                 Methods. -->
             <plugin>
                 <groupId>org.ops4j.pax.exam</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <systemPropertyVariables>
-                        <!-- <org.apache.cxf.dosgi.test.debug.port>5005</org.apache.cxf.dosgi.test.debug.port>
+                        <!-- <org.apache.cxf.dosgi.test.debug.port>5005</org.apache.cxf.dosgi.test.debug.port> 
                             <org.apache.cxf.dosgi.test.serviceWaitTimeout>180</org.apache.cxf.dosgi.test.serviceWaitTimeout> -->
                         <java.util.logging.config.file>${project.build.directory}/test-classes/logging.properties</java.util.logging.config.file>
                     </systemPropertyVariables>
index e77e6c3..7cb174a 100644 (file)
@@ -61,14 +61,14 @@ public class AbstractDosgiTest {
         Thread.sleep(interval);
     }
 
-    protected <T> ServiceReference<T> waitService(BundleContext bc, Class<T> cls, String filter, int timeout)
+    protected ServiceReference waitService(BundleContext bc, Class cls, String filter, int timeout)
         throws Exception {
         System.out.println("Waiting for service: " + cls + " " + filter);
         long startTime = System.currentTimeMillis();
         while (true) {
-            Collection<ServiceReference<T>> refs = bc.getServiceReferences(cls, filter);
+            Collection refs = bc.getServiceReferences(cls, filter);
             if (refs != null && refs.size() > 0) {
-                return refs.iterator().next();
+                return (ServiceReference)refs.iterator().next();
             }
             sleepOrTimeout(startTime, timeout, "Service not found: " + cls + " " + filter);
         }
index c51093c..754392d 100644 (file)
@@ -20,6 +20,8 @@ package org.apache.cxf.dosgi.systests2.multi;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
@@ -37,19 +39,20 @@ public final class MultiBundleTools {
 
     private MultiBundleTools() {
     }
-
-    private static int getDistroBundles(File mdRoot,
-                                        Map<Integer, String> bundles) throws Exception {
-        File depRoot = new File(mdRoot, "target/dependency");
-        File distroDir = depRoot.listFiles()[0];
-                                
+    
+    private static Properties getProps(File distroDir) throws FileNotFoundException, IOException {
         Properties p = new Properties();
         File confFile = new File(distroDir, "conf/felix.config.properties.append");
         p.load(new FileInputStream(confFile));
+        return p;
+    }
 
-        int startLevel = Integer.parseInt(p.getProperty("org.osgi.framework.startlevel.beginning"));
+    private static int getDistroBundles(File distroDir,
+                                        Properties props, 
+                                        Map<Integer, String> bundles) throws Exception {
+        int startLevel = Integer.parseInt(props.getProperty("org.osgi.framework.startlevel.beginning"));
         for (int i = 0; i <= startLevel; i++) {
-            String val = p.getProperty("felix.auto.start." + i);
+            String val = props.getProperty("felix.auto.start." + i);
             if (val != null) {
                 if (val.startsWith("file:")) {
                     File fullDir = new File(distroDir, val.substring("file:".length()));
@@ -77,8 +80,18 @@ public final class MultiBundleTools {
     private static Option[] getDistroBundleOptions() throws Exception {
         Map<Integer, String> bundles = new TreeMap<Integer, String>();
         File root = getRootDirectory();
-        getDistroBundles(root, bundles);
+        File depRoot = new File(root, "target/dependency");
+        File distroDir = depRoot.listFiles()[0];
+        Properties props = getProps(distroDir);
+        getDistroBundles(distroDir, props, bundles);
         List<Option> opts = new ArrayList<Option>();
+        
+        /*
+        String sysPackagesValue = props.getProperty("org.osgi.framework.system.packages");
+        opts.add(CoreOptions.frameworkProperty("org.osgi.framework.system.packages")
+                 .value(sysPackagesValue));
+        */
+
         for (Map.Entry<Integer, String> entry : bundles.entrySet()) {
             String bundleUri = entry.getValue();
             URL bundleURL = new URL(bundleUri);
index ad992d9..8e61420 100644 (file)
@@ -127,7 +127,7 @@ public class TestImportService extends AbstractDosgiTest {
             bundleContext.registerService(Object.class.getName(), new Object(), props);
 
             // Wait for the service tracker in the test bundle to register a service with the test result
-            ServiceReference<String> ref = waitService(bundleContext, String.class, "(testResult=test1)", 20);
+            ServiceReference ref = waitService(bundleContext, String.class, "(testResult=test1)", 20);
             Assert.assertEquals("HiOSGi;exception", ref.getProperty("result"));
         } finally {
             if (server != null) {