geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1096951 [4/6] - in /geronimo/server/trunk: ./ framework/ framework/assemblies/ framework/assemblies/geronimo-framework/ framework/buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/ framework/buildsupport/car-maven-plu...
Date Tue, 26 Apr 2011 23:19:00 GMT
Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/goals.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/goals.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/goals.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml (from r1096950, geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml?p2=geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml&p1=geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml (original)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml Tue Apr 26 23:18:49 2011
@@ -33,7 +33,7 @@
     <groupId>org.apache.geronimo.buildsupport.it</groupId>
     <artifactId>metadatatest-it4</artifactId>
     <name>Metadata test  it4</name>
-    <packaging>car</packaging>
+    <packaging>feature</packaging>
 
     <dependencies>
         <dependency>

Added: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/main/plan/plan.xml?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/main/plan/plan.xml Tue Apr 26 23:18:49 2011
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+</module>

Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/META-INF/geronimo-plugin.xml?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/META-INF/geronimo-plugin.xml (added)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/META-INF/geronimo-plugin.xml Tue Apr 26 23:18:49 2011
@@ -0,0 +1,71 @@
+<?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.
+-->
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+    <name>Geronimo Maven2 Plugins :: CAR</name>
+    <category>Test</category>
+    <description>Apache Geronimo, the JavaEE server project of the Apache Software Foundation.</description>
+    <url>http://geronimo.apache.org/</url>
+    <author>The Apache Geronimo development community</author>
+    <license osi-approved="true">The Apache Software License, Version 2.0</license>
+    <plugin-artifact>
+        <module-id>
+            <groupId>org.apache.geronimo.buildsupport.it</groupId>
+            <artifactId>car-maven-plugin</artifactId>
+            <version>2.2-SNAPSHOT</version>
+            <type>jar</type>
+        </module-id>
+        <jvm-version>1.5</jvm-version>
+        <jvm-version>1.5.2</jvm-version>
+        <prerequisite>
+            <id>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+            </id>
+            <resource-type>joke</resource-type>
+            <description>this is an explanation</description>
+        </prerequisite>
+        <dependency start="true">
+            <groupId>velocity</groupId>
+            <artifactId>velocity</artifactId>
+            <version>1.4</version>
+            <type>jar</type>
+        </dependency>
+        <dependency start="true">
+            <groupId>xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.1.3</version>
+            <type>jar</type>
+        </dependency>
+        <obsoletes>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </obsoletes>
+        <source-repository>http://foo.com</source-repository>
+        <source-repository>http://bar.com</source-repository>
+        <copy-file relative-to="WEB-INF" dest-dir="bar">META-INF/foo.xml</copy-file>
+        <config-xml-content>
+            <ns2:gbean name="DownloadedPluginRepos">
+                <ns2:attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.1.txt</ns2:attribute>
+                <ns2:attribute name="userRepositories">~/.m2/repository,${key1}</ns2:attribute>
+            </ns2:gbean>
+        </config-xml-content>
+        <artifact-alias key="org.apache.geronimo.test/foo//car">org.apache.geronimo.test/bar/1.0/car</artifact-alias>
+        <config-substitution key="key2">value2</config-substitution>
+        <config-substitution key="key1">value1</config-substitution>
+    </plugin-artifact>
+</geronimo-plugin>

Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/validate.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/validate.groovy?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/validate.groovy (added)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/validate.groovy Tue Apr 26 23:18:49 2011
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+/**
+ * Loads text from a file an normalizes its EOL-style for platform-safe validation.
+ */
+def loadText = { filename ->
+    def file = new File(basedir, "$filename")
+    
+    def tmp = File.createTempFile('validate', null, basedir)
+    tmp.deleteOnExit()
+    
+    ant.copy(file: file, tofile: tmp)
+    ant.fixcrlf(eol: 'unix', file: tmp)
+    
+    def text = tmp.text
+    tmp.delete()
+    
+    return text
+}
+
+/**
+ * Asserts that the text of both files are the same in a platform-safe fasion.
+ */
+def assertSame = { file1, file2 ->
+    def expect = loadText(file1)
+    def found = loadText(file2)
+    
+    assert expect == found
+}
+
+assertSame('src/test/resources/META-INF/geronimo-plugin.xml', 'target/resources/META-INF/geronimo-plugin.xml')

Added: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/main/history/dependencies.xml?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/main/history/dependencies.xml (added)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/main/history/dependencies.xml Tue Apr 26 23:18:49 2011
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+    <module-id>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-gbean-deployer</artifactId>
+        <version>3.0-SNAPSHOT</version>
+        <type>car</type>
+    </module-id>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-cli</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deployment</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-service-builder</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>plugin</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-osgi-registry</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-bundleutils</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-finder</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-reflect</artifactId>
+        <type>jar</type>
+    </dependency>
+</plugin-artifact>

Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/main/plan/plan.xml (from r1096950, geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/plan/plan.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/main/plan/plan.xml?p2=geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/main/plan/plan.xml&p1=geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/plan/plan.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/main/plan/plan.xml Tue Apr 26 23:18:49 2011
@@ -14,9 +14,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.-->
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-    <!--Deployer used to process modules and plans-->
 
-    <gbean name="Deployer" class="org.apache.geronimo.deployment.DeployerImpl">
+    <gbean name="Deployer" class="org.apache.geronimo.deployment.Deployer">
+        <attribute name="remoteDeployAddress">localhost:8080</attribute>
         <reference name="Store">
         </reference>
         <reference name="Builders"></reference>
@@ -40,6 +40,8 @@
         </reference>
     </gbean>
 
+    <gbean name="JavaBeanXmlAttributeBuilder" class="org.apache.geronimo.deployment.service.JavaBeanXmlAttributeBuilder"/>
+
     <!-- environment builder is installed in code because it is needed to deploy this module. -->
     <!--<gbean name="EnvironmentBuilder" class="org.apache.geronimo.deployment.service.EnvironmentBuilder"/>-->
 </module>
\ No newline at end of file

Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: geronimo/server/trunk/framework/features/j2ee-security/pom.xml (from r1096950, geronimo/server/trunk/framework/modules/geronimo-deploy-tool/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/j2ee-security/pom.xml?p2=geronimo/server/trunk/framework/features/j2ee-security/pom.xml&p1=geronimo/server/trunk/framework/modules/geronimo-deploy-tool/pom.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-tool/pom.xml (original)
+++ geronimo/server/trunk/framework/features/j2ee-security/pom.xml Tue Apr 26 23:18:49 2011
@@ -23,45 +23,58 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>modules</artifactId>
+        <groupId>org.apache.geronimo.framework.feature</groupId>
+        <artifactId>feature</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>geronimo-deploy-tool</artifactId>
-    <packaging>bundle</packaging>
-    <name>Geronimo Framework, Modules :: Deploy Tool</name>
-    
+    <!-- change this to server-security -->
+    <artifactId>j2ee-security</artifactId>
+    <name>Geronimo Framework, Feature :: J2EE Security</name>
+    <packaging>feature</packaging>
+
+    <description>Basic Geronimo server security infrastructure</description>
+
     <dependencies>
+
+        <!-- parent -->
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+            <groupId>org.apache.geronimo.framework.feature</groupId>
+            <artifactId>rmi-naming</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
 
-        <!-- g-deployment comes from this -->
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
+            <artifactId>geronimo-security</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-cli</artifactId>
+            <artifactId>geronimo-jmx-remoting</artifactId>
             <version>${project.version}</version>
         </dependency>
-        
+
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-deploy-jsr88</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.apache.geronimo.components</groupId>
+            <artifactId>geronimo-jaspi</artifactId>
+        </dependency>
+<!--
+        <dependency>
+            <groupId>org.soter.rbac</groupId>
+            <artifactId>rbac-xml-model</artifactId>
+            <version>1.0-SNAPSHOT</version>
         </dependency>
-        
         <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.console</artifactId>
+            <groupId>org.soter.rbac</groupId>
+            <artifactId>rbac-jacc</artifactId>
+            <version>1.0-SNAPSHOT</version>
         </dependency>
+-->
     </dependencies>
-    
-</project>
 
+
+</project>

Copied: geronimo/server/trunk/framework/features/j2ee-security/src/main/history/dependencies.xml (from r1096950, geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/j2ee-security/src/main/history/dependencies.xml?p2=geronimo/server/trunk/framework/features/j2ee-security/src/main/history/dependencies.xml&p1=geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/features/j2ee-security/src/main/history/dependencies.xml Tue Apr 26 23:18:49 2011
@@ -36,9 +36,4 @@
         <artifactId>geronimo-jaspic_1.0_spec</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.karaf.jaas</groupId>
-        <artifactId>org.apache.karaf.jaas.boot</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Added: geronimo/server/trunk/framework/features/j2ee-security/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/j2ee-security/src/main/plan/plan.xml?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/j2ee-security/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/framework/features/j2ee-security/src/main/plan/plan.xml Tue Apr 26 23:18:49 2011
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <!--runtime dependencies-->
+    <gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
+        <reference name="ServerInfo"><name>ServerInfo</name></reference>
+        <attribute name="policyConfigurationFactory">org.apache.geronimo.security.jacc.mappingprovider.GeronimoPolicyConfigurationFactory</attribute>
+        <attribute name="policyProvider">org.apache.geronimo.security.jacc.mappingprovider.GeronimoPolicy</attribute>
+    </gbean>
+
+    <!-- Register GeronimoLoginConfiguration as the LoginConfiguration handler -->
+    <gbean name="LoginConfiguration" class="org.apache.geronimo.security.jaas.GeronimoLoginConfiguration">
+        <references name="Configurations">
+            <pattern><type>SecurityRealm</type></pattern>
+            <pattern><type>ConfigurationEntry</type></pattern>
+        </references>
+    </gbean>
+
+    <!-- JMX Remoting -->
+    <gbean name="JMXService" class="org.apache.geronimo.jmxremoting.JMXConnector">
+        <attribute name="protocol">rmi</attribute>
+        <attribute name="host">${planServerHostname}</attribute>
+        <attribute name="port">${planJMXPort}</attribute>
+        <attribute name="urlPath">/jndi/rmi://${planServerHostname}:${planNamingPort}/JMXConnector</attribute>
+        <attribute name="applicationConfigName">geronimo-admin</attribute>
+        <reference name="MBeanServerReference">
+            <name>MBeanServerReference</name>
+        </reference>
+    </gbean>
+
+    <gbean name="KeystoreManager" class="org.apache.geronimo.security.keystore.FileKeystoreManager">
+        <attribute name="keystoreDir">var/security/keystores</attribute>
+        <reference name="ServerInfo"><name>ServerInfo</name></reference>
+        <references name="KeystoreInstances">
+          <pattern>
+            <type>Keystore</type>
+          </pattern>
+        </references>
+    </gbean>
+
+</module>

Propchange: geronimo/server/trunk/framework/features/j2ee-security/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/j2ee-security/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/j2ee-security/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: geronimo/server/trunk/framework/features/j2ee-system/pom.xml (from r1096950, geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/j2ee-system/pom.xml?p2=geronimo/server/trunk/framework/features/j2ee-system/pom.xml&p1=geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml (original)
+++ geronimo/server/trunk/framework/features/j2ee-system/pom.xml Tue Apr 26 23:18:49 2011
@@ -23,15 +23,16 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.buildsupport</groupId>
-        <artifactId>buildsupport</artifactId>
+        <groupId>org.apache.geronimo.framework.feature</groupId>
+        <artifactId>feature</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.geronimo.buildsupport.it</groupId>
-    <artifactId>j2ee-system-it1</artifactId>
-    <name>Geronimo Configs :: J2EE System IT1</name>
-    <packaging>car</packaging>
+    <artifactId>j2ee-system</artifactId>
+    <name>Geronimo Framework, Feature :: J2EE System</name>
+    <packaging>feature</packaging>
+
+    <description>Base geronimo server that sets up the kernel.</description>
 
     <dependencies>
         <dependency>
@@ -64,6 +65,36 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-plugin</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-deploy-tool</artifactId>
+            <version>${project.version}</version>
+
+            <!-- exclude transitive deps -->
+            <!--<exclusions>-->
+                <!--<exclusion>-->
+                    <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                    <!--<artifactId>geronimo-crypto</artifactId>-->
+                <!--</exclusion>-->
+                <!--<exclusion>-->
+                    <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                    <!--<artifactId>geronimo-deploy-jsr88</artifactId>-->
+                <!--</exclusion>-->
+            <!--</exclusions>-->
+        </dependency>
+
         <!-- Used by TemporaryClassLoader in kernel -->
         <dependency>
             <groupId>asm</groupId>
@@ -154,117 +185,52 @@
             <artifactId>org.apache.felix.configadmin</artifactId>
         </dependency>
 
-
-        <!-- build order hint -->
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
+            <groupId>org.apache.geronimo.framework.config</groupId>
+            <artifactId>j2ee-system</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.config</groupId>
+            <artifactId>rmi-naming</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.config</groupId>
+            <artifactId>j2ee-security</artifactId>
             <version>${project.version}</version>
             <type>car</type>
-            <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.config</groupId>
+            <artifactId>server-security-config</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.config</groupId>
+            <artifactId>plugin</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Endorsed-Dirs>lib/endorsed</Endorsed-Dirs>
-                            <Extension-Dirs>lib/ext</Extension-Dirs>
-                        </manifestEntries>
-                        <manifest>
-                            <mainClass>org.apache.geronimo.cli.daemon.DaemonCLI</mainClass>
-                        </manifest>
-                    </archive>
-
-                    <!--
-                    NOTE: This list of dependencies is non-transitive.
-                    -->
-                    <classpath>
-                        <element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-cli</artifactId>
-                            <version>${project.version}</version>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-kernel</artifactId>
-                            <version>${project.version}</version>
-                        </element>
-                        <!--
-                        NOTE: geronimo-transformer needs to be on the system classpath to avoid a potential deadlock. See GERONIMO-3141.
-                        -->
-                        <element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-transformer</artifactId>
-                            <version>${project.version}</version>
-                        </element>
-                        <element>
-                            <groupId>asm</groupId>
-                            <artifactId>asm</artifactId>
-                        </element>
-                        <element>
-                            <groupId>asm</groupId>
-                            <artifactId>asm-commons</artifactId>
-                        </element>
-                        <element>
-                            <groupId>commons-cli</groupId>
-                            <artifactId>commons-cli</artifactId>
-                        </element>
-                        <element>
-                            <groupId>cglib</groupId>
-                            <artifactId>cglib-nodep</artifactId>
-                        </element>
-                        <element>
-                            <groupId>xpp3</groupId>
-                            <artifactId>xpp3_min</artifactId>
-                        </element>
-                        <element>
-                            <groupId>com.thoughtworks.xstream</groupId>
-                            <artifactId>xstream</artifactId>
-                        </element>
-                        <!-- TODO bad idea... temp, for plugins -->
-                        <element>
-                            <groupId>org.apache.geronimo.specs</groupId>
-                            <artifactId>geronimo-jaxb_2.2_spec</artifactId>
-                        </element>
-                        <element>
-                            <groupId>com.sun.xml.bind</groupId>
-                            <artifactId>jaxb-impl</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.specs</groupId>
-                            <artifactId>geronimo-stax-api_1.2_spec</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.codehaus.woodstox</groupId>
-                            <artifactId>wstx-asl</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.specs</groupId>
-                            <artifactId>geronimo-activation_1.1_spec</artifactId>
-                        </element>
-                    </classpath>
-                    <classpathPrefix>../lib</classpathPrefix>
-
-                    <category>Geronimo Core</category>
-                    <osiApproved>true</osiApproved>
-                    <geronimoVersion>${project.version}</geronimoVersion>
-
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>karaf-maven-plugin</artifactId>
                 <configuration>
-                    <skip>true</skip>
+                    <startLevel>50</startLevel>
+                    <checkDependencyChange>true</checkDependencyChange>
+                    <warnOnDependencyChange>true</warnOnDependencyChange>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
+
 </project>

Added: geronimo/server/trunk/framework/features/j2ee-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/j2ee-system/src/main/history/dependencies.xml?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/j2ee-system/src/main/history/dependencies.xml (added)
+++ geronimo/server/trunk/framework/features/j2ee-system/src/main/history/dependencies.xml Tue Apr 26 23:18:49 2011
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="&lt;unnamed&gt;">
+    <feature>
+        <bundle>mvn:asm/asm-all/3.2</bundle>
+        <bundle>mvn:commons-cli/commons-cli/1.2</bundle>
+        <bundle>mvn:commons-lang/commons-lang/2.5</bundle>
+        <bundle>mvn:org.apache.aries.blueprint/org.apache.aries.blueprint/0.2-incubating</bundle>
+        <bundle>mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/0.2-incubating</bundle>
+        <bundle>mvn:org.apache.aries.jmx/org.apache.aries.jmx/0.2-incubating</bundle>
+        <bundle>mvn:org.apache.aries.jndi/org.apache.aries.jndi/0.2-incubating</bundle>
+        <bundle>mvn:org.apache.aries/org.apache.aries.util/0.2-incubating</bundle>
+        <bundle>mvn:org.apache.felix/org.apache.felix.bundlerepository/1.6.4</bundle>
+        <bundle>mvn:org.apache.felix/org.apache.felix.configadmin/1.2.4</bundle>
+        <bundle>mvn:org.apache.geronimo.bundles/jaxb-impl/2.2.3_1-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.bundles/sxc-jaxb/0.7.3_1</bundle>
+        <bundle>mvn:org.apache.geronimo.bundles/sxc-runtime/0.7.3_1</bundle>
+        <bundle>mvn:org.apache.geronimo.bundles/woodstox/3.2.9_1</bundle>
+        <bundle>mvn:org.apache.geronimo.components/geronimo-jaspi/1.1.1</bundle>
+        <bundle>mvn:org.apache.geronimo.framework.config/j2ee-security/3.0-SNAPSHOT/car</bundle>
+        <bundle>mvn:org.apache.geronimo.framework.config/j2ee-system/3.0-SNAPSHOT/car</bundle>
+        <bundle>mvn:org.apache.geronimo.framework.config/plugin/3.0-SNAPSHOT/car</bundle>
+        <bundle>mvn:org.apache.geronimo.framework.config/rmi-naming/3.0-SNAPSHOT/car</bundle>
+        <bundle>mvn:org.apache.geronimo.framework.config/server-security-config/3.0-SNAPSHOT/car</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-blueprint/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-cli/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-common/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-core/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-crypto/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-deploy-tool/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-deployment/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-interceptor/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-jmx-remoting/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-kernel/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-management/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-naming/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-obr/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-pax-logging/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-plugin/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-security/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-service-builder/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-system/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-activation_1.1_spec/1.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-ejb_3.1_spec/1.0.2</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jacc_1.4_spec/1.0</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jaspic_1.0_spec/1.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-javaee-deployment_1.1MR3_spec/1.0.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jaxb_2.2_spec/1.0.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jaxrpc_1.1_spec/2.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-osgi-registry/1.0</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-saaj_1.3_spec/1.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/1.0</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-stax-api_1.2_spec/1.0</bundle>
+        <bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.console/2.1.2</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_3</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/2.1_3_4</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-jexl/1.1_3</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/2.4.0_3</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/1.2_2</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/1.1.4c_3</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/1.3_3</bundle>
+        <bundle>mvn:org.apache.xbean/xbean-bundleutils/3.8-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.xbean/xbean-finder/3.8-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.xbean/xbean-naming/3.8-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.xbean/xbean-reflect/3.8-SNAPSHOT</bundle>
+        <bundle>mvn:org.ops4j.pax.logging/pax-logging-api/1.5.3</bundle>
+    </feature>
+</features>

Propchange: geronimo/server/trunk/framework/features/j2ee-system/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/j2ee-system/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/j2ee-system/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: geronimo/server/trunk/framework/features/j2ee-system/src/main/plan/plan.xml (from r1096950, geronimo/server/trunk/framework/configs/j2ee-system/src/main/plan/plan.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/j2ee-system/src/main/plan/plan.xml?p2=geronimo/server/trunk/framework/features/j2ee-system/src/main/plan/plan.xml&p1=geronimo/server/trunk/framework/configs/j2ee-system/src/main/plan/plan.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/features/j2ee-system/src/main/plan/plan.xml Tue Apr 26 23:18:49 2011
@@ -108,21 +108,21 @@ specific services - those should be prov
         </reference>
     </gbean>
     
-    <!--<gbean name="ConfigurationExtender" class="org.apache.geronimo.system.configuration.ConfigurationExtender">-->
-        <!--<reference name="ConfigurationManager">-->
-            <!--<name>ConfigurationManager</name>-->
-        <!--</reference>-->
-        <!--<reference name="DependencyManager">-->
-            <!--<name>DependencyManager</name>-->
-        <!--</reference>-->
-    <!--</gbean>-->
+    <gbean name="ConfigurationExtender" class="org.apache.geronimo.system.configuration.ConfigurationExtender">
+        <reference name="ConfigurationManager">
+            <name>ConfigurationManager</name>
+        </reference>
+        <reference name="DependencyManager">
+            <name>DependencyManager</name>
+        </reference>
+    </gbean>
 
-    <!--<gbean name="DependencyManager" class="org.apache.geronimo.system.configuration.DependencyManager">-->
-        <!--<reference name="Repositories"></reference>-->
-        <!--<reference name="ArtifactResolver">-->
-            <!--<name>ArtifactResolver</name>-->
-        <!--</reference>-->
-    <!--</gbean>-->
+    <gbean name="DependencyManager" class="org.apache.geronimo.system.configuration.DependencyManager">
+        <reference name="Repositories"></reference>
+        <reference name="ArtifactResolver">
+            <name>ArtifactResolver</name>
+        </reference>
+    </gbean>
     
     <gbean name="Logger" class="org.apache.geronimo.system.logging.OSGILogServiceWrapper">       
     </gbean>    

Added: geronimo/server/trunk/framework/features/j2ee-system/src/main/resources/META-INF/startup-jar
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/j2ee-system/src/main/resources/META-INF/startup-jar?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/j2ee-system/src/main/resources/META-INF/startup-jar (added)
+++ geronimo/server/trunk/framework/features/j2ee-system/src/main/resources/META-INF/startup-jar Tue Apr 26 23:18:49 2011
@@ -0,0 +1,18 @@
+<!--
+  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 tells the Geronimo bootstrap where to look for its installation
+directory, which is ../ from wherever the jar containing this file lives.
\ No newline at end of file

Copied: geronimo/server/trunk/framework/features/jmx-security/pom.xml (from r1096950, geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/jmx-security/pom.xml?p2=geronimo/server/trunk/framework/features/jmx-security/pom.xml&p1=geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml (original)
+++ geronimo/server/trunk/framework/features/jmx-security/pom.xml Tue Apr 26 23:18:49 2011
@@ -1,56 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-    
-       http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<!-- $Rev: 613699 $ $Date: 2008-01-20 14:50:35 -0800 (Sun, 20 Jan 2008) $ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    
-    <parent>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>modules</artifactId>
-        <version>3.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>geronimo-cli</artifactId>
-    <packaging>bundle</packaging>
-    <name>Geronimo Framework, Modules :: CLI</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-main</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.testsupport</groupId>
-            <artifactId>testsupport-common</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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.
+-->
+
+<!-- $Rev: 617770 $ $Date: 2008-02-02 03:30:00 -0500 (Sat, 02 Feb 2008) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.framework.feature</groupId>
+        <artifactId>feature</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>jmx-security</artifactId>
+    <name>Geronimo Framework, Feature :: JMX Security Configuration</name>
+    <packaging>feature</packaging>
+
+    <description>Secure (SSL/TSL) JMX Connector.</description>
+
+    <dependencies>
+        <!-- parent -->
+        <dependency>
+            <groupId>org.apache.geronimo.framework.config</groupId>
+            <artifactId>server-security-config</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+
+</project>

Added: geronimo/server/trunk/framework/features/jmx-security/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/jmx-security/src/main/history/dependencies.xml?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/jmx-security/src/main/history/dependencies.xml (added)
+++ geronimo/server/trunk/framework/features/jmx-security/src/main/history/dependencies.xml Tue Apr 26 23:18:49 2011
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+    <module-id>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>jmx-security</artifactId>
+        <version>3.0-SNAPSHOT</version>
+        <type>car</type>
+    </module-id>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>server-security-config</artifactId>
+        <type>car</type>
+    </dependency>
+</plugin-artifact>

Propchange: geronimo/server/trunk/framework/features/jmx-security/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/jmx-security/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/jmx-security/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/framework/features/jmx-security/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/jmx-security/src/main/plan/plan.xml?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/jmx-security/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/framework/features/jmx-security/src/main/plan/plan.xml Tue Apr 26 23:18:49 2011
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <!-- JMX Remoting -->
+    <gbean name="JMXSecureConnector" class="org.apache.geronimo.jmxremoting.JMXSecureConnector">
+        <attribute name="protocol">rmi</attribute>
+        <attribute name="host">${planServerHostname}</attribute>
+        <attribute name="port">${planJMXSecurePort}</attribute>
+        <attribute name="urlPath">/jndi/rmi://${planServerHostname}:${planNamingPort}/JMXSecureConnector</attribute>
+        <attribute name="applicationConfigName">geronimo-admin</attribute>
+        <reference name="MBeanServerReference">
+            <name>MBeanServerReference</name>
+        </reference>
+
+        <attribute name="algorithm">Default</attribute>
+        <attribute name="secureProtocol">TLS</attribute>
+        <attribute name="keyStore">geronimo-default</attribute>
+        <attribute name="keyAlias">geronimo</attribute>
+        <attribute name="trustStore">geronimo-default</attribute>
+        <attribute name="clientAuth">false</attribute>
+        <reference name="KeystoreManager">
+            <name>KeystoreManager</name>
+        </reference>
+    </gbean>
+
+</module>

Propchange: geronimo/server/trunk/framework/features/jmx-security/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/jmx-security/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/jmx-security/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: geronimo/server/trunk/framework/features/jsr88-cli/pom.xml (from r1096950, geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/jsr88-cli/pom.xml?p2=geronimo/server/trunk/framework/features/jsr88-cli/pom.xml&p1=geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml (original)
+++ geronimo/server/trunk/framework/features/jsr88-cli/pom.xml Tue Apr 26 23:18:49 2011
@@ -23,27 +23,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.framework.feature</groupId>
+        <artifactId>feature</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jsr88-cli</artifactId>
-    <name>Geronimo Framework, Configs :: JSR-88 CLI</name>
-    <packaging>car</packaging>
+    <name>Geronimo Framework, Feature :: JSR-88 CLI</name>
+    <packaging>feature</packaging>
 
     <dependencies>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <type>car</type>
-            <scope>provided</scope>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-common</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -118,21 +110,5 @@
 
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <configuration>
-                    <category>Deployment</category>
-                    <instance>
-                        <plugin-artifact>
-                            <config-xml-content server="jsr88" />
-                        </plugin-artifact>
-                    </instance>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
 

Copied: geronimo/server/trunk/framework/features/jsr88-cli/src/main/history/dependencies.xml (from r1096950, geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/jsr88-cli/src/main/history/dependencies.xml?p2=geronimo/server/trunk/framework/features/jsr88-cli/src/main/history/dependencies.xml&p1=geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/features/jsr88-cli/src/main/history/dependencies.xml Tue Apr 26 23:18:49 2011
@@ -2,7 +2,7 @@
 <plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
     <module-id>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
+        <artifactId>jsr88-cli</artifactId>
         <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
@@ -63,6 +63,16 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deploy-jsr88</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deploy-tool</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-deployment</artifactId>
         <type>jar</type>
     </dependency>
@@ -78,6 +88,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-plugin</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-service-builder</artifactId>
         <type>jar</type>
     </dependency>
@@ -112,6 +127,16 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.karaf.shell</groupId>
+        <artifactId>org.apache.karaf.shell.console</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.ant</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
         <type>jar</type>

Added: geronimo/server/trunk/framework/features/jsr88-cli/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/jsr88-cli/src/main/plan/plan.xml?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/jsr88-cli/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/framework/features/jsr88-cli/src/main/plan/plan.xml Tue Apr 26 23:18:49 2011
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <gbean name="DeployTool" class="org.apache.geronimo.deployment.cli.DeployTool" />
+
+    <gbean name="DeploymentFactory" class="org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel" />
+
+</module>

Propchange: geronimo/server/trunk/framework/features/jsr88-cli/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/jsr88-cli/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/jsr88-cli/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: geronimo/server/trunk/framework/features/jsr88-deploymentfactory/pom.xml (from r1096950, geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/jsr88-deploymentfactory/pom.xml?p2=geronimo/server/trunk/framework/features/jsr88-deploymentfactory/pom.xml&p1=geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml (original)
+++ geronimo/server/trunk/framework/features/jsr88-deploymentfactory/pom.xml Tue Apr 26 23:18:49 2011
@@ -23,47 +23,45 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.framework.feature</groupId>
+        <artifactId>feature</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
-    <name>Geronimo Framework, Configs :: GBean Deployer Boostrap</name>
-    <packaging>car</packaging>
+    <artifactId>jsr88-deploymentfactory</artifactId>
+    <name>Geronimo Framework, Feature :: JSR-88 DeploymentFactory</name>
+    <packaging>feature</packaging>
 
     <dependencies>
-        <!-- N.B. ordering is crucial until maven dependencies express the osgi dependencies. xmlbeans requires xml-resolver -->
-        <!-- required for environment dconfigbean support -->
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-common</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
-        <!-- Thirdparty Dependencies -->
-
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-crypto</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.2_spec</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${project.version}</version>
         </dependency>
-
-        <!-- needed by the plan -->
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-deployment</artifactId>
+            <artifactId>geronimo-deploy-jsr88-bootstrapper</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- jsr88 dconfigbean support base classes -->
+
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-deploy-config</artifactId>
@@ -71,32 +69,42 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-common</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
-            <version>${project.version}</version>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
+
+        <!-- used by plugin installer -->
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxb_2.2_spec</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>jaxb-impl</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.2_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>woodstox</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.1_spec</artifactId>
+        </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <configuration>
-                    <deploymentConfigs>
-                    </deploymentConfigs>
-                    <bootstrap>true</bootstrap>
-                    <category>Geronimo Core</category>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 
 </project>
+

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

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

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

Copied: geronimo/server/trunk/framework/features/jsr88-deploymentfactory/src/main/history/dependencies.xml (from r1096950, geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/jsr88-deploymentfactory/src/main/history/dependencies.xml?p2=geronimo/server/trunk/framework/features/jsr88-deploymentfactory/src/main/history/dependencies.xml&p1=geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/features/jsr88-deploymentfactory/src/main/history/dependencies.xml Tue Apr 26 23:18:49 2011
@@ -2,7 +2,7 @@
 <plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
     <module-id>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
+        <artifactId>jsr88-deploymentfactory</artifactId>
         <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
@@ -63,7 +63,12 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-deployment</artifactId>
+        <artifactId>geronimo-deploy-jsr88</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deploy-jsr88-bootstrapper</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -78,7 +83,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-service-builder</artifactId>
+        <artifactId>geronimo-plugin</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -113,22 +118,17 @@
     </dependency>
     <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
-        <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.servicemix.bundles</groupId>
-        <artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
+        <artifactId>org.apache.servicemix.bundles.ant</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
-        <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
+        <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
-        <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
+        <artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>

Copied: geronimo/server/trunk/framework/features/jsr88-deploymentfactory/src/main/plan/plan.xml (from r1096950, geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/jsr88-deploymentfactory/src/main/plan/plan.xml?p2=geronimo/server/trunk/framework/features/jsr88-deploymentfactory/src/main/plan/plan.xml&p1=geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
    (empty)

Added: geronimo/server/trunk/framework/features/jsr88-deploymentfactory/src/main/resources/META-INF/startup-jar
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/jsr88-deploymentfactory/src/main/resources/META-INF/startup-jar?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/jsr88-deploymentfactory/src/main/resources/META-INF/startup-jar (added)
+++ geronimo/server/trunk/framework/features/jsr88-deploymentfactory/src/main/resources/META-INF/startup-jar Tue Apr 26 23:18:49 2011
@@ -0,0 +1,18 @@
+<!--
+  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 tells the Geronimo bootstrap where to look for its installation
+directory, which is ../ from wherever the jar containing this file lives.
\ No newline at end of file

Copied: geronimo/server/trunk/framework/features/offline-deployer/pom.xml (from r1096950, geronimo/server/trunk/framework/configs/offline-deployer/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/offline-deployer/pom.xml?p2=geronimo/server/trunk/framework/features/offline-deployer/pom.xml&p1=geronimo/server/trunk/framework/configs/offline-deployer/pom.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/offline-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/features/offline-deployer/pom.xml Tue Apr 26 23:18:49 2011
@@ -23,49 +23,26 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.framework.feature</groupId>
+        <artifactId>feature</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>offline-deployer</artifactId>
-    <name>Geronimo Framework, Configs :: Offline Deployer</name>
-    <packaging>car</packaging>
+    <name>Geronimo Framework, Feature :: Offline Deployer</name>
+    <packaging>feature</packaging>
 
     <description>Offline deployer</description>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
+            <groupId>org.apache.geronimo.framework.config</groupId>
             <artifactId>online-deployer</artifactId>
             <version>${project.version}</version>
             <type>car</type>
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <configuration>
-                    <category>Deployment</category>
-                    <instance>
-                        <plugin-artifact>
-                            <config-xml-content load="false" />
-                        </plugin-artifact>
-                    </instance>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 
 </project>

Added: geronimo/server/trunk/framework/features/offline-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/offline-deployer/src/main/history/dependencies.xml?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/offline-deployer/src/main/history/dependencies.xml (added)
+++ geronimo/server/trunk/framework/features/offline-deployer/src/main/history/dependencies.xml Tue Apr 26 23:18:49 2011
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+    <module-id>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>offline-deployer</artifactId>
+        <version>3.0-SNAPSHOT</version>
+        <type>car</type>
+    </module-id>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>online-deployer</artifactId>
+        <type>car</type>
+    </dependency>
+</plugin-artifact>

Propchange: geronimo/server/trunk/framework/features/offline-deployer/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/offline-deployer/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/offline-deployer/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/framework/features/offline-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/offline-deployer/src/main/plan/plan.xml?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/offline-deployer/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/framework/features/offline-deployer/src/main/plan/plan.xml Tue Apr 26 23:18:49 2011
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <gbean name="AttributeManager" class="org.apache.geronimo.system.configuration.LocalAttributeManager">
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+        <attribute name="readOnly">true</attribute>
+        <attribute name="configFile">var/config/offline-deployer-config.xml</attribute>
+        <attribute name="substitutionsFile">var/config/config-substitutions.properties</attribute>
+        <attribute name="substitutionPrefix">org.apache.geronimo.config.substitution.</attribute>
+    </gbean>
+
+    <!-- System Properties -->
+    <gbean name="OfflineDeployerProperties" class="org.apache.geronimo.system.properties.SystemProperties">
+        <attribute name="systemProperties">
+             org.apache.geronimo.kernel.util.JarUtils.jarUrlRewrite=true
+        </attribute>
+         <attribute name="sunSystemProperties">
+             java.security.Provider=SUN
+         </attribute>
+         <attribute name="ibmSystemProperties">
+             java.security.Provider=IBMCertPath
+         </attribute>
+         <attribute name="apacheSystemProperties">
+             java.naming.factory.url.pkgs=org.apache.harmony.jndi.provider
+         </attribute>
+    </gbean>
+</module>

Propchange: geronimo/server/trunk/framework/features/offline-deployer/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/offline-deployer/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/offline-deployer/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: geronimo/server/trunk/framework/features/online-deployer/pom.xml (from r1096950, geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/online-deployer/pom.xml?p2=geronimo/server/trunk/framework/features/online-deployer/pom.xml&p1=geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml (original)
+++ geronimo/server/trunk/framework/features/online-deployer/pom.xml Tue Apr 26 23:18:49 2011
@@ -23,24 +23,18 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.framework.feature</groupId>
+        <artifactId>feature</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>jsr88-cli</artifactId>
-    <name>Geronimo Framework, Configs :: JSR-88 CLI</name>
-    <packaging>car</packaging>
+    <artifactId>online-deployer</artifactId>
+    <name>Geronimo Framework, Feature :: Online Deployer</name>
+    <packaging>feature</packaging>
 
-    <dependencies>
+    <description>Geronimo Online Deployer</description>
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <type>car</type>
-            <scope>provided</scope>
-            <version>${project.version}</version>
-        </dependency>
+    <dependencies>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
@@ -61,78 +55,52 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-deploy-jsr88</artifactId>
-            <version>${project.version}</version>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-cli</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-deploy-tool</artifactId>
-            <version>${project.version}</version>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
         </dependency>
 
+        <!-- used by plugin installer -->
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-deploy-config</artifactId>
+            <artifactId>geronimo-plugin</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
-        </dependency>
-
-        <!--<dependency>-->
-            <!--<groupId>commons-cli</groupId>-->
-            <!--<artifactId>commons-cli</artifactId>-->
-        <!--</dependency>-->
-
-        <!-- used by plugin installer -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jaxb_2.2_spec</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>jaxb-impl</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-stax-api_1.2_spec</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>woodstox</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-activation_1.1_spec</artifactId>
         </dependency>
-
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <configuration>
-                    <category>Deployment</category>
-                    <instance>
-                        <plugin-artifact>
-                            <config-xml-content server="jsr88" />
-                        </plugin-artifact>
-                    </instance>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
 
+</project>



Mime
View raw message