geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r821961 [3/30] - in /geronimo/sandbox/djencks/osgi/framework: ./ buildsupport/ buildsupport/car-maven-plugin/ buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ buildsupport/geronimo-maven-plugin/src/main/java...
Date Mon, 05 Oct 2009 18:54:56 GMT
Modified: geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/pom.xml?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/pom.xml Mon Oct  5 18:54:50 2009
@@ -21,21 +21,84 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.felix.karaf</groupId>
-        <artifactId>karaf</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>configs</artifactId>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.felix.karaf</groupId>
-    <artifactId>apache-felix-karaf</artifactId>
-    <packaging>pom</packaging>
-    <version>1.1.0-SNAPSHOT</version>
-    <name>Apache Felix Karaf :: Assembly</name>
+    <artifactId>karaf-framework</artifactId>
+    <packaging>car</packaging>
+    <name>Geronimo Assemblies :: Karaf Boilerplate Framework</name>
 
     <properties>
-        <appendedResourcesDirectory>${basedir}/../etc/appended-resources</appendedResourcesDirectory>
+        <felix.karaf.version>1.1.0-SNAPSHOT</felix.karaf.version>
+
+        <!-- from karaf root pom -->
+        <aopalliance.version>1.0_1</aopalliance.version>
+        <cglib.version>2.1_3_2</cglib.version>
+        <commons.logging.version>1.1.1</commons.logging.version>
+        <depends.maven.plugin.version>1.0</depends.maven.plugin.version>
+        <easymock.version>2.4</easymock.version>
+        <equinox.version>3.5.0.v20090520</equinox.version>
+        <felix.bundlerepository.version>1.4.0</felix.bundlerepository.version>
+        <felix.compendium.version>1.2.0</felix.compendium.version>
+        <felix.configadmin.version>1.2.4</felix.configadmin.version>
+        <felix.fileinstall.version>2.0.0</felix.fileinstall.version>
+        <felix.framework.version>2.0.0</felix.framework.version>
+        <felix.gogo.version>0.2.0</felix.gogo.version>
+        <felix.osgi.version>1.4.0</felix.osgi.version>
+        <felix.plugin.version>2.0.0</felix.plugin.version>
+        <felix.prefs.version>1.0.2</felix.prefs.version>
+        <felix.webconsole.version>1.2.10</felix.webconsole.version>
+        <felix.metatype.version>1.0.2</felix.metatype.version>
+        <geronimo.blueprint.version>1.0.0</geronimo.blueprint.version>
+        <geronimo.servlet.version>1.0-EA-SNAPSHOT</geronimo.servlet.version>
+        <jansi.version>1.0</jansi.version>
+        <jetty.bundle.version>6.1.14_1</jetty.bundle.version>
+        <junit.version>3.8.2_1</junit.version>
+        <jline.version>0.9.95.200909100109</jline.version>
+        <log4j.version>1.2.14</log4j.version>
+        <maven.version>2.0.9</maven.version>
+        <mina.version>2.0.0-M6</mina.version>
+        <pax.exam.version>1.0.0</pax.exam.version>
+        <pax.logging.version>1.4</pax.logging.version>
+        <pax.runner.version>1.1.1</pax.runner.version>
+        <pax.url.version>1.0.0</pax.url.version>
+        <pax.web.version>0.6.0</pax.web.version>
+        <servlet.api.version>3.0</servlet.api.version>
+        <!--<spring.osgi.version>1.2.0</spring.osgi.version>-->
+        <!--<spring.version>2.5.6.SEC01</spring.version>-->
+        <sshd.version>0.2.0</sshd.version>
+        <osgi.jmx.version>4.2.0.200907080519</osgi.jmx.version>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <!-- use versions direct from karaf -->
+            <dependency>
+                <groupId>org.apache.felix.karaf</groupId>
+                <artifactId>karaf</artifactId>
+                <type>pom</type>
+                <version>${felix.karaf.version}</version>
+                <scope>import</scope>
+            </dependency>
+
+            <!--WTF?? should be specified by import above -->
+            <dependency>
+                <groupId>org.apache.mina</groupId>
+                <artifactId>mina-core</artifactId>
+                <version>${mina.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.configadmin</artifactId>
+                <version>${felix.configadmin.version}</version>
+            </dependency>
+
+            
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.felix.karaf</groupId>
@@ -121,38 +184,38 @@
             <groupId>org.apache.felix.karaf</groupId>
             <artifactId>org.apache.felix.karaf.management</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.osgi</groupId>
-            <artifactId>spring-osgi-extender</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.osgi</groupId>
-            <artifactId>spring-osgi-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.osgi</groupId>
-            <artifactId>spring-osgi-io</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.osgi</groupId>
-            <artifactId>spring-osgi-annotation</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.springframework.osgi</groupId>-->
+            <!--<artifactId>spring-osgi-extender</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.springframework.osgi</groupId>-->
+            <!--<artifactId>spring-osgi-core</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.springframework.osgi</groupId>-->
+            <!--<artifactId>spring-osgi-io</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.springframework.osgi</groupId>-->
+            <!--<artifactId>spring-osgi-annotation</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.springframework</groupId>-->
+            <!--<artifactId>spring-context</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.springframework</groupId>-->
+            <!--<artifactId>spring-beans</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.springframework</groupId>-->
+            <!--<artifactId>spring-core</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.springframework</groupId>-->
+            <!--<artifactId>spring-aop</artifactId>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.bundlerepository</artifactId>
@@ -203,7 +266,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.sshd</groupId>
@@ -213,10 +276,10 @@
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.impl.bundle.jmx</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>osgi</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.eclipse</groupId>-->
+            <!--<artifactId>osgi</artifactId>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
@@ -227,18 +290,40 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/filtered-resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
+        <!--<resources>-->
+            <!--<resource>-->
+                <!--<directory>${pom.basedir}/src/main/filtered-resources</directory>-->
+                <!--<filtering>true</filtering>-->
+                <!--<includes>-->
+                    <!--<include>**/*</include>-->
+                <!--</includes>-->
+            <!--</resource>-->
+        <!--</resources>-->
         <filters>
             <filter>target/filter.txt</filter>
         </filters>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <version>1.2</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>ant-contrib</groupId>
+                            <artifactId>ant-contrib</artifactId>
+                            <version>1.0b3</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>ant</groupId>
+                            <artifactId>ant-optional</artifactId>
+                            <version>1.5.3-1</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
+
+            </plugins>
+        </pluginManagement>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -271,21 +356,40 @@
                             <goal>run</goal>
                         </goals>
                     </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
                     <execution>
-                        <id>filter</id>
-                        <phase>generate-resources</phase>
+                        <id>install-underlay</id>
+                        <phase>process-classes</phase>
                         <goals>
-                            <goal>resources</goal>
+                            <goal>run</goal>
                         </goals>
+                        <configuration>
+                            <tasks>
+                                <mkdir dir="${project.build.outputDirectory}" />
+                                <copy todir="${project.build.outputDirectory}">
+                                    <fileset dir="${project.build.directory}/${project.build.finalName}">
+                                        <include name="**" />
+                                    </fileset>
+                                </copy>
+                            </tasks>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-resources-plugin</artifactId>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<id>filter</id>-->
+                        <!--<phase>generate-resources</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>resources</goal>-->
+                        <!--</goals>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+            <!--</plugin>-->
+
+            <!-- these might be the "bootstrap" jars? -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -321,87 +425,129 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <!-- very likely we need this? -->
+            <!--<plugin>-->
+                <!--<groupId>org.codehaus.mojo</groupId>-->
+                <!--<artifactId>build-helper-maven-plugin</artifactId>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<id>attach-artifacts</id>-->
+                        <!--<phase>package</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>attach-artifact</goal>-->
+                        <!--</goals>-->
+                        <!--<configuration>-->
+                            <!--<artifacts>-->
+                                <!--<artifact>-->
+                                    <!--<file>target/classes/features.xml</file>-->
+                                    <!--<type>xml</type>-->
+                                    <!--<classifier>features</classifier>-->
+                                <!--</artifact>-->
+                            <!--</artifacts>-->
+                        <!--</configuration>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+            <!--</plugin>-->
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-assembly-plugin</artifactId>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<id>make-assembly</id>-->
+                        <!--<phase>none</phase>-->
+                    <!--</execution>-->
+                    <!--<execution>-->
+                        <!--<id>unix-bin</id>-->
+                        <!--<phase>package</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>single</goal>-->
+                        <!--</goals>-->
+                        <!--<configuration>-->
+                            <!--<descriptors>-->
+                                <!--<descriptor>src/main/descriptors/unix-bin.xml</descriptor>-->
+                            <!--</descriptors>-->
+                            <!--<finalName>${pom.artifactId}-${pom.version}</finalName>-->
+                            <!--<tarLongFileMode>gnu</tarLongFileMode>-->
+                        <!--</configuration>-->
+                    <!--</execution>-->
+                    <!--<execution>-->
+                        <!--<id>windows-bin</id>-->
+                        <!--<phase>package</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>single</goal>-->
+                        <!--</goals>-->
+                        <!--<configuration>-->
+                            <!--<descriptors>-->
+                                <!--<descriptor>src/main/descriptors/windows-bin.xml</descriptor>-->
+                            <!--</descriptors>-->
+                            <!--<finalName>${pom.artifactId}-${pom.version}</finalName>-->
+                            <!--<appendAssemblyId>true</appendAssemblyId>-->
+                            <!--<assemblyId />-->
+                        <!--</configuration>-->
+                    <!--</execution>-->
+                    <!--<execution>-->
+                        <!--<id>unix-src</id>-->
+                        <!--<phase>package</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>single</goal>-->
+                        <!--</goals>-->
+                        <!--<configuration>-->
+                            <!--<descriptors>-->
+                                <!--<descriptor>src/main/descriptors/unix-src.xml</descriptor>-->
+                            <!--</descriptors>-->
+                            <!--<tarLongFileMode>gnu</tarLongFileMode>-->
+                        <!--</configuration>-->
+                    <!--</execution>-->
+                    <!--<execution>-->
+                        <!--<id>windows-src</id>-->
+                        <!--<phase>package</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>single</goal>-->
+                        <!--</goals>-->
+                        <!--<configuration>-->
+                            <!--<descriptors>-->
+                                <!--<descriptor>src/main/descriptors/windows-src.xml</descriptor>-->
+                            <!--</descriptors>-->
+                        <!--</configuration>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+            <!--</plugin>-->
+
+            <!-- our stuff -->
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>target/classes/features.xml</file>
-                                    <type>xml</type>
-                                    <classifier>features</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>Geronimo Core</category>
+                    <instance>
+                        <plugin-artifact>
+                            <copy-file relative-to="geronimo" dest-dir="">contents/</copy-file>
+                            <copy-file relative-to="server" dest-dir="">instance/</copy-file>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>make-assembly</id>
-                        <phase>none</phase>
-                    </execution>
-                    <execution>
-                        <id>unix-bin</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/descriptors/unix-bin.xml</descriptor>
-                            </descriptors>
-                            <finalName>${pom.artifactId}-${pom.version}</finalName>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>windows-bin</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/descriptors/windows-bin.xml</descriptor>
-                            </descriptors>
-                            <finalName>${pom.artifactId}-${pom.version}</finalName>
-                            <appendAssemblyId>true</appendAssemblyId>
-                            <assemblyId />
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>unix-src</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/descriptors/unix-src.xml</descriptor>
-                            </descriptors>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>windows-src</id>
-                        <phase>package</phase>
+                        <id>boilerplate</id>
+                        <phase>compile</phase>
                         <goals>
-                            <goal>single</goal>
+                            <goal>directory-single</goal>
                         </goals>
                         <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                            <appendAssemblyId>false</appendAssemblyId>
                             <descriptors>
-                                <descriptor>src/main/descriptors/windows-src.xml</descriptor>
+                                <descriptor>${project.basedir}/src/main/descriptors/unix-bin.xml</descriptor>
                             </descriptors>
                         </configuration>
                     </execution>
@@ -410,43 +556,43 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>assembly-src</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>unix-src</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attached</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/descriptors/unix-src.xml</descriptor>
-                                    </descriptors>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>windows-src</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attached</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/descriptors/windows-src.xml</descriptor>
-                                    </descriptors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+    <!--<profiles>-->
+        <!--<profile>-->
+            <!--<id>assembly-src</id>-->
+            <!--<build>-->
+                <!--<plugins>-->
+                    <!--<plugin>-->
+                        <!--<groupId>org.apache.maven.plugins</groupId>-->
+                        <!--<artifactId>maven-assembly-plugin</artifactId>-->
+                        <!--<executions>-->
+                            <!--<execution>-->
+                                <!--<id>unix-src</id>-->
+                                <!--<phase>package</phase>-->
+                                <!--<goals>-->
+                                    <!--<goal>attached</goal>-->
+                                <!--</goals>-->
+                                <!--<configuration>-->
+                                    <!--<descriptors>-->
+                                        <!--<descriptor>src/main/descriptors/unix-src.xml</descriptor>-->
+                                    <!--</descriptors>-->
+                                <!--</configuration>-->
+                            <!--</execution>-->
+                            <!--<execution>-->
+                                <!--<id>windows-src</id>-->
+                                <!--<phase>package</phase>-->
+                                <!--<goals>-->
+                                    <!--<goal>attached</goal>-->
+                                <!--</goals>-->
+                                <!--<configuration>-->
+                                    <!--<descriptors>-->
+                                        <!--<descriptor>src/main/descriptors/windows-src.xml</descriptor>-->
+                                    <!--</descriptors>-->
+                                <!--</configuration>-->
+                            <!--</execution>-->
+                        <!--</executions>-->
+                    <!--</plugin>-->
+                <!--</plugins>-->
+            <!--</build>-->
+        <!--</profile>-->
+    <!--</profiles>-->
 </project>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/descriptors/unix-bin.xml?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/descriptors/unix-bin.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/descriptors/unix-bin.xml Mon Oct  5 18:54:50 2009
@@ -16,37 +16,40 @@
     limitations under the License.
 -->
 <assembly>
-    <id></id> <!-- intentionally left blank -> http://jira.codehaus.org/browse/MASSEMBLY-301 -->
-    <formats>
-        <format>tar.gz</format>
-    </formats>
+    <id>karaf-framework</id> <!-- intentionally left blank -> http://jira.codehaus.org/browse/MASSEMBLY-301 -->
+    <!--<formats>-->
+        <!--<format>jar</format>-->
+    <!--</formats>-->
+
+    <includeBaseDirectory>false</includeBaseDirectory>
+
     <fileSets>
 
         <!-- Copy license and other files from root -->
-        <fileSet>
-            <directory>..</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>README</include>
-                <include>RELEASE*</include>
-            </includes>
-            <lineEnding>unix</lineEnding>
-        </fileSet>
+        <!--<fileSet>-->
+            <!--<directory>..</directory>-->
+            <!--<outputDirectory>/</outputDirectory>-->
+            <!--<includes>-->
+                <!--<include>README</include>-->
+                <!--<include>RELEASE*</include>-->
+            <!--</includes>-->
+            <!--<lineEnding>unix</lineEnding>-->
+        <!--</fileSet>-->
 
         <!-- Copy over everything that needs to get unix line endings -->
         <fileSet>
             <directory>src/main/distribution/text</directory>
-            <outputDirectory>/</outputDirectory>
+            <outputDirectory>contents</outputDirectory>
             <lineEnding>unix</lineEnding>
         </fileSet>        
         <fileSet>
             <directory>src/main/distribution/unix-text</directory>
-            <outputDirectory>/</outputDirectory>
+            <outputDirectory>contents</outputDirectory>
             <lineEnding>unix</lineEnding>
         </fileSet>        
         <fileSet>
             <directory>target/classes/bin</directory>
-            <outputDirectory>/bin/</outputDirectory>
+            <outputDirectory>contents/bin/</outputDirectory>
             <lineEnding>unix</lineEnding>
             <fileMode>0755</fileMode>
             <includes>
@@ -55,37 +58,42 @@
         </fileSet>
         <fileSet>
             <directory>target/classes/etc</directory>
-            <outputDirectory>/etc/</outputDirectory>
+            <outputDirectory>contents/etc/</outputDirectory>
             <lineEnding>unix</lineEnding>
         </fileSet>
 
         <!-- Copy over the examples -->
-        <fileSet>
-            <directory>../demos</directory>
-            <outputDirectory>/demos/</outputDirectory>
-            <lineEnding>unix</lineEnding>
-            <excludes>
-                <exclude>**/target/**</exclude>
-            </excludes>
-        </fileSet>
+        <!--<fileSet>-->
+            <!--<directory>../demos</directory>-->
+            <!--<outputDirectory>/demos/</outputDirectory>-->
+            <!--<lineEnding>unix</lineEnding>-->
+            <!--<excludes>-->
+                <!--<exclude>**/target/**</exclude>-->
+            <!--</excludes>-->
+        <!--</fileSet>-->
 
         <!-- Copy over files that should not get the line endings converted -->
         <fileSet>
             <directory>src/main/distribution/binary</directory>
-            <outputDirectory>/</outputDirectory>
+            <outputDirectory>contents/</outputDirectory>
+        </fileSet>
+
+        <fileSet>
+            <directory>src/main/distribution/instance</directory>
+            <outputDirectory>instance/</outputDirectory>
         </fileSet>
 
         <!-- Copy over the files that should not get the line endings converted but need to be chmod to 755 -->
         <fileSet>
             <directory>src/main/distribution/unix-binary</directory>
-            <outputDirectory>/</outputDirectory>
+            <outputDirectory>contents/</outputDirectory>
             <fileMode>0755</fileMode>
         </fileSet>
         
         <!-- Copy over the files that need unix line endings and also chmod to 755 -->
         <fileSet>
             <directory>src/main/distribution/unix-shell</directory>
-            <outputDirectory>/</outputDirectory>
+            <outputDirectory>contents/</outputDirectory>
             <lineEnding>unix</lineEnding>
             <fileMode>0755</fileMode>
         </fileSet>
@@ -93,181 +101,181 @@
         <!-- Copy over jar files -->
         <fileSet>
             <directory>target/dependencies</directory>
-            <outputDirectory>/lib/</outputDirectory>
+            <outputDirectory>contents/lib/</outputDirectory>
         </fileSet>
 
     </fileSets>
 
     <files>
-        <file>
-            <source>${basedir}/../LICENSE</source>
-            <outputDirectory>/</outputDirectory>
-            <destName>LICENSE</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/NOTICE</source>
-            <outputDirectory>/</outputDirectory>
-            <destName>NOTICE</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
+        <!--<file>-->
+            <!--<source>${basedir}/../LICENSE</source>-->
+            <!--<outputDirectory>/</outputDirectory>-->
+            <!--<destName>LICENSE</destName>-->
+            <!--<fileMode>0644</fileMode>-->
+            <!--<lineEnding>unix</lineEnding>-->
+        <!--</file>-->
+        <!--<file>-->
+            <!--<source>${basedir}/NOTICE</source>-->
+            <!--<outputDirectory>/</outputDirectory>-->
+            <!--<destName>NOTICE</destName>-->
+            <!--<fileMode>0644</fileMode>-->
+            <!--<lineEnding>unix</lineEnding>-->
+        <!--</file>-->
         <file>
             <source>${basedir}/target/classes/features.xml</source>
-            <outputDirectory>/system/org/apache/felix/karaf/apache-felix-karaf/${version}</outputDirectory>
-            <destName>apache-felix-karaf-${version}-features.xml</destName>
+            <outputDirectory>contents/repository/org/apache/geronimo/framework/karaf-framework/${version}</outputDirectory>
+            <destName>karaf-framework-${version}-features.xml</destName>
             <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
     </files>
 
-    <dependencySets>
+    <!--<dependencySets>-->
 
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.felix:org.apache.felix.configadmin</include>
-                <include>org.apache.felix:org.apache.felix.prefs</include>
-                <include>org.apache.felix:org.apache.felix.framework</include>
-                <include>org.apache.felix:org.apache.felix.fileinstall</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/felix/gogo/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.felix.gogo:org.apache.felix.gogo.runtime</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/ops4j/pax/logging/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.ops4j.pax.logging:pax-logging-api</include>
-                <include>org.ops4j.pax.logging:pax-logging-service</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.ops4j.pax.url:pax-url-mvn</include>
-                <include>org.ops4j.pax.url:pax-url-wrap</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/felix/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.felix.karaf:org.apache.felix.karaf.management</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/felix/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.felix.karaf.features:org.apache.felix.karaf.features.core</include>
-                <include>org.apache.felix.karaf.features:org.apache.felix.karaf.features.command</include>
-                <include>org.apache.felix.karaf.features:org.apache.felix.karaf.features.management</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/felix/karaf/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.spring</include>
-                <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.blueprint</include>
-                <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.features</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/felix/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.console</include>
-                <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.admin</include>
-                <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.osgi</include>
-                <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.log</include>
-                <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.config</include>
-                <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.packages</include>
-                <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.ssh</include>
-                <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.commands</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/felix/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.felix.karaf.jaas:org.apache.felix.karaf.jaas.config</include>
-                <include>org.apache.felix.karaf.jaas:org.apache.felix.karaf.jaas.modules</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/sshd/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.sshd:sshd-core</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/mina/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.mina:mina-core</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/osgi/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.osgi:org.osgi.impl.bundle.jmx</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.eclipse:osgi</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/geronimo/blueprint/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.geronimo.blueprint:geronimo-blueprint</include>
-            </includes>
-        </dependencySet>
+        <!--<dependencySet>-->
+            <!--<outputDirectory>/system</outputDirectory>-->
+            <!--<unpack>false</unpack>-->
+            <!--<useProjectArtifact>false</useProjectArtifact>-->
+            <!--<outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>-->
+            <!--<includes>-->
+                <!--<include>org.apache.felix:org.apache.felix.configadmin</include>-->
+                <!--<include>org.apache.felix:org.apache.felix.prefs</include>-->
+                <!--<include>org.apache.felix:org.apache.felix.framework</include>-->
+                <!--<include>org.apache.felix:org.apache.felix.fileinstall</include>-->
+            <!--</includes>-->
+        <!--</dependencySet>-->
+        <!--<dependencySet>-->
+            <!--<outputDirectory>/system</outputDirectory>-->
+            <!--<unpack>false</unpack>-->
+            <!--<useProjectArtifact>false</useProjectArtifact>-->
+            <!--<outputFileNameMapping>org/apache/felix/gogo/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>-->
+            <!--<includes>-->
+                <!--<include>org.apache.felix.gogo:org.apache.felix.gogo.runtime</include>-->
+            <!--</includes>-->
+        <!--</dependencySet>-->
+        <!--<dependencySet>-->
+            <!--<outputDirectory>/system</outputDirectory>-->
+            <!--<unpack>false</unpack>-->
+            <!--<useProjectArtifact>false</useProjectArtifact>-->
+            <!--<outputFileNameMapping>org/ops4j/pax/logging/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>-->
+            <!--<includes>-->
+                <!--<include>org.ops4j.pax.logging:pax-logging-api</include>-->
+                <!--<include>org.ops4j.pax.logging:pax-logging-service</include>-->
+            <!--</includes>-->
+        <!--</dependencySet>-->
+        <!--<dependencySet>-->
+            <!--<outputDirectory>/system</outputDirectory>-->
+            <!--<unpack>false</unpack>-->
+            <!--<useProjectArtifact>false</useProjectArtifact>-->
+            <!--<outputFileNameMapping>org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>-->
+            <!--<includes>-->
+                <!--<include>org.ops4j.pax.url:pax-url-mvn</include>-->
+                <!--<include>org.ops4j.pax.url:pax-url-wrap</include>-->
+            <!--</includes>-->
+        <!--</dependencySet>-->
+        <!--<dependencySet>-->
+            <!--<outputDirectory>/system</outputDirectory>-->
+            <!--<unpack>false</unpack>-->
+            <!--<useProjectArtifact>false</useProjectArtifact>-->
+            <!--<outputFileNameMapping>org/apache/felix/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>-->
+            <!--<includes>-->
+                <!--<include>org.apache.felix.karaf:org.apache.felix.karaf.management</include>-->
+            <!--</includes>-->
+        <!--</dependencySet>-->
+        <!--<dependencySet>-->
+            <!--<outputDirectory>/system</outputDirectory>-->
+            <!--<unpack>false</unpack>-->
+            <!--<useProjectArtifact>false</useProjectArtifact>-->
+            <!--<outputFileNameMapping>org/apache/felix/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>-->
+            <!--<includes>-->
+                <!--<include>org.apache.felix.karaf.features:org.apache.felix.karaf.features.core</include>-->
+                <!--<include>org.apache.felix.karaf.features:org.apache.felix.karaf.features.command</include>-->
+                <!--<include>org.apache.felix.karaf.features:org.apache.felix.karaf.features.management</include>-->
+            <!--</includes>-->
+        <!--</dependencySet>-->
+        <!--<dependencySet>-->
+            <!--<outputDirectory>/system</outputDirectory>-->
+            <!--<unpack>false</unpack>-->
+            <!--<useProjectArtifact>false</useProjectArtifact>-->
+            <!--<outputFileNameMapping>org/apache/felix/karaf/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>-->
+            <!--<includes>-->
+                <!--<include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.spring</include>-->
+                <!--<include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.blueprint</include>-->
+                <!--<include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.features</include>-->
+            <!--</includes>-->
+        <!--</dependencySet>-->
+        <!--<dependencySet>-->
+            <!--<outputDirectory>/system</outputDirectory>-->
+            <!--<unpack>false</unpack>-->
+            <!--<useProjectArtifact>false</useProjectArtifact>-->
+            <!--<outputFileNameMapping>org/apache/felix/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>-->
+            <!--<includes>-->
+                <!--<include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.console</include>-->
+                <!--<include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.admin</include>-->
+                <!--<include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.osgi</include>-->
+                <!--<include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.log</include>-->
+                <!--<include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.config</include>-->
+                <!--<include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.packages</include>-->
+                <!--<include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.ssh</include>-->
+                <!--<include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.commands</include>-->
+            <!--</includes>-->
+        <!--</dependencySet>-->
+        <!--<dependencySet>-->
+            <!--<outputDirectory>/system</outputDirectory>-->
+            <!--<unpack>false</unpack>-->
+            <!--<useProjectArtifact>false</useProjectArtifact>-->
+            <!--<outputFileNameMapping>org/apache/felix/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>-->
+            <!--<includes>-->
+                <!--<include>org.apache.felix.karaf.jaas:org.apache.felix.karaf.jaas.config</include>-->
+                <!--<include>org.apache.felix.karaf.jaas:org.apache.felix.karaf.jaas.modules</include>-->
+            <!--</includes>-->
+        <!--</dependencySet>-->
+        <!--<dependencySet>-->
+            <!--<outputDirectory>/system</outputDirectory>-->
+            <!--<unpack>false</unpack>-->
+            <!--<useProjectArtifact>false</useProjectArtifact>-->
+            <!--<outputFileNameMapping>org/apache/sshd/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>-->
+            <!--<includes>-->
+                <!--<include>org.apache.sshd:sshd-core</include>-->
+            <!--</includes>-->
+        <!--</dependencySet>-->
+        <!--<dependencySet>-->
+            <!--<outputDirectory>/system</outputDirectory>-->
+            <!--<unpack>false</unpack>-->
+            <!--<useProjectArtifact>false</useProjectArtifact>-->
+            <!--<outputFileNameMapping>org/apache/mina/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>-->
+            <!--<includes>-->
+                <!--<include>org.apache.mina:mina-core</include>-->
+            <!--</includes>-->
+        <!--</dependencySet>-->
+        <!--<dependencySet>-->
+            <!--<outputDirectory>/system</outputDirectory>-->
+            <!--<unpack>false</unpack>-->
+            <!--<useProjectArtifact>false</useProjectArtifact>-->
+            <!--<outputFileNameMapping>org/osgi/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>-->
+            <!--<includes>-->
+                <!--<include>org.osgi:org.osgi.impl.bundle.jmx</include>-->
+            <!--</includes>-->
+        <!--</dependencySet>-->
+        <!--<dependencySet>-->
+            <!--<outputDirectory>/system</outputDirectory>-->
+            <!--<unpack>false</unpack>-->
+            <!--<useProjectArtifact>false</useProjectArtifact>-->
+            <!--<outputFileNameMapping>org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>-->
+            <!--<includes>-->
+                <!--<include>org.eclipse:osgi</include>-->
+            <!--</includes>-->
+        <!--</dependencySet>-->
+        <!--<dependencySet>-->
+            <!--<outputDirectory>/system</outputDirectory>-->
+            <!--<unpack>false</unpack>-->
+            <!--<useProjectArtifact>false</useProjectArtifact>-->
+            <!--<outputFileNameMapping>org/apache/geronimo/blueprint/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>-->
+            <!--<includes>-->
+                <!--<include>org.apache.geronimo.blueprint:geronimo-blueprint</include>-->
+            <!--</includes>-->
+        <!--</dependencySet>-->
 
-    </dependencySets>
+    <!--</dependencySets>-->
 
 </assembly>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg Mon Oct  5 18:54:50 2009
@@ -55,7 +55,7 @@
 #
 # The following property value will add the system folder as a repo.
 #
-org.ops4j.pax.url.mvn.defaultRepositories=file:${karaf.home}/system@snapshots
+org.ops4j.pax.url.mvn.defaultRepositories=file:${karaf.home}/repository@snapshots
 
 #
 # Comma separated list of repositories scanned when resolving an artifact.
@@ -70,10 +70,10 @@
 #
 # The following property value will add the system folder as a repo.
 #
-org.ops4j.pax.url.mvn.repositories= \
-    http://repo1.maven.org/maven2, \
-    http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases, \
-    http://repository.ops4j.org/maven2, \
-    http://svn.apache.org/repos/asf/servicemix/m2-repo, \
-    http://repository.springsource.com/maven/bundles/release, \
-    http://repository.springsource.com/maven/bundles/external
+#org.ops4j.pax.url.mvn.repositories= \
+#    http://repo1.maven.org/maven2, \
+#    http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases, \
+#    http://repository.ops4j.org/maven2, \
+#    http://svn.apache.org/repos/asf/servicemix/m2-repo, \
+#    http://repository.springsource.com/maven/bundles/release, \
+#    http://repository.springsource.com/maven/bundles/external

Modified: geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties Mon Oct  5 18:54:50 2009
@@ -22,8 +22,10 @@
 #
 karaf.framework=felix
 
-karaf.framework.equinox=system/org/eclipse/osgi/${equinox.version}/osgi-${equinox.version}.jar
-karaf.framework.felix=system/org/apache/felix/org.apache.felix.framework/${felix.framework.version}/org.apache.felix.framework-${felix.framework.version}.jar
+karaf.framework.equinox=repository/org/eclipse/osgi/${equinox.version}/osgi-${equinox.version}.jar
+karaf.framework.felix=repository/org/apache/felix/org.apache.felix.framework/${felix.framework.version}/org.apache.felix.framework-${felix.framework.version}.jar
+
+karaf.default.repository=repository
 
 #
 # Framework config properties.

Modified: geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties Mon Oct  5 18:54:50 2009
@@ -37,26 +37,52 @@
 org/apache/geronimo/blueprint/geronimo-blueprint/${geronimo.blueprint.version}/geronimo-blueprint-${geronimo.blueprint.version}.jar=20
 
 org/apache/felix/gogo/org.apache.felix.gogo.runtime/${felix.gogo.version}/org.apache.felix.gogo.runtime-${felix.gogo.version}.jar=30
-org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.console/${pom.version}/org.apache.felix.karaf.shell.console-${pom.version}.jar=30
-org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.spring/${pom.version}/org.apache.felix.karaf.deployer.spring-${pom.version}.jar=30
-org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.blueprint/${pom.version}/org.apache.felix.karaf.deployer.blueprint-${pom.version}.jar=30
-org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.features/${pom.version}/org.apache.felix.karaf.deployer.features-${pom.version}.jar=30
-org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.admin/${pom.version}/org.apache.felix.karaf.shell.admin-${pom.version}.jar=30
-org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.osgi/${pom.version}/org.apache.felix.karaf.shell.osgi-${pom.version}.jar=30
-org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.log/${pom.version}/org.apache.felix.karaf.shell.log-${pom.version}.jar=30
-org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.config/${pom.version}/org.apache.felix.karaf.shell.config-${pom.version}.jar=30
-org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.packages/${pom.version}/org.apache.felix.karaf.shell.packages-${pom.version}.jar=30
-org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.commands/${pom.version}/org.apache.felix.karaf.shell.commands-${pom.version}.jar=30
-org/apache/felix/karaf/jaas/org.apache.felix.karaf.jaas.config/${pom.version}/org.apache.felix.karaf.jaas.config-${pom.version}.jar=30
-org/apache/felix/karaf/jaas/org.apache.felix.karaf.jaas.modules/${pom.version}/org.apache.felix.karaf.jaas.modules-${pom.version}.jar=30
-
-org/apache/felix/karaf/features/org.apache.felix.karaf.features.core/${pom.version}/org.apache.felix.karaf.features.core-${pom.version}.jar=30
-org/apache/felix/karaf/features/org.apache.felix.karaf.features.command/${pom.version}/org.apache.felix.karaf.features.command-${pom.version}.jar=30
-org/apache/felix/karaf/features/org.apache.felix.karaf.features.management/${pom.version}/org.apache.felix.karaf.features.management-${pom.version}.jar=30
+org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.console/${felix.karaf.version}/org.apache.felix.karaf.shell.console-${felix.karaf.version}.jar=30
+org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.spring/${felix.karaf.version}/org.apache.felix.karaf.deployer.spring-${felix.karaf.version}.jar=30
+org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.blueprint/${felix.karaf.version}/org.apache.felix.karaf.deployer.blueprint-${felix.karaf.version}.jar=30
+org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.features/${felix.karaf.version}/org.apache.felix.karaf.deployer.features-${felix.karaf.version}.jar=30
+org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.admin/${felix.karaf.version}/org.apache.felix.karaf.shell.admin-${felix.karaf.version}.jar=30
+org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.osgi/${felix.karaf.version}/org.apache.felix.karaf.shell.osgi-${felix.karaf.version}.jar=30
+org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.log/${felix.karaf.version}/org.apache.felix.karaf.shell.log-${felix.karaf.version}.jar=30
+org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.config/${felix.karaf.version}/org.apache.felix.karaf.shell.config-${felix.karaf.version}.jar=30
+org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.packages/${felix.karaf.version}/org.apache.felix.karaf.shell.packages-${felix.karaf.version}.jar=30
+org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.commands/${felix.karaf.version}/org.apache.felix.karaf.shell.commands-${felix.karaf.version}.jar=30
+org/apache/felix/karaf/jaas/org.apache.felix.karaf.jaas.boot/${felix.karaf.version}/org.apache.felix.karaf.jaas.boot-${felix.karaf.version}.jar=30
+org/apache/felix/karaf/jaas/org.apache.felix.karaf.jaas.config/${felix.karaf.version}/org.apache.felix.karaf.jaas.config-${felix.karaf.version}.jar=30
+org/apache/felix/karaf/jaas/org.apache.felix.karaf.jaas.modules/${felix.karaf.version}/org.apache.felix.karaf.jaas.modules-${felix.karaf.version}.jar=30
 
-org/apache/felix/karaf/org.apache.felix.karaf.management/${pom.version}/org.apache.felix.karaf.management-${pom.version}.jar=30
+org/apache/felix/karaf/features/org.apache.felix.karaf.features.core/${felix.karaf.version}/org.apache.felix.karaf.features.core-${felix.karaf.version}.jar=30
+org/apache/felix/karaf/features/org.apache.felix.karaf.features.command/${felix.karaf.version}/org.apache.felix.karaf.features.command-${felix.karaf.version}.jar=30
+org/apache/felix/karaf/features/org.apache.felix.karaf.features.management/${felix.karaf.version}/org.apache.felix.karaf.features.management-${felix.karaf.version}.jar=30
+
+org/apache/felix/karaf/org.apache.felix.karaf.management/${felix.karaf.version}/org.apache.felix.karaf.management-${felix.karaf.version}.jar=30
 org/osgi/org.osgi.impl.bundle.jmx/${osgi.jmx.version}/org.osgi.impl.bundle.jmx-${osgi.jmx.version}.jar=30
 
 org/apache/mina/mina-core/${mina.version}/mina-core-${mina.version}.jar=30
 org/apache/sshd/sshd-core/${sshd.version}/sshd-core-${sshd.version}.jar=30
-org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.ssh/${pom.version}/org.apache.felix.karaf.shell.ssh-${pom.version}.jar=30
+org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.ssh/${felix.karaf.version}/org.apache.felix.karaf.shell.ssh-${felix.karaf.version}.jar=30
+
+
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.xstream/1.3_2-SNAPSHOT/org.apache.servicemix.bundles.xstream-1.3_2-SNAPSHOT.jar=40
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.xpp3/1.1.4c_2-SNAPSHOT/org.apache.servicemix.bundles.xpp3-1.1.4c_2-SNAPSHOT.jar=40
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.cglib/2.1_3_3-SNAPSHOT/org.apache.servicemix.bundles.cglib-2.1_3_3-SNAPSHOT.jar=40
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-jexl/1.1_2-SNAPSHOT/org.apache.servicemix.bundles.commons-jexl-1.1_2-SNAPSHOT.jar=40
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-lang/2.4_2-SNAPSHOT/org.apache.servicemix.bundles.commons-lang-2.4_2-SNAPSHOT.jar=40
+org/apache/servicemix/specs/org.apache.servicemix.specs.activation-api-1.1/1.4-SNAPSHOT/org.apache.servicemix.specs.activation-api-1.1-1.4-SNAPSHOT.jar=40
+org/apache/servicemix/specs/org.apache.servicemix.specs.jaxb-api-2.1/1.2.0/org.apache.servicemix.specs.jaxb-api-2.1-1.2.0.jar=40
+org/apache/servicemix/specs/org.apache.servicemix.specs.stax-api-1.0/1.3.0/org.apache.servicemix.specs.stax-api-1.0-1.3.0.jar=40
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.woodstox/3.2.8_1-SNAPSHOT/org.apache.servicemix.bundles.woodstox-3.2.8_1-SNAPSHOT.jar=40
+org/apache/geronimo/bundles/asm/3.1_1-SNAPSHOT/asm-3.1_1-SNAPSHOT.jar=40
+org/apache/geronimo/bundles/asm-commons/3.1_1-SNAPSHOT/asm-commons-3.1_1-SNAPSHOT.jar=40
+org/apache/geronimo/bundles/commons-cli/1.0_1-SNAPSHOT/commons-cli-1.0_1-SNAPSHOT.jar=40
+org/apache/geronimo/bundles/slf4j/1.5.5_1-SNAPSHOT/slf4j-1.5.5_1-SNAPSHOT.jar=40
+org/apache/geronimo/bundles/sxc-jaxb/0.7.2_1-SNAPSHOT/sxc-jaxb-0.7.2_1-SNAPSHOT.jar=40
+org/apache/geronimo/bundles/sxc-runtime/0.7.2_1-SNAPSHOT/sxc-runtime-0.7.2_1-SNAPSHOT.jar=40
+org/apache/xbean/xbean-reflect/3.6/xbean-reflect-3.6.jar=40
+org/apache/geronimo/framework/geronimo-logging/${pom.version}/geronimo-logging-${pom.version}.jar=40
+org/apache/geronimo/framework/geronimo-cli/${pom.version}/geronimo-cli-${pom.version}.jar=40
+org/apache/geronimo/framework/geronimo-common/${pom.version}/geronimo-common-${pom.version}.jar=40
+org/apache/geronimo/framework/geronimo-crypto/${pom.version}/geronimo-crypto-${pom.version}.jar=40
+org/apache/geronimo/framework/geronimo-kernel/${pom.version}/geronimo-kernel-${pom.version}.jar=40
+org/apache/geronimo/framework/geronimo-system/${pom.version}/geronimo-system-${pom.version}.jar=40
+org/apache/geronimo/framework/j2ee-system/${pom.version}/j2ee-system-${pom.version}.car=50

Modified: geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/features.xml?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/features.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/features.xml Mon Oct  5 18:54:50 2009
@@ -17,23 +17,23 @@
       limitations under the License.
 -->
 <features name="karaf-${version}">
-    <feature name="spring" version="${spring.version}">
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.version}</bundle>
-        <bundle>mvn:org.springframework/spring-core/${spring.version}</bundle>
-        <bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
-        <bundle>mvn:org.springframework/spring-aop/${spring.version}</bundle>        
-        <bundle>mvn:org.springframework/spring-context/${spring.version}</bundle>
-        <bundle>mvn:org.springframework/spring-context-support/${spring.version}</bundle>
-    </feature>
-    <feature name="spring-dm" version="${spring.osgi.version}">
-        <feature version="${spring.version}">spring</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.version}</bundle>
-        <bundle>mvn:org.springframework.osgi/spring-osgi-io/${spring.osgi.version}</bundle>
-        <bundle>mvn:org.springframework.osgi/spring-osgi-core/${spring.osgi.version}</bundle>
-        <bundle>mvn:org.springframework.osgi/spring-osgi-extender/${spring.osgi.version}</bundle>
-        <bundle>mvn:org.springframework.osgi/spring-osgi-annotation/${spring.osgi.version}</bundle>
-        <bundle>mvn:org.apache.felix.karaf.deployer/org.apache.felix.karaf.deployer.spring/${version}</bundle>
-    </feature>
+    <!--<feature name="spring" version="${spring.version}">-->
+        <!--<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.version}</bundle>-->
+        <!--<bundle>mvn:org.springframework/spring-core/${spring.version}</bundle>-->
+        <!--<bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>-->
+        <!--<bundle>mvn:org.springframework/spring-aop/${spring.version}</bundle>        -->
+        <!--<bundle>mvn:org.springframework/spring-context/${spring.version}</bundle>-->
+        <!--<bundle>mvn:org.springframework/spring-context-support/${spring.version}</bundle>-->
+    <!--</feature>-->
+    <!--<feature name="spring-dm" version="${spring.osgi.version}">-->
+        <!--<feature version="${spring.version}">spring</feature>-->
+        <!--<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.version}</bundle>-->
+        <!--<bundle>mvn:org.springframework.osgi/spring-osgi-io/${spring.osgi.version}</bundle>-->
+        <!--<bundle>mvn:org.springframework.osgi/spring-osgi-core/${spring.osgi.version}</bundle>-->
+        <!--<bundle>mvn:org.springframework.osgi/spring-osgi-extender/${spring.osgi.version}</bundle>-->
+        <!--<bundle>mvn:org.springframework.osgi/spring-osgi-annotation/${spring.osgi.version}</bundle>-->
+        <!--<bundle>mvn:org.apache.felix.karaf.deployer/org.apache.felix.karaf.deployer.spring/${version}</bundle>-->
+    <!--</feature>-->
     <feature name="wrapper" version="${version}">
         <bundle>mvn:org.apache.felix.karaf.shell/org.apache.felix.karaf.shell.wrapper/${version}</bundle>
     </feature>
@@ -45,7 +45,7 @@
         <config name="org.ops4j.pax.web">
           org.osgi.service.http.port=8181
         </config>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo.servlet.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}</bundle>
         <bundle>mvn:org.ops4j.pax.web/pax-web-bundle/${pax.web.version}</bundle>
     </feature>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/pom.xml?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/pom.xml Mon Oct  5 18:54:50 2009
@@ -62,7 +62,7 @@
         </dependency>
 
         <dependency>
-            <groupId>commons-cli</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>commons-cli</artifactId>
         </dependency>
 
@@ -72,8 +72,12 @@
         </dependency>
         
         <dependency>
-            <groupId>commons-jexl</groupId>
-            <artifactId>commons-jexl</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.commons-lang</artifactId>
         </dependency>
 
         <!-- used by plugin installer -->
@@ -84,38 +88,28 @@
         </dependency>
         
         <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-archiver</artifactId>
-        </dependency>
-
-        <dependency>
-          <groupId>org.apache.geronimo.bundles</groupId>
-          <artifactId>plexus-utils</artifactId>
+            <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+            <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
         </dependency>
         
         <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
         </dependency>
         
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
+            <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
         </dependency>
     </dependencies>
 

Modified: geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/src/main/history/dependencies.xml?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/src/main/history/dependencies.xml Mon Oct  5 18:54:50 2009
@@ -7,53 +7,48 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm-commons</artifactId>
+        <groupId>javax.activation</groupId>
+        <artifactId>activation</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>cglib</groupId>
-        <artifactId>cglib-nodep</artifactId>
+        <groupId>javax.xml.bind</groupId>
+        <artifactId>jaxb-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-impl</artifactId>
+        <groupId>javax.xml.bind</groupId>
+        <artifactId>jsr173_api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.thoughtworks.xstream</groupId>
-        <artifactId>xstream</artifactId>
+        <groupId>javax.xml.stream</groupId>
+        <artifactId>stax-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>commons-cli</groupId>
-        <artifactId>commons-cli</artifactId>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>commons-jexl</groupId>
-        <artifactId>commons-jexl</artifactId>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.osgi.core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>asm</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.osgi.core</artifactId>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>asm-commons</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>plexus-utils</artifactId>
+        <artifactId>commons-cli</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -102,13 +97,23 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.commons-lang</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -117,33 +122,38 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-reflect</artifactId>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-archiver</artifactId>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-component-api</artifactId>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xstream</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-container-default</artifactId>
+        <groupId>org.apache.servicemix.specs</groupId>
+        <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-utils</artifactId>
+        <groupId>org.apache.servicemix.specs</groupId>
+        <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.woodstox</groupId>
-        <artifactId>wstx-asl</artifactId>
+        <groupId>org.apache.servicemix.specs</groupId>
+        <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-reflect</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/plugin/pom.xml?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/plugin/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/plugin/pom.xml Mon Oct  5 18:54:50 2009
@@ -35,15 +35,15 @@
     <description>Plugin management services including the installer.</description>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>plexus-archiver</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.bundles</groupId>-->
+            <!--<artifactId>plexus-archiver</artifactId>-->
+        <!--</dependency>-->
 
-        <dependency>
-          <groupId>org.apache.geronimo.bundles</groupId>
-          <artifactId>plexus-utils</artifactId>
-        </dependency>
+        <!--<dependency>-->
+          <!--<groupId>org.apache.geronimo.bundles</groupId>-->
+          <!--<artifactId>plexus-utils</artifactId>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
@@ -91,17 +91,7 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>plexus-archiver</artifactId>
-        </dependency>
 
-        <dependency>
-          <groupId>org.apache.geronimo.bundles</groupId>
-          <artifactId>plexus-utils</artifactId>
-        </dependency>
-        
         <!--<dependency>-->
             <!--<groupId>org.codehaus.plexus</groupId>-->
             <!--<artifactId>plexus-container-default</artifactId>-->

Modified: geronimo/sandbox/djencks/osgi/framework/configs/plugin/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/plugin/src/main/history/dependencies.xml?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/plugin/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/plugin/src/main/history/dependencies.xml Mon Oct  5 18:54:50 2009
@@ -8,16 +8,6 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>plexus-archiver</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>plexus-utils</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>slf4j</artifactId>
         <type>jar</type>
     </dependency>
@@ -41,4 +31,19 @@
         <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.specs</groupId>
+        <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/pom.xml?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/pom.xml Mon Oct  5 18:54:50 2009
@@ -54,7 +54,8 @@
         <module>gshell-remote</module>
         <module>gshell-geronimo</module>
         <module>jmx-security</module>
-        <module>geronimo-boilerplate</module>
+        <!--<module>geronimo-boilerplate</module>-->
+        <module>karaf-framework</module>
     </modules>
     
     <build>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/pom.xml?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/pom.xml Mon Oct  5 18:54:50 2009
@@ -124,7 +124,7 @@
                             </config-xml-content>
                             <config-substitution key="ServerHostname">0.0.0.0</config-substitution>
                             <config-substitution key="PortOffset">0</config-substitution>
-                            <config-substitution key="NamingPort">1099</config-substitution>
+                            <config-substitution key="NamingPort">2099</config-substitution>
                             <config-substitution key="MinThreadPoolSize">200</config-substitution>
                             <config-substitution key="MaxThreadPoolSize">500</config-substitution>
                         </plugin-artifact>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/pom.xml?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/pom.xml Mon Oct  5 18:54:50 2009
@@ -69,7 +69,7 @@
                     <category>Security</category>
                     <instance>
                         <plugin-artifact>
-                            <copy-file relative-to="server" dest-dir="var">security</copy-file>
+                            <copy-file relative-to="server" dest-dir="var">security/</copy-file>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/shutdown/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/shutdown/pom.xml?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/shutdown/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/shutdown/pom.xml Mon Oct  5 18:54:50 2009
@@ -66,7 +66,7 @@
         </dependency>
 
         <dependency>
-            <groupId>commons-cli</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>commons-cli</artifactId>
         </dependency>
 



Mime
View raw message