You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2012/01/13 23:27:14 UTC

svn commit: r1231351 [1/2] - in /geronimo/server/trunk: assemblies/geronimo-tomcat7-javaee6/ framework/features/ framework/features/client/ framework/features/client/src/ framework/features/client/src/main/ framework/features/client/src/main/feature/ f...

Author: djencks
Date: Fri Jan 13 22:27:13 2012
New Revision: 1231351

URL: http://svn.apache.org/viewvc?rev=1231351&view=rev
Log:
GERONIMO-6263 start on app client as karaf instance

Added:
    geronimo/server/trunk/framework/features/client/
    geronimo/server/trunk/framework/features/client/NOTICE
    geronimo/server/trunk/framework/features/client/pom.xml   (with props)
    geronimo/server/trunk/framework/features/client/src/
    geronimo/server/trunk/framework/features/client/src/main/
    geronimo/server/trunk/framework/features/client/src/main/feature/
    geronimo/server/trunk/framework/features/client/src/main/feature/feature.xml   (with props)
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/config.properties   (with props)
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/custom.properties   (with props)
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/java.util.logging.properties   (with props)
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/jre.properties   (with props)
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.felix.fileinstall-deploy.cfg
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.features.cfg
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.log.cfg
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.management.cfg
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.shell.cfg
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.ops4j.pax.logging.cfg
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.ops4j.pax.url.mvn.cfg
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/startup.properties   (with props)
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/system.properties   (with props)
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/users.properties   (with props)
    geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/instance.properties   (with props)
    geronimo/server/trunk/framework/features/client/src/main/history/
    geronimo/server/trunk/framework/features/client/src/main/history/dependencies.xml   (with props)
Modified:
    geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6/pom.xml
    geronimo/server/trunk/framework/features/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6/pom.xml?rev=1231351&r1=1231350&r2=1231351&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6/pom.xml Fri Jan 13 22:27:13 2012
@@ -73,6 +73,12 @@
             <type>xml</type>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>client</artifactId>
+            <version>${project.version}</version>
+            <type>kar</type>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugingroups</groupId>

Added: geronimo/server/trunk/framework/features/client/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/NOTICE?rev=1231351&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client/NOTICE (added)
+++ geronimo/server/trunk/framework/features/client/NOTICE Fri Jan 13 22:27:13 2012
@@ -0,0 +1,55 @@
+Apache Felix Karaf :: Assembly
+Copyright 2009 The Apache Software Foundation
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+The Eclipse Foundation (http://www.eclipse.org/).
+Licensed under Eclipse Public License 1.0.
+
+This product includes software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This products includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product includes software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+
+II. Used Software
+
+This product uses software developed at
+SpringSource (http://www.springsource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0
+- Eclipse Public License 1.0
+- BSD License
+- MIT License
+
+

Added: geronimo/server/trunk/framework/features/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/pom.xml?rev=1231351&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client/pom.xml (added)
+++ geronimo/server/trunk/framework/features/client/pom.xml Fri Jan 13 22:27:13 2012
@@ -0,0 +1,399 @@
+<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">
+
+    <!--
+
+        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.
+    -->
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.framework.features</groupId>
+        <artifactId>features</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>client</artifactId>
+    <packaging>kar</packaging>
+    <name>Geronimo Assemblies :: Karaf App Client Framework</name>
+
+    <!-- from karaf root pom -->
+    <properties>        
+        <aopalliance.version>1.0_4</aopalliance.version>
+        <cglib.version>2.1_3_6</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>        
+        <felix.compendium.version>1.2.0</felix.compendium.version>        
+        <felix.fileinstall.version>3.1.10</felix.fileinstall.version>        
+        <felix.osgi.version>1.4.0</felix.osgi.version>
+        <felix.plugin.version>2.1.0</felix.plugin.version>
+        <felix.prefs.version>1.0.4</felix.prefs.version>
+        <felix.metatype.version>1.0.2</felix.metatype.version>        
+        <jansi.version>1.2</jansi.version>
+        <junit.version>4.7_1</junit.version>
+        <log4j.version>1.2.16</log4j.version>
+        <maven.version>2.0.9</maven.version>
+        <mina.version>2.0.0-RC1</mina.version>
+        <pax.exam.version>1.2.2</pax.exam.version>
+        <pax.runner.version>1.5.0</pax.runner.version>        
+        <sshd.version>0.5.0</sshd.version>
+    </properties>
+    
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.eventadmin</artifactId>
+                <version>${felix.eventadmin.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.prefs</artifactId>
+                <version>${felix.prefs.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-codec</groupId>
+                        <artifactId>commons-codec</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.felix</groupId>
+                        <artifactId>org.osgi.compendium</artifactId>
+                    </exclusion>
+               </exclusions>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-rmi-loader</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-hook</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.karaf.scr</groupId>-->
+            <!--<artifactId>org.apache.karaf.scr.feature</artifactId>-->
+            <!--<version>3.0.0-SNAPSHOT</version>-->
+            <!--<type>xml</type>-->
+            <!--<classifier>features</classifier>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.felix</groupId>-->
+            <!--<artifactId>org.apache.felix.prefs</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-pax-logging</artifactId>-->
+            <!--<version>${project.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-servlet_3.0_spec</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-main</artifactId>-->
+            <!--<version>${project.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-cli</artifactId>-->
+            <!--<version>${project.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-deploy-jsr88-full</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<scope>runtime</scope>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-shell-base</artifactId>-->
+            <!--<version>${project.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-shell-diagnose</artifactId>-->
+            <!--<version>${project.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-shell</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
+        <!--&lt;!&ndash;agent &ndash;&gt;-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-transformer</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<scope>runtime</scope>-->
+        <!--</dependency>-->
+        <!--&lt;!&ndash; endorsed &ndash;&gt;-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.yoko</groupId>-->
+            <!--<artifactId>yoko-spec-corba</artifactId>-->
+            <!--<scope>runtime</scope>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.yoko</groupId>-->
+            <!--<artifactId>yoko-rmi-spec</artifactId>-->
+            <!--<scope>runtime</scope>-->
+        <!--</dependency>-->
+
+        <!--&lt;!&ndash; TODO osgi these should probably be in a separate deployer feature &ndash;&gt;-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.servicemix.bundles</groupId>-->
+            <!--<artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-deployment</artifactId>-->
+            <!--<version>${project.version}</version>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-service-builder</artifactId>-->
+            <!--<version>${project.version}</version>-->
+        <!--</dependency>-->
+
+    </dependencies>
+    <build>
+        <!--<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>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>create-prop</id>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <tasks>
+                                <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+                                <property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp" />
+                                <property name="mv" value="${project.version}" />
+                                <echo message="Maven version: ${mv}" />
+                                <propertyregex property="ov.p1" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace="\1" defaultValue="0" />
+                                <propertyregex property="ov.p2" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\2" defaultValue=".0" />
+                                <propertyregex property="ov.p3" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\3" defaultValue=".0" />
+                                <propertyregex property="ov.p4" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\4" defaultValue="" />
+                                <propertyregex property="ov.p1a" input="${ov.p1}" regexp="(.+)" replace="\1" defaultValue="0" />
+                                <propertyregex property="ov.p2a" input="${ov.p2}" regexp="(\..+)" replace="\1" defaultValue=".0" />
+                                <propertyregex property="ov.p3a" input="${ov.p3}" regexp="(\..+)" replace="\1" defaultValue=".0" />
+                                <propertyregex property="ov.p4a" input="${ov.p4}" regexp="(\..+)" replace="\1" defaultValue="" />
+                                <property name="ov" value="${ov.p1a}${ov.p2a}${ov.p3a}${ov.p4a}" />
+                                <echo message="OSGi version: ${ov}" />
+                                <mkdir dir="target" />
+                                <echo message="karaf.osgi.version = ${ov}" file="target/filter.txt" />
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                    <!--<execution>-->
+                        <!--<id>install-underlay</id>-->
+                        <!--<phase>process-classes</phase>-->
+                        <!--<goals>-->
+                            <!--<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>
+                <executions>
+                    <execution>
+                        <id>unpack</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.karaf.shell</groupId>
+                                    <artifactId>org.apache.karaf.shell.console</artifactId>
+                                    <outputDirectory>target/native</outputDirectory>
+                                    <includes>META-INF/native/**/*</includes>
+                                </artifactItem>
+                            </artifactItems>                                
+                        </configuration>
+                    </execution>                        
+                    <!--<execution>-->
+                        <!--<id>copy</id>-->
+                        <!--<phase>generate-resources</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>copy</goal>-->
+                        <!--</goals>-->
+                        <!--<configuration>-->
+                            <!--<artifactItems>-->
+<!--&lt;!&ndash;  in karaf framework-->
+                                <!--<artifactItem>-->
+                                    <!--<groupId>org.apache.karaf.jaas</groupId>-->
+                                    <!--<artifactId>org.apache.karaf.jaas.boot</artifactId>-->
+                                    <!--<outputDirectory>target/classes/resources/lib</outputDirectory>-->
+                                    <!--<destFileName>karaf-jaas-boot.jar</destFileName>-->
+                                <!--</artifactItem>-->
+<!--&ndash;&gt;-->
+                                <!--<artifactItem>-->
+                                    <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                                    <!--<artifactId>geronimo-rmi-loader</artifactId>-->
+                                    <!--<outputDirectory>target/classes/resources/lib</outputDirectory>-->
+                                    <!--<destFileName>geronimo-rmi-loader.jar</destFileName>-->
+                                <!--</artifactItem>-->
+                                <!--<artifactItem>-->
+                                    <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                                    <!--<artifactId>geronimo-main</artifactId>-->
+                                    <!--<outputDirectory>target/classes/resources/lib</outputDirectory>-->
+                                    <!--<destFileName>geronimo-main.jar</destFileName>-->
+                                <!--</artifactItem>-->
+                                <!--<artifactItem>-->
+                                    <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                                    <!--<artifactId>geronimo-cli</artifactId>-->
+                                    <!--<outputDirectory>target/classes/resources/lib</outputDirectory>-->
+                                    <!--<destFileName>geronimo-cli.jar</destFileName>-->
+                                <!--</artifactItem>-->
+                                <!--<artifactItem>-->
+                                    <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                                    <!--<artifactId>geronimo-hook</artifactId>-->
+                                    <!--<outputDirectory>target/classes/resources/lib</outputDirectory>-->
+                                    <!--<destFileName>geronimo-hook.jar</destFileName>-->
+                                <!--</artifactItem>-->
+                                <!--<artifactItem>-->
+                                    <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                                    <!--<artifactId>geronimo-deploy-jsr88-full</artifactId>-->
+                                    <!--<outputDirectory>target/classes/resources/jsr88</outputDirectory>-->
+                                    <!--<destFileName>geronimo-deploy-jsr88-full.jar</destFileName>-->
+                                <!--</artifactItem>-->
+                                <!--<artifactItem>-->
+                                    <!--<groupId>commons-cli</groupId>-->
+                                    <!--<artifactId>commons-cli</artifactId>-->
+                                    <!--<outputDirectory>target/classes/resources/lib</outputDirectory>-->
+                                    <!--<destFileName>commons-cli.jar</destFileName>-->
+                                <!--</artifactItem>-->
+                                <!--<artifactItem>-->
+                                    <!--<groupId>org.apache.yoko</groupId>-->
+                                    <!--<artifactId>yoko-spec-corba</artifactId>-->
+                                    <!--<outputDirectory>target/classes/resources/lib/endorsed</outputDirectory>-->
+                                    <!--<destFileName>yoko-spec-corba.jar</destFileName>-->
+                                <!--</artifactItem>-->
+                                <!--<artifactItem>-->
+                                    <!--<groupId>org.apache.yoko</groupId>-->
+                                    <!--<artifactId>yoko-rmi-spec</artifactId>-->
+                                    <!--<outputDirectory>target/classes/resources/lib/endorsed</outputDirectory>-->
+                                    <!--<destFileName>yoko-rmi-spec.jar</destFileName>-->
+                                <!--</artifactItem>-->
+                                <!--<artifactItem>-->
+                                    <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                                    <!--<artifactId>geronimo-transformer</artifactId>-->
+                                    <!--<outputDirectory>target/classes/resources/lib/agent</outputDirectory>-->
+                                    <!--<destFileName>transformer.jar</destFileName>-->
+                                <!--</artifactItem>-->
+                            <!--</artifactItems>-->
+                        <!--</configuration>-->
+                    <!--</execution>-->
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>karaf-maven-plugin</artifactId>
+                <configuration>
+                    <startLevel>50</startLevel>
+                    <aggregateFeatures>true</aggregateFeatures>
+                    <checkDependencyChange>true</checkDependencyChange>
+                    <warnOnDependencyChange>true</warnOnDependencyChange>
+                    <logDependencyChanges>true</logDependencyChanges>
+                    <overwriteChangedDependencies>true</overwriteChangedDependencies>
+                </configuration>
+            </plugin>
+
+        </plugins>
+    </build>
+
+</project>

Propchange: geronimo/server/trunk/framework/features/client/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/client/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/client/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/framework/features/client/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/feature/feature.xml?rev=1231351&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/feature/feature.xml (added)
+++ geronimo/server/trunk/framework/features/client/src/main/feature/feature.xml Fri Jan 13 22:27:13 2012
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+
+    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.
+-->
+
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="client">
+</features>

Propchange: geronimo/server/trunk/framework/features/client/src/main/feature/feature.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/client/src/main/feature/feature.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/client/src/main/feature/feature.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/config.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/config.properties?rev=1231351&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/config.properties (added)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/config.properties Fri Jan 13 22:27:13 2012
@@ -0,0 +1,129 @@
+################################################################################
+#
+#    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.
+#
+################################################################################
+
+#
+# This file lists Karaf default settings for this particular version of Karaf.
+# For easier maintenance when upgrading Karaf and to better document which
+# default values have changed, it is recommended to place any changes to
+# these values in a custom.properties file in the same folder as this file.
+# Each value specified in custom.properties will override the default value
+# here.
+#
+
+#
+# Properties file inclusions (as a space separated list of relative paths)
+# Included files will override the values specified in this file
+# NB: ${includes} properties files are mandatory, it means that Karaf will not start
+# if the include file is not found
+#
+${includes} = jre.properties custom.properties
+
+#
+# Properties file inclusions (as a space separated list of relative paths)
+# Included files will override the values specified in this file
+# NB: ${optionals} properties files are optionals, it means that Karaf will just
+# display a warning message but the bootstrap will be performed
+#
+# ${optionals} = my.properties
+
+#
+# Framework selection properties
+#
+karaf.framework=felix
+
+#
+# Location of the OSGi frameworks
+#
+karaf.framework.equinox=${karaf.default.repository}/org/eclipse/osgi/3.7.1.R37x_v20110808-1106/osgi-3.7.1.R37x_v20110808-1106.jar
+karaf.framework.felix=${karaf.default.repository}/org/apache/felix/org.apache.felix.framework/4.0.2/org.apache.felix.framework-4.0.2.jar
+
+#
+# Framework config properties.
+#
+org.osgi.framework.system.packages= \
+ org.osgi.framework.startlevel;uses:="org.osgi.framework";version="1.0", \
+ org.osgi.framework.wiring;uses:="org.osgi.framework";version="1.0", \
+ org.osgi.framework.hooks.bundle;uses:="org.osgi.framework";version="1.0", \
+ org.osgi.framework.hooks.service;uses:="org.osgi.framework";version="1.1", \
+ org.osgi.framework.hooks.resolver;uses:="org.osgi.framework.wiring";version="1.0", \
+ org.osgi.framework.launch;uses:="org.osgi.framework";version="1.0", \
+ org.osgi.framework;version="1.6",org.osgi.framework.hooks.weaving;uses:="org.osgi.framework.wiring";version="1.0", \
+ org.osgi.service.packageadmin;uses:="org.osgi.framework";version="1.2", \
+ org.osgi.service.url;version="1.0", \
+ org.osgi.service.startlevel;uses:="org.osgi.framework";version="1.1", \
+ org.osgi.util.tracker;uses:="org.osgi.framework";version="1.5", \
+ org.apache.karaf.jaas.boot;version="3.0.0.SNAPSHOT", \
+ org.apache.karaf.version;version="3.0.0.SNAPSHOT", \
+ org.apache.karaf.info;version="3.0.0.SNAPSHOT", \
+ ${jre-${java.specification.version}}
+
+# Extra packages appended after standard packages
+# org.osgi.framework.system.packages.extra=
+
+# javax.transaction is needed to avoid class loader constraint violation when using javax.sql  
+org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,sun.*,com.sun.*,javax.transaction,javax.transaction.*
+
+# OSGi Execution Environment
+org.osgi.framework.executionenvironment=J2SE-1.7,JavaSE-1.7,J2SE-1.6,JavaSE-1.6,J2SE-1.5,JavaSE-1.5,J2SE-1.4,JavaSE-1.4,J2SE-1.3,JavaSE-1.3,J2SE-1.2,,JavaSE-1.2,CDC-1.1/Foundation-1.1,CDC-1.0/Foundation-1.0,J2ME,OSGi/Minimum-1.1,OSGi/Minimum-1.0
+
+# Set the parent classloader for the bundle to the classloader that loads the Framework (i.e. everything in lib/*.jar)
+org.osgi.framework.bundle.parent=framework
+
+# To enable the use of the startup.properties file to control the start level:
+karaf.auto.start=startup.properties
+
+org.osgi.framework.startlevel.beginning=100
+karaf.startlevel.bundle=60
+
+karaf.shutdown.port.file=${karaf.data}/port
+
+#
+# FileMonitor properties
+#
+felix.fileinstall.dir    = ${karaf.base}/etc
+felix.fileinstall.filter = .*\\.cfg
+felix.fileinstall.poll   = 1000
+felix.fileinstall.noInitialDelay = true
+
+#
+# Delay for writing the framework state to disk in equinox
+# must be  >= 1000 and <= 1800000
+#
+eclipse.stateSaveDelayInterval = 1000
+
+#
+# OBR Repository list
+# This property will be modified by the obr:addUrl and obr:removeUrl commands. 
+#
+obr.repository.url = 
+
+#
+# Start blueprint bundles synchronously when possible
+#
+org.apache.aries.blueprint.synchronous=true
+
+#
+# Do not weave all any classes by default
+#
+org.apache.aries.proxy.weaving.enabled=
+
+#
+# mvn url handler requires config admin configuration
+#
+org.ops4j.pax.url.mvn.requireConfigAdminConfig=true

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/config.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/config.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/config.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/custom.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/custom.properties?rev=1231351&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/custom.properties (added)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/custom.properties Fri Jan 13 22:27:13 2012
@@ -0,0 +1,30 @@
+################################################################################
+#
+#    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.
+#
+################################################################################
+
+#
+# All the values specified here will override the default values given
+# in config.properties.
+#
+
+karaf.systemBundlesStartLevel=50
+
+#
+# You can place any customized configuration here.
+#
+

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/custom.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/custom.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/custom.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/java.util.logging.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/java.util.logging.properties?rev=1231351&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/java.util.logging.properties (added)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/java.util.logging.properties Fri Jan 13 22:27:13 2012
@@ -0,0 +1,23 @@
+################################################################################
+#
+#    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.
+#
+################################################################################
+
+# Empty java.util.logging.properties to prevent the log to stderr, so that
+# all logs will be delegated to pax logging JUL handler only
+
+

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/java.util.logging.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/java.util.logging.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/java.util.logging.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/jre.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/jre.properties?rev=1231351&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/jre.properties (added)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/jre.properties Fri Jan 13 22:27:13 2012
@@ -0,0 +1,472 @@
+################################################################################
+#
+#    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.
+#
+################################################################################
+
+#
+# Java platform package export properties.
+#
+
+# Standard package set.  Note that:
+#   - javax.transaction* is exported with a mandatory attribute
+jre-1.5= \
+ javax.accessibility, \
+ javax.activity, \
+ javax.crypto, \
+ javax.crypto.interfaces, \
+ javax.crypto.spec, \
+ javax.imageio, \
+ javax.imageio.event, \
+ javax.imageio.metadata, \
+ javax.imageio.plugins.bmp, \
+ javax.imageio.plugins.jpeg, \
+ javax.imageio.spi, \
+ javax.imageio.stream, \
+ javax.management, \
+ javax.management.loading, \
+ javax.management.modelmbean, \
+ javax.management.monitor, \
+ javax.management.openmbean, \
+ javax.management.relation, \
+ javax.management.remote, \
+ javax.management.remote.rmi, \
+ javax.management.timer, \
+ javax.naming, \
+ javax.naming.directory, \
+ javax.naming.event, \
+ javax.naming.ldap, \
+ javax.naming.spi, \
+ javax.net, \
+ javax.net.ssl, \
+ javax.print, \
+ javax.print.attribute, \
+ javax.print.attribute.standard, \
+ javax.print.event, \
+ javax.rmi, \
+ javax.rmi.CORBA, \
+ javax.rmi.ssl, \
+ javax.security.auth, \
+ javax.security.auth.callback, \
+ javax.security.auth.kerberos, \
+ javax.security.auth.login, \
+ javax.security.auth.spi, \
+ javax.security.auth.x500, \
+ javax.security.cert, \
+ javax.security.sasl, \
+ javax.sound.midi, \
+ javax.sound.midi.spi, \
+ javax.sound.sampled, \
+ javax.sound.sampled.spi, \
+ javax.sql, \
+ javax.sql.rowset, \
+ javax.sql.rowset.serial, \
+ javax.sql.rowset.spi, \
+ javax.swing, \
+ javax.swing.border, \
+ javax.swing.colorchooser, \
+ javax.swing.event, \
+ javax.swing.filechooser, \
+ javax.swing.plaf, \
+ javax.swing.plaf.basic, \
+ javax.swing.plaf.metal, \
+ javax.swing.plaf.multi, \
+ javax.swing.plaf.synth, \
+ javax.swing.table, \
+ javax.swing.text, \
+ javax.swing.text.html, \
+ javax.swing.text.html.parser, \
+ javax.swing.text.rtf, \
+ javax.swing.tree, \
+ javax.swing.undo, \
+ javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
+ javax.xml, \
+ javax.xml.datatype, \
+ javax.xml.namespace, \
+ javax.xml.parsers, \
+ javax.xml.transform, \
+ javax.xml.transform.dom, \
+ javax.xml.transform.sax, \
+ javax.xml.transform.stream, \
+ javax.xml.validation, \
+ javax.xml.xpath, \
+ org.ietf.jgss, \
+ org.omg.CORBA, \
+ org.omg.CORBA_2_3, \
+ org.omg.CORBA_2_3.portable, \
+ org.omg.CORBA.DynAnyPackage, \
+ org.omg.CORBA.ORBPackage, \
+ org.omg.CORBA.portable, \
+ org.omg.CORBA.TypeCodePackage, \
+ org.omg.CosNaming, \
+ org.omg.CosNaming.NamingContextExtPackage, \
+ org.omg.CosNaming.NamingContextPackage, \
+ org.omg.Dynamic, \
+ org.omg.DynamicAny, \
+ org.omg.DynamicAny.DynAnyFactoryPackage, \
+ org.omg.DynamicAny.DynAnyPackage, \
+ org.omg.IOP, \
+ org.omg.IOP.CodecFactoryPackage, \
+ org.omg.IOP.CodecPackage, \
+ org.omg.Messaging, \
+ org.omg.PortableInterceptor, \
+ org.omg.PortableInterceptor.ORBInitInfoPackage, \
+ org.omg.PortableServer, \
+ org.omg.PortableServer.CurrentPackage, \
+ org.omg.PortableServer.POAManagerPackage, \
+ org.omg.PortableServer.POAPackage, \
+ org.omg.PortableServer.portable, \
+ org.omg.PortableServer.ServantLocatorPackage, \
+ org.omg.SendingContext, \
+ org.omg.stub.java.rmi, \
+ org.omg.stub.javax.management.remote.rmi, \
+ org.w3c.dom, \
+ org.w3c.dom.bootstrap, \
+ org.w3c.dom.css, \
+ org.w3c.dom.events, \
+ org.w3c.dom.html, \
+ org.w3c.dom.ls, \
+ org.w3c.dom.ranges, \
+ org.w3c.dom.stylesheets, \
+ org.w3c.dom.traversal, \
+ org.w3c.dom.views, \
+ org.xml.sax, \
+ org.xml.sax.ext, \
+ org.xml.sax.helpers
+
+# Standard package set.  Note that:
+#   - javax.transaction* is exported with a mandatory attribute
+jre-1.6= \
+ javax.accessibility, \
+ javax.activation, \
+ javax.activity, \
+ javax.annotation;version="1.1", \
+ javax.annotation.processing;version="1.1", \
+ javax.crypto, \
+ javax.crypto.interfaces, \
+ javax.crypto.spec, \
+ javax.imageio, \
+ javax.imageio.event, \
+ javax.imageio.metadata, \
+ javax.imageio.plugins.bmp, \
+ javax.imageio.plugins.jpeg, \
+ javax.imageio.spi, \
+ javax.imageio.stream, \
+ javax.jws, \
+ javax.jws.soap, \
+ javax.lang.model, \
+ javax.lang.model.element, \
+ javax.lang.model.type, \
+ javax.lang.model.util, \
+ javax.management, \
+ javax.management.loading, \
+ javax.management.modelmbean, \
+ javax.management.monitor, \
+ javax.management.openmbean, \
+ javax.management.relation, \
+ javax.management.remote, \
+ javax.management.remote.rmi, \
+ javax.management.timer, \
+ javax.naming, \
+ javax.naming.directory, \
+ javax.naming.event, \
+ javax.naming.ldap, \
+ javax.naming.spi, \
+ javax.net, \
+ javax.net.ssl, \
+ javax.print, \
+ javax.print.attribute, \
+ javax.print.attribute.standard, \
+ javax.print.event, \
+ javax.rmi, \
+ javax.rmi.CORBA, \
+ javax.rmi.ssl, \
+ javax.script, \
+ javax.security.auth, \
+ javax.security.auth.callback, \
+ javax.security.auth.kerberos, \
+ javax.security.auth.login, \
+ javax.security.auth.spi, \
+ javax.security.auth.x500, \
+ javax.security.cert, \
+ javax.security.sasl, \
+ javax.sound.midi, \
+ javax.sound.midi.spi, \
+ javax.sound.sampled, \
+ javax.sound.sampled.spi, \
+ javax.sql, \
+ javax.sql.rowset, \
+ javax.sql.rowset.serial, \
+ javax.sql.rowset.spi, \
+ javax.swing, \
+ javax.swing.border, \
+ javax.swing.colorchooser, \
+ javax.swing.event, \
+ javax.swing.filechooser, \
+ javax.swing.plaf, \
+ javax.swing.plaf.basic, \
+ javax.swing.plaf.metal, \
+ javax.swing.plaf.multi, \
+ javax.swing.plaf.synth, \
+ javax.swing.table, \
+ javax.swing.text, \
+ javax.swing.text.html, \
+ javax.swing.text.html.parser, \
+ javax.swing.text.rtf, \
+ javax.swing.tree, \
+ javax.swing.undo, \
+ javax.tools, \
+ javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
+ javax.xml, \
+ javax.xml.bind, \
+ javax.xml.bind.annotation, \
+ javax.xml.bind.annotation.adapters, \
+ javax.xml.bind.attachment, \
+ javax.xml.bind.helpers, \
+ javax.xml.bind.util, \
+ javax.xml.crypto, \
+ javax.xml.crypto.dom, \
+ javax.xml.crypto.dsig, \
+ javax.xml.crypto.dsig.dom, \
+ javax.xml.crypto.dsig.keyinfo, \
+ javax.xml.crypto.dsig.spec, \
+ javax.xml.datatype, \
+ javax.xml.namespace, \
+ javax.xml.parsers, \
+ javax.xml.soap, \
+ javax.xml.stream, \
+ javax.xml.stream.events, \
+ javax.xml.stream.util, \
+ javax.xml.transform, \
+ javax.xml.transform.dom, \
+ javax.xml.transform.sax, \
+ javax.xml.transform.stax, \
+ javax.xml.transform.stream, \
+ javax.xml.validation, \
+ javax.xml.ws, \
+ javax.xml.ws.handler, \
+ javax.xml.ws.handler.soap, \
+ javax.xml.ws.http, \
+ javax.xml.ws.soap, \
+ javax.xml.ws.spi, \
+ javax.xml.ws.wsaddressing, \
+ javax.xml.xpath, \
+ org.ietf.jgss, \
+ org.omg.CORBA, \
+ org.omg.CORBA_2_3, \
+ org.omg.CORBA_2_3.portable, \
+ org.omg.CORBA.DynAnyPackage, \
+ org.omg.CORBA.ORBPackage, \
+ org.omg.CORBA.portable, \
+ org.omg.CORBA.TypeCodePackage, \
+ org.omg.CosNaming, \
+ org.omg.CosNaming.NamingContextExtPackage, \
+ org.omg.CosNaming.NamingContextPackage, \
+ org.omg.Dynamic, \
+ org.omg.DynamicAny, \
+ org.omg.DynamicAny.DynAnyFactoryPackage, \
+ org.omg.DynamicAny.DynAnyPackage, \
+ org.omg.IOP, \
+ org.omg.IOP.CodecFactoryPackage, \
+ org.omg.IOP.CodecPackage, \
+ org.omg.Messaging, \
+ org.omg.PortableInterceptor, \
+ org.omg.PortableInterceptor.ORBInitInfoPackage, \
+ org.omg.PortableServer, \
+ org.omg.PortableServer.CurrentPackage, \
+ org.omg.PortableServer.POAManagerPackage, \
+ org.omg.PortableServer.POAPackage, \
+ org.omg.PortableServer.portable, \
+ org.omg.PortableServer.ServantLocatorPackage, \
+ org.omg.SendingContext, \
+ org.omg.stub.java.rmi, \
+ org.omg.stub.javax.management.remote.rmi, \
+ org.w3c.dom, \
+ org.w3c.dom.bootstrap, \
+ org.w3c.dom.css, \
+ org.w3c.dom.events, \
+ org.w3c.dom.html, \
+ org.w3c.dom.ls, \
+ org.w3c.dom.ranges, \
+ org.w3c.dom.stylesheets, \
+ org.w3c.dom.traversal, \
+ org.w3c.dom.views, \
+ org.w3c.dom.xpath, \
+ org.xml.sax, \
+ org.xml.sax.ext, \
+ org.xml.sax.helpers
+
+# Standard package set.  Note that:
+#   - javax.transaction* is exported with a mandatory attribute
+jre-1.7= \
+ javax.accessibility, \
+ javax.activation, \
+ javax.activity, \
+ javax.annotation;version="1.1", \
+ javax.annotation.processing;version="1.1", \
+ javax.crypto, \
+ javax.crypto.interfaces, \
+ javax.crypto.spec, \
+ javax.imageio, \
+ javax.imageio.event, \
+ javax.imageio.metadata, \
+ javax.imageio.plugins.bmp, \
+ javax.imageio.plugins.jpeg, \
+ javax.imageio.spi, \
+ javax.imageio.stream, \
+ javax.jws, \
+ javax.jws.soap, \
+ javax.lang.model, \
+ javax.lang.model.element, \
+ javax.lang.model.type, \
+ javax.lang.model.util, \
+ javax.management, \
+ javax.management.loading, \
+ javax.management.modelmbean, \
+ javax.management.monitor, \
+ javax.management.openmbean, \
+ javax.management.relation, \
+ javax.management.remote, \
+ javax.management.remote.rmi, \
+ javax.management.timer, \
+ javax.naming, \
+ javax.naming.directory, \
+ javax.naming.event, \
+ javax.naming.ldap, \
+ javax.naming.spi, \
+ javax.net, \
+ javax.net.ssl, \
+ javax.print, \
+ javax.print.attribute, \
+ javax.print.attribute.standard, \
+ javax.print.event, \
+ javax.rmi, \
+ javax.rmi.CORBA, \
+ javax.rmi.ssl, \
+ javax.script, \
+ javax.security.auth, \
+ javax.security.auth.callback, \
+ javax.security.auth.kerberos, \
+ javax.security.auth.login, \
+ javax.security.auth.spi, \
+ javax.security.auth.x500, \
+ javax.security.cert, \
+ javax.security.sasl, \
+ javax.sound.midi, \
+ javax.sound.midi.spi, \
+ javax.sound.sampled, \
+ javax.sound.sampled.spi, \
+ javax.sql, \
+ javax.sql.rowset, \
+ javax.sql.rowset.serial, \
+ javax.sql.rowset.spi, \
+ javax.swing, \
+ javax.swing.border, \
+ javax.swing.colorchooser, \
+ javax.swing.event, \
+ javax.swing.filechooser, \
+ javax.swing.plaf, \
+ javax.swing.plaf.basic, \
+ javax.swing.plaf.metal, \
+ javax.swing.plaf.multi, \
+ javax.swing.plaf.synth, \
+ javax.swing.table, \
+ javax.swing.text, \
+ javax.swing.text.html, \
+ javax.swing.text.html.parser, \
+ javax.swing.text.rtf, \
+ javax.swing.tree, \
+ javax.swing.undo, \
+ javax.tools, \
+ javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
+ javax.xml, \
+ javax.xml.bind, \
+ javax.xml.bind.annotation, \
+ javax.xml.bind.annotation.adapters, \
+ javax.xml.bind.attachment, \
+ javax.xml.bind.helpers, \
+ javax.xml.bind.util, \
+ javax.xml.crypto, \
+ javax.xml.crypto.dom, \
+ javax.xml.crypto.dsig, \
+ javax.xml.crypto.dsig.dom, \
+ javax.xml.crypto.dsig.keyinfo, \
+ javax.xml.crypto.dsig.spec, \
+ javax.xml.datatype, \
+ javax.xml.namespace, \
+ javax.xml.parsers, \
+ javax.xml.soap, \
+ javax.xml.stream, \
+ javax.xml.stream.events, \
+ javax.xml.stream.util, \
+ javax.xml.transform, \
+ javax.xml.transform.dom, \
+ javax.xml.transform.sax, \
+ javax.xml.transform.stax, \
+ javax.xml.transform.stream, \
+ javax.xml.validation, \
+ javax.xml.ws, \
+ javax.xml.ws.handler, \
+ javax.xml.ws.handler.soap, \
+ javax.xml.ws.http, \
+ javax.xml.ws.soap, \
+ javax.xml.ws.spi, \
+ javax.xml.ws.wsaddressing, \
+ javax.xml.xpath, \
+ org.ietf.jgss, \
+ org.omg.CORBA, \
+ org.omg.CORBA_2_3, \
+ org.omg.CORBA_2_3.portable, \
+ org.omg.CORBA.DynAnyPackage, \
+ org.omg.CORBA.ORBPackage, \
+ org.omg.CORBA.portable, \
+ org.omg.CORBA.TypeCodePackage, \
+ org.omg.CosNaming, \
+ org.omg.CosNaming.NamingContextExtPackage, \
+ org.omg.CosNaming.NamingContextPackage, \
+ org.omg.Dynamic, \
+ org.omg.DynamicAny, \
+ org.omg.DynamicAny.DynAnyFactoryPackage, \
+ org.omg.DynamicAny.DynAnyPackage, \
+ org.omg.IOP, \
+ org.omg.IOP.CodecFactoryPackage, \
+ org.omg.IOP.CodecPackage, \
+ org.omg.Messaging, \
+ org.omg.PortableInterceptor, \
+ org.omg.PortableInterceptor.ORBInitInfoPackage, \
+ org.omg.PortableServer, \
+ org.omg.PortableServer.CurrentPackage, \
+ org.omg.PortableServer.POAManagerPackage, \
+ org.omg.PortableServer.POAPackage, \
+ org.omg.PortableServer.portable, \
+ org.omg.PortableServer.ServantLocatorPackage, \
+ org.omg.SendingContext, \
+ org.omg.stub.java.rmi, \
+ org.omg.stub.javax.management.remote.rmi, \
+ org.w3c.dom, \
+ org.w3c.dom.bootstrap, \
+ org.w3c.dom.css, \
+ org.w3c.dom.events, \
+ org.w3c.dom.html, \
+ org.w3c.dom.ls, \
+ org.w3c.dom.ranges, \
+ org.w3c.dom.stylesheets, \
+ org.w3c.dom.traversal, \
+ org.w3c.dom.views, \
+ org.w3c.dom.xpath, \
+ org.xml.sax, \
+ org.xml.sax.ext, \
+ org.xml.sax.helpers

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/jre.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/jre.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/jre.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.felix.fileinstall-deploy.cfg
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.felix.fileinstall-deploy.cfg?rev=1231351&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.felix.fileinstall-deploy.cfg (added)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.felix.fileinstall-deploy.cfg Fri Jan 13 22:27:13 2012
@@ -0,0 +1,22 @@
+################################################################################
+#
+#    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.
+#
+################################################################################
+
+felix.fileinstall.dir     = ${karaf.base}/deploy
+felix.fileinstall.tmpdir  = ${karaf.data}/generated-bundles
+felix.fileinstall.poll    = 1000

Added: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.features.cfg?rev=1231351&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.features.cfg (added)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.features.cfg Fri Jan 13 22:27:13 2012
@@ -0,0 +1,4 @@
+#Features Configuration
+#Wed Jan 11 14:46:54 PST 2012
+featuresBoot=config,ssh,management
+featuresRepositories=mvn\:org.apache.karaf.features/standard/3.0.0-SNAPSHOT/xml/features,mvn\:org.apache.karaf.features/enterprise/3.0.0-SNAPSHOT/xml/features

Added: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.log.cfg
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.log.cfg?rev=1231351&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.log.cfg (added)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.log.cfg Fri Jan 13 22:27:13 2012
@@ -0,0 +1,36 @@
+################################################################################
+#
+#    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.
+#
+################################################################################
+
+#
+# This configuration file is used to configure the default values for the log:display
+# and log:display-exception commands.
+#
+
+#
+# The number of log statements to be displayed using log:display. It also defines the number
+# of lines searched for exceptions using log:display exception. You can override this value
+# at runtime using -n in log:display.
+#
+size = 500
+
+#
+# The pattern used to format the log statement when using log:display. This pattern is according
+# to the log4j layout. You can override this parameter at runtime using log:display with -p.
+#
+pattern = %d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n

Added: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.management.cfg
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.management.cfg?rev=1231351&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.management.cfg (added)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.management.cfg Fri Jan 13 22:27:13 2012
@@ -0,0 +1,27 @@
+################################################################################
+#
+#    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.
+#
+################################################################################
+
+#
+rmiRegistryPort = 1100
+rmiServerPort = 44445
+jmxRealm = karaf
+serviceUrl = service:jmx:rmi://localhost:${rmiServerPort}/jndi/rmi://localhost:${rmiRegistryPort}/karaf-${karaf.name}
+daemon = true
+threaded = true
+objectName = connector:name=rmi

Added: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.shell.cfg
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.shell.cfg?rev=1231351&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.shell.cfg (added)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.apache.karaf.shell.cfg Fri Jan 13 22:27:13 2012
@@ -0,0 +1,24 @@
+################################################################################
+#
+#    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.
+#
+################################################################################
+
+#
+sshPort=8102
+sshHost=0.0.0.0
+sshRealm=karaf
+hostKey=${karaf.base}/etc/host.key

Added: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.ops4j.pax.logging.cfg
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.ops4j.pax.logging.cfg?rev=1231351&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.ops4j.pax.logging.cfg (added)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.ops4j.pax.logging.cfg Fri Jan 13 22:27:13 2012
@@ -0,0 +1,47 @@
+################################################################################
+#
+#    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.
+#
+################################################################################
+
+# Root logger
+log4j.rootLogger=INFO, out, osgi:*
+log4j.throwableRenderer=org.apache.log4j.OsgiThrowableRenderer
+
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
+
+# File appender
+log4j.appender.out=org.apache.log4j.RollingFileAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
+log4j.appender.out.file=${karaf.data}/log/karaf.log
+log4j.appender.out.append=true
+log4j.appender.out.maxFileSize=1MB
+log4j.appender.out.maxBackupIndex=10
+
+# Sift appender
+log4j.appender.sift=org.apache.log4j.sift.MDCSiftingAppender
+log4j.appender.sift.key=bundle.name
+log4j.appender.sift.default=karaf
+log4j.appender.sift.appender=org.apache.log4j.FileAppender
+log4j.appender.sift.appender.layout=org.apache.log4j.PatternLayout
+log4j.appender.sift.appender.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
+log4j.appender.sift.appender.file=${karaf.data}/log/$\\{bundle.name\\}.log
+log4j.appender.sift.appender.append=true
+

Added: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.ops4j.pax.url.mvn.cfg
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.ops4j.pax.url.mvn.cfg?rev=1231351&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.ops4j.pax.url.mvn.cfg (added)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/org.ops4j.pax.url.mvn.cfg Fri Jan 13 22:27:13 2012
@@ -0,0 +1,80 @@
+################################################################################
+#
+#    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.
+#
+################################################################################
+
+#
+# If set to true, the following property will not allow any certificate to be used
+# when accessing maven repositories through SSL
+#
+#org.ops4j.pax.url.mvn.certificateCheck=
+
+#
+# Path to the local maven settings file.
+# The repositories defined in this file will be automatically added to the list
+# of default repositories if the 'org.ops4j.pax.url.mvn.repositories' property
+# below is not set.
+# The following locations are checked for the existence of the settings.xml file
+#   * 1. looks for the specified url
+#   * 2. if not found looks for ${user.home}/.m2/settings.xml
+#   * 3. if not found looks for ${maven.home}/conf/settings.xml
+#   * 4. if not found looks for ${M2_HOME}/conf/settings.xml
+#
+#org.ops4j.pax.url.mvn.settings=
+
+#
+# Path to the local maven repository which is used to avoid downloading
+# artifacts when they already exist locally.
+# The value of this property will be extracted from the settings.xml file
+# above, or defaulted to:
+#     System.getProperty( "user.home" ) + "/.m2/repository"
+#
+#org.ops4j.pax.url.mvn.localRepository=
+
+#
+# Comma separated list of repositories scanned when resolving an artifact.
+# Those repositories will be checked before iterating through the
+     below list of repositories and even before the local repository
+# A repository url can be appended with zero or more of the following flags:
+#    @snapshots  : the repository contains snaphots
+#    @noreleases : the repository does not contain any released artifacts
+#
+# The following property value will add the system folder as a repo.
+#
+org.ops4j.pax.url.mvn.defaultRepositories=file:${karaf.home}/${karaf.default.repository}@snapshots, \
+    file:${karaf.base}/${karaf.default.repository}@snapshots
+
+#
+# Comma separated list of repositories scanned when resolving an artifact.
+# The default list includes the following repositories:
+#    http://repo1.maven.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
+# To add repositories to the default ones, prepend '+' to the list of repositories
+# to add.
+# A repository url can be appended with zero or more of the following flags:
+#    @snapshots  : the repository contains snaphots
+#    @noreleases : the repository does not contain any released artifacts
+#
+# The following property value will add the system folder as a repo.
+#
+org.ops4j.pax.url.mvn.repositories= \
+    http://repo1.maven.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

Added: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/startup.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/startup.properties?rev=1231351&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/startup.properties (added)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/startup.properties Fri Jan 13 22:27:13 2012
@@ -0,0 +1,148 @@
+#Bundles to be started on startup, with startlevel
+
+# feature: framework version: 3.0.0-SNAPSHOT
+mvn\:org.ops4j.pax.url/pax-url-aether/1.4-SNAPSHOT = 5
+mvn\:org.ops4j.pax.url/pax-url-wrap/1.4-SNAPSHOT = 5
+mvn\:org.ops4j.pax.logging/pax-logging-api/1.6.4-SNAPSHOT = 8
+mvn\:org.ops4j.pax.logging/pax-logging-service/1.6.4-SNAPSHOT = 8
+mvn\:org.apache.felix/org.apache.felix.configadmin/1.2.8 = 10
+mvn\:org.apache.felix/org.apache.felix.fileinstall/3.1.10 = 11
+mvn\:org.apache.commons/commons-jexl/2.0 = 20
+mvn\:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/3.3_2 = 20
+mvn\:org.apache.aries/org.apache.aries.util/0.5-SNAPSHOT = 20
+mvn\:org.apache.aries.proxy/org.apache.aries.proxy.api/0.4 = 20
+mvn\:org.apache.aries.proxy/org.apache.aries.proxy.impl/0.4.1-SNAPSHOT = 20
+mvn\:org.apache.aries.quiesce/org.apache.aries.quiesce.api/0.3 = 20
+mvn\:org.apache.aries.quiesce/org.apache.aries.quiesce.manager/0.3.1 = 20
+mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.annotation.api/0.3.2 = 20
+mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.annotation.impl/0.3.2 = 20
+mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.api/0.3.1 = 20
+mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.cm/0.3.3-SNAPSHOT = 20
+mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/0.4.1-SNAPSHOT = 20
+mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core/0.4.1-SNAPSHOT = 20
+mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.jexl.evaluator/0.1.0 = 20
+mvn\:org.eclipse.equinox/region/1.0.0.v20110506 = 30
+mvn\:org.apache.karaf.region/org.apache.karaf.region.persist/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.features/org.apache.karaf.features.core/3.0.0-SNAPSHOT = 25
+mvn\:org.apache.karaf.shell/org.apache.karaf.shell.console/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.jaas/org.apache.karaf.jaas.modules/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.jaas/org.apache.karaf.jaas.config/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.shell/org.apache.karaf.shell.bundles/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.shell/org.apache.karaf.shell.services/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.system/org.apache.karaf.system.core/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.system/org.apache.karaf.system.commands/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.shell/org.apache.karaf.shell.commands/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.xbean/xbean-finder/3.7 = 30
+mvn\:org.apache.xbean/xbean-bundleutils/3.7 = 30
+
+# feature: obr version: 3.0.0-SNAPSHOT
+mvn\:commons-lang/commons-lang/2.6 = 30
+mvn\:commons-collections/commons-collections/3.2.1 = 30
+mvn\:org.apache.felix/org.osgi.service.obr/1.0.2 = 30
+mvn\:org.apache.felix/org.apache.felix.bundlerepository/1.6.4 = 30
+mvn\:org.apache.karaf.shell/org.apache.karaf.shell.obr/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.features/org.apache.karaf.features.obr/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.obr/3.0.0-SNAPSHOT = 30
+mvn\:org.ops4j.pax.url/pax-url-obr/1.4-SNAPSHOT = 30
+
+# feature: config version: 3.0.0-SNAPSHOT
+mvn\:org.apache.karaf.shell/org.apache.karaf.shell.config/3.0.0-SNAPSHOT = 30
+
+# feature: kar version: 3.0.0-SNAPSHOT
+mvn\:org.apache.karaf.kar/org.apache.karaf.kar.core/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.kar/org.apache.karaf.kar.command/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.kar/org.apache.karaf.kar.management/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.deployer/org.apache.karaf.deployer.kar/3.0.0-SNAPSHOT = 30
+
+# feature: ssh version: 3.0.0-SNAPSHOT
+mvn\:org.apache.mina/mina-core/2.0.3 = 30
+mvn\:org.apache.sshd/sshd-core/0.6.0 = 30
+mvn\:org.apache.karaf.shell/org.apache.karaf.shell.ssh/3.0.0-SNAPSHOT = 30
+
+# feature: management version: 3.0.0-SNAPSHOT
+mvn\:org.apache.karaf.management/org.apache.karaf.management.server/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.system/org.apache.karaf.system.management/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.bundles/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.services/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.packages/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.config/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.aries.jmx/org.apache.aries.jmx/0.3 = 30
+mvn\:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/0.3 = 30
+
+# feature: standard version: 0.0.0
+mvn\:org.apache.karaf.features/org.apache.karaf.features.command/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.features/org.apache.karaf.features.management/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.admin/org.apache.karaf.admin.core/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.admin/org.apache.karaf.admin.command/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.admin/org.apache.karaf.admin.management/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.diagnostic/org.apache.karaf.diagnostic.core/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.diagnostic/org.apache.karaf.diagnostic.common/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.diagnostic/org.apache.karaf.diagnostic.command/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.diagnostic/org.apache.karaf.diagnostic.management/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.shell/org.apache.karaf.shell.log/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.log/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.shell/org.apache.karaf.shell.dev/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.dev/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.jaas/org.apache.karaf.jaas.command/3.0.0-SNAPSHOT = 30
+
+# feature: framework version: 0.0.0
+mvn\:org.apache.geronimo.framework/geronimo-pax-logging/3.0-SNAPSHOT = 8
+mvn\:org.apache.felix/org.apache.felix.prefs/1.0.4 = 50
+mvn\:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/1.0 = 40
+mvn\:org.apache.geronimo.framework/geronimo-main/3.0-SNAPSHOT = 50
+mvn\:org.apache.geronimo.framework/geronimo-cli/3.0-SNAPSHOT = 50
+mvn\:commons-cli/commons-cli/1.2 = 50
+mvn\:org.apache.geronimo.framework/geronimo-shell-base/3.0-SNAPSHOT = 50
+mvn\:org.apache.geronimo.framework/geronimo-kernel/3.0-SNAPSHOT = 50
+mvn\:org.apache.geronimo.specs/geronimo-osgi-registry/1.1 = 50
+mvn\:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/2.1_3_4 = 50
+mvn\:org.apache.xbean/xbean-finder/3.9 = 50
+mvn\:org.apache.xbean/xbean-bundleutils/3.9 = 50
+mvn\:org.apache.xbean/xbean-reflect/3.9 = 50
+mvn\:org.apache.geronimo.framework/geronimo-crypto/3.0-SNAPSHOT = 50
+mvn\:org.apache.geronimo.framework/geronimo-deploy-tool/3.0-SNAPSHOT = 50
+mvn\:org.apache.geronimo.specs/geronimo-javaee-deployment_1.1MR3_spec/1.0.1 = 40
+mvn\:org.apache.geronimo.framework/geronimo-service-builder/3.0-SNAPSHOT = 50
+mvn\:org.apache.geronimo.framework/geronimo-deployment/3.0-SNAPSHOT = 50
+mvn\:org.apache.geronimo.framework/geronimo-system/3.0-SNAPSHOT = 50
+mvn\:org.apache.geronimo.framework/geronimo-common/3.0-SNAPSHOT = 50
+mvn\:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/2.4.0_3 = 50
+mvn\:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/1.2_2 = 50
+mvn\:org.apache.geronimo.framework/geronimo-deploy-jsr88/3.0-SNAPSHOT = 50
+mvn\:org.apache.geronimo.framework/geronimo-plugin/3.0-SNAPSHOT = 50
+mvn\:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_3 = 50
+mvn\:org.apache.geronimo.framework/geronimo-deploy-config/3.0-SNAPSHOT = 50
+mvn\:org.apache.geronimo.framework/geronimo-bundle-recorder/3.0-SNAPSHOT = 50
+mvn\:org.apache.geronimo.framework/geronimo-obr/3.0-SNAPSHOT = 50
+mvn\:org.apache.geronimo.framework/geronimo-shell-diagnose/3.0-SNAPSHOT = 50
+mvn\:org.apache.geronimo.framework/geronimo-shell/3.0-SNAPSHOT = 50
+
+# feature: org.apache.karaf.scr.feature version: 0.0.0
+mvn\:org.apache.karaf.scr/org.apache.karaf.scr.command/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.felix/org.apache.felix.scr/1.6.0 = 30
+mvn\:org.apache.karaf.scr/org.apache.karaf.scr.management/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.felix/org.apache.felix.metatype/1.0.4 = 30
+
+# feature: org.apache.geronimo.javaee-specs version: 0.0.0
+mvn\:org.apache.geronimo.specs/geronimo-activation_1.1_spec/1.1 = 40
+mvn\:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/1.0.1 = 40
+mvn\:org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.0 = 40
+mvn\:org.apache.geronimo.specs/geronimo-ejb_3.1_spec/1.0.2 = 40
+mvn\:org.apache.geronimo.specs/geronimo-el_2.2_spec/1.0.2 = 40
+mvn\:org.apache.geronimo.specs/geronimo-interceptor_1.1_spec/1.0 = 40
+mvn\:org.apache.geronimo.specs/geronimo-j2ee-connector_1.6_spec/1.0 = 40
+mvn\:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1 = 40
+mvn\:org.apache.geronimo.specs/geronimo-jacc_1.4_spec/1.0 = 40
+mvn\:org.apache.geronimo.specs/geronimo-jaspic_1.0_spec/1.1 = 40
+mvn\:org.apache.geronimo.specs/geronimo-jaxr_1.0_spec/2.1 = 40
+mvn\:org.apache.geronimo.specs/geronimo-jaxrpc_1.1_spec/2.1 = 40
+mvn\:org.apache.geronimo.specs/geronimo-jaxws_2.2_spec/1.1 = 40
+mvn\:org.apache.geronimo.specs/geronimo-jcdi_1.0_spec/1.0 = 40
+mvn\:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1 = 40
+mvn\:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/1.1 = 40
+mvn\:org.apache.geronimo.specs/geronimo-jsp_2.2_spec/1.0 = 40
+mvn\:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1 = 40
+mvn\:org.apache.geronimo.specs/geronimo-saaj_1.3_spec/1.1 = 40
+mvn\:org.apache.geronimo.specs/geronimo-validation_1.0_spec/1.1 = 40
+mvn\:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/1.1.3 = 40
+mvn\:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/1.8.3 = 40

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/startup.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/startup.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/startup.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/system.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/system.properties?rev=1231351&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/system.properties (added)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/system.properties Fri Jan 13 22:27:13 2012
@@ -0,0 +1,61 @@
+################################################################################
+#
+#    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.
+#
+################################################################################
+
+#
+# The properties defined in this file will be made available through system
+# properties at the very beginning of the Karaf's boot process.
+#
+
+
+# Log level when the pax-logging service is not available
+# This level will only be used while the pax-logging service bundle
+# is not fully available.
+# To change log levels, please refer to the org.ops4j.pax.logging.cfg file
+# instead.
+org.ops4j.pax.logging.DefaultServiceLog.level=ERROR
+
+#
+# Name of this karaf instance.
+#
+karaf.name=client
+
+#
+# Default repository where bundles will be loaded from before using
+# other maven repositories.  For the full maven configuration, see
+# the org.ops4j.pax.url.mvn.cfg file.
+#
+karaf.default.repository=system
+
+#
+# Location of a shell script that will be run when starting a shell
+# session.  This script can be used to create aliases and define
+# additional commands.
+#
+karaf.shell.init.script=${karaf.home}/etc/shell.init.script
+
+#
+# Set this empty property to avoid errors when validating xml documents.
+#
+xml.catalog.files=
+
+#
+# Suppress the bell in the console when hitting backspace to many times
+# for example
+#
+jline.nobell=true

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/system.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/system.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/system.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain