geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1096951 [5/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
Copied: geronimo/server/trunk/framework/features/online-deployer/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/online-deployer/src/main/history/dependencies.xml?p2=geronimo/server/trunk/framework/features/online-deployer/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/online-deployer/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>online-deployer</artifactId>
         <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
@@ -58,16 +58,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-deploy-config</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-kernel</artifactId>
         <type>jar</type>
     </dependency>
@@ -78,7 +68,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-service-builder</artifactId>
+        <artifactId>geronimo-plugin</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -93,11 +83,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jaxb_2.2_spec</artifactId>
         <type>jar</type>
     </dependency>
@@ -113,22 +98,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/online-deployer/src/main/plan/plan.xml (from r1096950, geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/online-deployer/src/main/plan/plan.xml?p2=geronimo/server/trunk/framework/features/online-deployer/src/main/plan/plan.xml&p1=geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
    (empty)

Added: geronimo/server/trunk/framework/features/online-deployer/src/main/resources/META-INF/startup-jar
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/online-deployer/src/main/resources/META-INF/startup-jar?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/online-deployer/src/main/resources/META-INF/startup-jar (added)
+++ geronimo/server/trunk/framework/features/online-deployer/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/plugin/pom.xml (from r1096950, geronimo/server/trunk/framework/configs/plugin/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/plugin/pom.xml?p2=geronimo/server/trunk/framework/features/plugin/pom.xml&p1=geronimo/server/trunk/framework/configs/plugin/pom.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/features/plugin/pom.xml Tue Apr 26 23:18:49 2011
@@ -23,31 +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>plugin</artifactId>
-    <name>Geronimo Framework, Configs :: Plugin Management</name>
-    <packaging>car</packaging>
+    <name>Geronimo Framework, Feature :: Plugin Management</name>
+    <!-- kar for schema file -->
+    <packaging>kar</packaging>
 
     <description>Plugin management services including the installer.</description>
 
     <dependencies>
+
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
+            <groupId>org.apache.geronimo.framework.feature</groupId>
             <artifactId>rmi-naming</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
 
         <dependency>
@@ -109,30 +104,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <configuration>
-                    <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployerBootstrap}</deploymentConfig>
-                    </deploymentConfigs>
-                    <deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
-                    <category>Geronimo Core</category>
-                    <instance>
-                        <plugin-artifact>
-                            <config-xml-content>
-                                <gbean name="DownloadedPluginRepos">
-                                    <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-3.0.txt</attribute>
-                                </gbean>
-                            </config-xml-content>
-                            <!--<artifact-alias key="org.apache.geronimo.framework/jsr88-cli//car">org.apache.geronimo.framework/plugin/${project.version}/car</artifact-alias>-->
-                            <!--<artifact-alias key="org.apache.geronimo.framework/jsr88-cli/${project.version}/car">org.apache.geronimo.framework/plugin/${project.version}/car</artifact-alias>-->
-                            <copy-file dest-dir="schema">schema/xsd/</copy-file>
-                            <copy-file dest-dir="var/config" relative-to="server">plugin-repositories.properties</copy-file>
-                        </plugin-artifact>
-                    </instance>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 

Copied: geronimo/server/trunk/framework/features/plugin/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/plugin/src/main/history/dependencies.xml?p2=geronimo/server/trunk/framework/features/plugin/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/plugin/src/main/history/dependencies.xml Tue Apr 26 23:18:49 2011
@@ -2,23 +2,13 @@
 <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>j2ee-security</artifactId>
+        <artifactId>plugin</artifactId>
         <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.components</groupId>
-        <artifactId>geronimo-jaspi</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-jmx-remoting</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-security</artifactId>
+        <artifactId>geronimo-plugin</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -28,17 +18,12 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jacc_1.4_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jaspic_1.0_spec</artifactId>
+        <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.karaf.jaas</groupId>
-        <artifactId>org.apache.karaf.jaas.boot</artifactId>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.ant</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Added: geronimo/server/trunk/framework/features/plugin/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/plugin/src/main/plan/plan.xml?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/plugin/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/framework/features/plugin/src/main/plan/plan.xml Tue Apr 26 23:18:49 2011
@@ -0,0 +1,127 @@
+<?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}">
+
+    <!-- Configuration Installer -->
+    <gbean name="PluginInstaller" class="org.apache.geronimo.system.plugin.PluginInstallerGBean">
+        <!-- TODO no artifactManager specified-->
+        <attribute name="installedPluginsList">var/config/installed-plugins.properties</attribute>
+        <reference name="Repository">
+            <name>Repository</name>
+        </reference>
+        <reference name="ConfigStore">
+            <name>Local</name>
+        </reference>
+        <reference name="ConfigManager">
+            <name>ConfigurationManager</name>
+        </reference>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+        <reference name="ThreadPool">
+            <name>DefaultThreadPool</name>
+        </reference>
+        <reference name="PluginRepositoryList">
+            <name>DownloadedPluginRepos</name>
+        </reference>
+        <references name="ServerInstances">
+            <pattern>
+                <name>DefaultServer</name>
+            </pattern>
+            <pattern>
+                <name>Offline</name>
+            </pattern>
+            <pattern>
+                <name>Client</name>
+            </pattern>
+            <pattern>
+                <name>Jsr88</name>
+            </pattern>
+        </references>
+        <references name="PersistentConfigurationLists">
+            <pattern>
+                <name>AttributeManager</name>
+            </pattern>
+        </references>
+    </gbean>
+
+    <gbean name="DefaultServer" class="org.apache.geronimo.system.plugin.ReferenceServerInstanceData">
+        <attribute name="name">default</attribute>
+        <reference name="AttributeStore">
+            <name>AttributeManager</name>
+        </reference>
+        <reference name="ArtifactResolver">
+            <name>ArtifactResolver</name>
+        </reference>
+    </gbean>
+
+    <gbean name="Offline" class="org.apache.geronimo.system.plugin.ServerInstanceData">
+        <attribute name="name">offline</attribute>
+        <attribute name="configFile">var/config/offline-deployer-config.xml</attribute>
+        <attribute name="configSubstitutionsFile">var/config/config-substitutions.properties</attribute>
+        <attribute name="configSubstitutionsPrefix">org.apache.geronimo.config.substitution.</attribute>
+        <attribute name="artifactAliasesFile">var/config/artifact_aliases.properties</attribute>
+    </gbean>
+
+    <gbean name="Client" class="org.apache.geronimo.system.plugin.ServerInstanceData">
+        <attribute name="name">client</attribute>
+        <attribute name="attributeManagerFrom">default</attribute>
+        <attribute name="artifactAliasesFile">var/config/client_artifact_aliases.properties</attribute>
+        <dependency><name>DefaultServer</name></dependency>
+    </gbean>
+
+    <gbean name="Jsr88" class="org.apache.geronimo.system.plugin.ServerInstanceData">
+        <attribute name="name">jsr88</attribute>
+        <attribute name="configFile">var/config/jsr88-configurer-config.xml</attribute>
+        <attribute name="configSubstitutionsFile">var/config/config-substitutions.properties</attribute>
+        <attribute name="configSubstitutionsPrefix">org.apache.geronimo.config.substitution.</attribute>
+        <attribute name="artifactAliasesFile">var/config/artifact_aliases.properties</attribute>
+    </gbean>
+
+    <gbean name="DownloadedPluginRepos" class="org.apache.geronimo.system.plugin.PluginRepositoryDownloader">
+        <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.2.txt</attribute>
+        <attribute name="userRepositoryList">var/config/plugin-repositories.properties</attribute>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
+    <gbean name="Archiver" class="org.apache.geronimo.system.plugin.ArchiverGBean">
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
+    <gbean name="NewServerInstance" class="org.apache.geronimo.system.plugin.NewServerInstanceGBean">
+        <attribute name="defaultPlugins">org.apache.geronimo.framework.plugingroups/framework/${version}/car</attribute>
+        <reference name="PluginInstallerGBean">
+            <name>PluginInstaller</name>
+        </reference>
+        <reference name="ConfigManager">
+            <name>ConfigurationManager</name>
+        </reference>
+        <reference name="PersistentConfigurationList">
+            <type>AttributeStore</type>
+            <name>AttributeManager</name>
+        </reference>
+    </gbean>
+
+</module>

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

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

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

Added: geronimo/server/trunk/framework/features/plugin/src/main/resources/plugin-repositories.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/plugin/src/main/resources/plugin-repositories.properties?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/plugin/src/main/resources/plugin-repositories.properties (added)
+++ geronimo/server/trunk/framework/features/plugin/src/main/resources/plugin-repositories.properties 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.
+
+#List of known plugin repositories. Fomat:  <url>=<username>=<password>
+~/.m2/repository
+http\://localhost\:8080/plugin/maven-repo/=system=manager
\ No newline at end of file

Propchange: geronimo/server/trunk/framework/features/plugin/src/main/resources/plugin-repositories.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/plugin/src/main/resources/plugin-repositories.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/plugin/src/main/resources/plugin-repositories.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/framework/features/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/pom.xml?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/pom.xml (added)
+++ geronimo/server/trunk/framework/features/pom.xml Tue Apr 26 23:18:49 2011
@@ -0,0 +1,72 @@
+<?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$ -->
+
+<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>framework</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.framework.feature</groupId>
+    <artifactId>feature</artifactId>
+    <name>Geronimo Framework, Features</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <!--<module>geronimo-gbean-deployer</module>-->
+        <!--<module>geronimo-gbean-deployer-bootstrap</module>-->
+        <!--<module>client-system</module>-->
+        <!--<module>j2ee-security</module>-->
+        <module>j2ee-system</module>
+        <!--<module>jsr88-cli</module>-->
+        <!--<module>jsr88-deploymentfactory</module>-->
+        <!--<module>offline-deployer</module>-->
+        <!--<module>online-deployer</module>-->
+        <!--<module>rmi-naming</module>-->
+        <!--<module>plugin</module>-->
+        <!--<module>server-security-config</module>-->
+        <!--<module>shutdown</module>-->
+        <!--<module>jmx-security</module>-->
+        <!--<module>karaf-framework</module>-->
+    </modules>
+
+    <build>
+        <plugins>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>all-subprojects</id>
+            <!-- use for things like versions:set and perhaps release when build has to run on all projects -->
+            <modules>
+                <module>geronimo-gbean-deployer/src/it/j2ee-system-it1</module>
+                <module>geronimo-gbean-deployer/src/it/j2ee-system-it2</module>
+                <module>geronimo-gbean-deployer/src/it/metadatageneration-it3</module>
+                <module>geronimo-gbean-deployer/src/it/metadatageneration-it4</module>
+            </modules>
+        </profile>
+    </profiles>
+
+</project>

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

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

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

Copied: geronimo/server/trunk/framework/features/rmi-naming/pom.xml (from r1096950, geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/rmi-naming/pom.xml?p2=geronimo/server/trunk/framework/features/rmi-naming/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/rmi-naming/pom.xml Tue Apr 26 23:18:49 2011
@@ -23,116 +23,90 @@
     <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>rmi-naming</artifactId>
+    <name>Geronimo Framework, Feature :: RMI Naming</name>
+    <packaging>feature</packaging>
+
+    <description>Fundamental geronimo services including the plugin installer.</description>
 
     <dependencies>
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <type>car</type>
-            <scope>provided</scope>
+            <groupId>org.apache.geronimo.framework.feature</groupId>
+            <artifactId>j2ee-system</artifactId>
             <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-common</artifactId>
+            <artifactId>geronimo-blueprint</artifactId>
             <version>${project.version}</version>
         </dependency>
 
+        <!-- thread pool has management interface -->
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-system</artifactId>
+            <artifactId>geronimo-management</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-crypto</artifactId>
+            <artifactId>geronimo-core</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <artifactId>geronimo-interceptor</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-cli</artifactId>
+            <artifactId>geronimo-naming</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-deploy-tool</artifactId>
+            <artifactId>geronimo-crypto</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-deploy-config</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-naming</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>org.apache.aries.blueprint</artifactId>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>commons-cli</groupId>-->
-            <!--<artifactId>commons-cli</artifactId>-->
-        <!--</dependency>-->
-
-        <!-- used by plugin installer -->
+        <!-- aries jmx integration -->
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.2_spec</artifactId>
+            <groupId>org.apache.aries.jmx</groupId>
+            <artifactId>org.apache.aries.jmx</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>
+            <groupId>org.apache.aries.jmx</groupId>
+            <artifactId>org.apache.aries.jmx.blueprint</artifactId>
         </dependency>
+
+        <!-- aries jndi integration -->
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
+            <groupId>org.apache.aries.jndi</groupId>
+            <artifactId>org.apache.aries.jndi</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>
-

Copied: geronimo/server/trunk/framework/features/rmi-naming/src/main/history/dependencies.xml (from r1096950, geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/rmi-naming/src/main/history/dependencies.xml?p2=geronimo/server/trunk/framework/features/rmi-naming/src/main/history/dependencies.xml&p1=geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/features/rmi-naming/src/main/history/dependencies.xml Tue Apr 26 23:18:49 2011
@@ -32,11 +32,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.aries.proxy</groupId>
-        <artifactId>org.apache.aries.proxy.api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-blueprint</artifactId>
         <type>jar</type>

Added: geronimo/server/trunk/framework/features/rmi-naming/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/rmi-naming/src/main/plan/plan.xml?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/rmi-naming/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/framework/features/rmi-naming/src/main/plan/plan.xml Tue Apr 26 23:18:49 2011
@@ -0,0 +1,64 @@
+<?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="WaitForBlueprint" class="org.apache.geronimo.blueprint.WaitForBlueprintGBean"/>
+
+    <gbean name="RMIRegistry" class="org.apache.geronimo.kernel.rmi.RMIRegistryService">
+        <attribute name="port">${planNamingPort}</attribute>
+        <attribute name="host">${ServerHostname}</attribute>
+        <attribute name="classLoaderSpi">org.apache.geronimo.kernel.rmi.RMIClassLoaderSpiImpl</attribute>
+    </gbean>
+
+    <gbean name="JavaGlobalContext" class="org.apache.geronimo.gjndi.FederatedContextGBean">
+        <attribute name="nameInNamespace">java:</attribute>
+    </gbean>
+
+    <gbean name="JavaContext" class="org.apache.geronimo.gjndi.WritableFederatedContextMember">
+        <attribute name="nameInNamespace">java:</attribute>
+        <reference name="Federation">
+            <name>JavaGlobalContext</name>
+        </reference>
+    </gbean>
+
+    <gbean name="MBeanServerReference" class="org.apache.geronimo.system.jmx.RealMBeanServerReference">
+        <attribute name="usePlatformMBeanServer">true</attribute>
+    </gbean>
+
+
+    <!-- MBean server service -->
+    <gbean name="MBeanServerKernelBridge" class="org.apache.geronimo.system.jmx.MBeanServerKernelBridge">
+        <reference name="MBeanServerReference">
+            <name>MBeanServerReference</name>
+        </reference>
+    </gbean>
+
+    <gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
+        <attribute name="keepAliveTime">30000</attribute>
+        <attribute name="minPoolSize">200</attribute>
+        <attribute name="maxPoolSize">500</attribute>
+        <attribute name="poolName">DefaultThreadPool</attribute>
+    </gbean>
+
+    <gbean name="EncryptionManagerWrapper" class="org.apache.geronimo.system.util.EncryptionManagerWrapperGBean">
+    </gbean>
+
+</module>

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

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

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

Added: geronimo/server/trunk/framework/features/rmi-naming/src/main/resources/OSGI-INF/blueprint/naming-providers.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/rmi-naming/src/main/resources/OSGI-INF/blueprint/naming-providers.xml?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/rmi-naming/src/main/resources/OSGI-INF/blueprint/naming-providers.xml (added)
+++ geronimo/server/trunk/framework/features/rmi-naming/src/main/resources/OSGI-INF/blueprint/naming-providers.xml Tue Apr 26 23:18:49 2011
@@ -0,0 +1,80 @@
+<?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.
+-->
+<!--
+
+  blueprint configuration for jndi providers
+  -->
+
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+
+    <service id="javaContextProvider"
+             interface="javax.naming.spi.ObjectFactory">
+        <service-properties>
+            <entry key="osgi.jndi.url.scheme" value="java"/>
+        </service-properties>
+        <bean class="org.apache.geronimo.naming.java.javaURLContextFactory"/>
+    </service>
+
+    <service id="gerContextProvider"
+             interface="javax.naming.spi.ObjectFactory">
+        <service-properties>
+            <entry key="osgi.jndi.url.scheme" value="ger"/>
+        </service-properties>
+        <bean class="org.apache.geronimo.naming.WritableURLContextFactory">
+            <argument>
+                <value>ger</value>
+            </argument>
+        </bean>
+    </service>
+
+    <service id="jcaContextProvider"
+             interface="javax.naming.spi.ObjectFactory">
+        <service-properties>
+            <entry key="osgi.jndi.url.scheme" value="jca"/>
+        </service-properties>
+        <bean class="org.apache.geronimo.naming.WritableURLContextFactory">
+            <argument>
+                <value>jca</value>
+            </argument>
+        </bean>
+    </service>
+
+<!--
+    <service id="XBeanInitialContextFactory">
+        <interfaces>
+            <value>javax.naming.spi.InitialContextFactory</value>
+            <value>org.apache.xbean.naming.global.GlobalContextManager</value>
+        </interfaces>
+        <bean class="org.apache.xbean.naming.global.GlobalContextManager"/>
+    </service>
+-->
+
+    <service id="rmiContextProvider"
+             interface="javax.naming.spi.ObjectFactory">
+        <service-properties>
+            <entry key="osgi.jndi.url.scheme" value="rmi"/>
+        </service-properties>
+        <bean class="org.apache.geronimo.naming.rmi.rmiURLContextFactory">          
+          <argument ref="blueprintBundle"/>
+          <argument value="com.sun.jndi.url.rmi.rmiURLContextFactory"/>
+        </bean>
+    </service>
+
+</blueprint>

Propchange: geronimo/server/trunk/framework/features/rmi-naming/src/main/resources/OSGI-INF/blueprint/naming-providers.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/rmi-naming/src/main/resources/OSGI-INF/blueprint/naming-providers.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/rmi-naming/src/main/resources/OSGI-INF/blueprint/naming-providers.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: geronimo/server/trunk/framework/features/server-security-config/pom.xml (from r1096950, geronimo/server/trunk/framework/configs/server-security-config/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/server-security-config/pom.xml?p2=geronimo/server/trunk/framework/features/server-security-config/pom.xml&p1=geronimo/server/trunk/framework/configs/server-security-config/pom.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/server-security-config/pom.xml (original)
+++ geronimo/server/trunk/framework/features/server-security-config/pom.xml Tue Apr 26 23:18:49 2011
@@ -23,32 +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>server-security-config</artifactId>
-    <name>Geronimo Framework, Configs :: Server Security Configuration</name>
-    <packaging>car</packaging>
+    <name>Geronimo Framework, Feature :: Server Security Configuration</name>
+    <!-- security property files -->
+    <packaging>kar</packaging>
 
     <description>Sample security configuration for a demo geronimo server. Not suitable for production use.</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>
-
         <!-- parent -->
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
+            <groupId>org.apache.geronimo.framework.feature</groupId>
             <artifactId>j2ee-security</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
@@ -57,6 +51,7 @@
         </dependency>
     </dependencies>
 
+<!--
     <build>
         <plugins>
             <plugin>
@@ -76,5 +71,6 @@
             </plugin>
         </plugins>
     </build>
+-->
 
 </project>

Added: geronimo/server/trunk/framework/features/server-security-config/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/server-security-config/src/main/history/dependencies.xml?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/server-security-config/src/main/history/dependencies.xml (added)
+++ geronimo/server/trunk/framework/features/server-security-config/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>server-security-config</artifactId>
+        <version>3.0-SNAPSHOT</version>
+        <type>car</type>
+    </module-id>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>j2ee-security</artifactId>
+        <type>car</type>
+    </dependency>
+</plugin-artifact>

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

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

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

Added: geronimo/server/trunk/framework/features/server-security-config/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/server-security-config/src/main/plan/plan.xml?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/server-security-config/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/framework/features/server-security-config/src/main/plan/plan.xml Tue Apr 26 23:18:49 2011
@@ -0,0 +1,63 @@
+<?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="CredentialStore" class="org.apache.geronimo.security.credentialstore.SimpleCredentialStoreImpl"/>
+
+
+    <!-- Default security realm using properties files -->
+    <gbean name="properties-login"
+        class="org.apache.geronimo.security.jaas.LoginModuleGBean">
+        <attribute name="loginModuleClass">org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</attribute>
+        <attribute name="options">
+            usersURI=var/security/users.properties
+            groupsURI=var/security/groups.properties
+        </attribute>
+        <attribute name="loginDomainName">geronimo-admin</attribute>
+    </gbean>
+
+    <gbean name="geronimo-admin"
+        class="org.apache.geronimo.security.realm.GenericSecurityRealm">
+        <attribute name="realmName">geronimo-admin</attribute>
+        <attribute name="global">true</attribute>
+        <reference name="LoginModuleConfiguration">
+            <name>properties-login</name>
+        </reference>
+        <reference name="ServerInfo"><name>ServerInfo</name></reference>
+    </gbean>
+
+    <gbean name="properties-login" class="org.apache.geronimo.security.jaas.JaasLoginModuleUse">
+         <attribute name="controlFlag">REQUIRED</attribute>
+         <reference name="LoginModule">
+             <name>properties-login</name>
+         </reference>
+     </gbean>
+
+    <gbean name="geronimo-default" class="org.apache.geronimo.security.keystore.FileKeystoreInstance">
+        <attribute name="keystoreName">geronimo-default</attribute>
+        <attribute name="keystorePath">var/security/keystores/geronimo-default</attribute>
+        <attribute name="keystorePassword">secret</attribute>
+        <attribute name="keystoreType">JKS</attribute>
+        <attribute name="keyPasswords">geronimo=secret</attribute>
+        <reference name="ServerInfo"><name>ServerInfo</name></reference>
+    </gbean>
+
+</module>

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

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

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

Added: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/demo_groups.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/demo_groups.properties?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/demo_groups.properties (added)
+++ geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/demo_groups.properties Tue Apr 26 23:18:49 2011
@@ -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.
+##
+
+manager=izumi
+it=alan
+pet=george,gracie,metro
+dog=george,gracie
+cat=metro
\ No newline at end of file

Propchange: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/demo_groups.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/demo_groups.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/demo_groups.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/demo_users.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/demo_users.properties?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/demo_users.properties (added)
+++ geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/demo_users.properties Tue Apr 26 23:18:49 2011
@@ -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.
+##
+
+izumi=violin
+alan=starcraft
+george=bone
+gracie=biscuit
+metro=mouse
\ No newline at end of file

Propchange: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/demo_users.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/demo_users.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/demo_users.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/groups.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/groups.properties?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/groups.properties (added)
+++ geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/groups.properties 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.
+#=====================================================================
+admin=system
+monitor=monitor

Propchange: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/groups.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/groups.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/groups.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/users.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/users.properties?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/users.properties (added)
+++ geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/users.properties 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.
+#=====================================================================
+system=manager
+monitor=password

Propchange: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/users.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/users.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/users.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/server/trunk/framework/features/shutdown/pom.xml (from r1096950, geronimo/server/trunk/framework/configs/shutdown/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/shutdown/pom.xml?p2=geronimo/server/trunk/framework/features/shutdown/pom.xml&p1=geronimo/server/trunk/framework/configs/shutdown/pom.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/shutdown/pom.xml (original)
+++ geronimo/server/trunk/framework/features/shutdown/pom.xml Tue Apr 26 23:18:49 2011
@@ -23,23 +23,16 @@
     <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>shutdown</artifactId>
-    <name>Geronimo Framework, Configs :: Shutdown</name>
-    <packaging>car</packaging>
+    <name>Geronimo Framework, Feature :: Shutdown</name>
+    <packaging>feature</packaging>
 
     <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>
@@ -71,6 +64,7 @@
         </dependency>
     </dependencies>
 
+<!--
     <build>
         <plugins>
             <plugin>
@@ -88,9 +82,9 @@
                         </manifest>
                     </archive>
 
-                    <!--
+                    &lt;!&ndash;
                     NOTE: This list of dependencies is non-transitive.
-                    -->
+                    &ndash;&gt;
                     <classpath>
                         <element>
                             <groupId>org.apache.geronimo.framework</groupId>
@@ -122,5 +116,6 @@
             </plugin>
         </plugins>
     </build>
+-->
 
 </project>

Copied: geronimo/server/trunk/framework/features/shutdown/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/shutdown/src/main/history/dependencies.xml?p2=geronimo/server/trunk/framework/features/shutdown/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/shutdown/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>shutdown</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>

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

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

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

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

Added: geronimo/server/trunk/framework/features/shutdown/src/main/resources/META-INF/startup-jar
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/shutdown/src/main/resources/META-INF/startup-jar?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/shutdown/src/main/resources/META-INF/startup-jar (added)
+++ geronimo/server/trunk/framework/features/shutdown/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

Added: geronimo/server/trunk/framework/features/shutdown/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/shutdown/src/main/resources/log4j.properties?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/shutdown/src/main/resources/log4j.properties (added)
+++ geronimo/server/trunk/framework/features/shutdown/src/main/resources/log4j.properties Tue Apr 26 23:18:49 2011
@@ -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.
+##
+## $Rev$ $Date$
+##
+
+log4j.rootLogger=WARN, CONSOLE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=WARN
+log4j.appender.CONSOLE.Target=System.out
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} %-5p [%c{1}] %m%n
+

Propchange: geronimo/server/trunk/framework/features/shutdown/src/main/resources/log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/shutdown/src/main/resources/log4j.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/shutdown/src/main/resources/log4j.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml Tue Apr 26 23:18:49 2011
@@ -51,6 +51,21 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                            org.apache.geronimo.main.*;resolution:=optional,
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
 

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/eba/EBADeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/eba/EBADeploymentManager.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/eba/EBADeploymentManager.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/eba/EBADeploymentManager.java Tue Apr 26 23:18:49 2011
@@ -33,7 +33,7 @@ public interface EBADeploymentManager {
     
     public String getEBAContentBundleSymbolicName(AbstractName applicationGBeanName, long bundleId) throws GBeanNotFoundException, NoSuchOperationException, Exception;
     
-    public void updateEBAContent(AbstractName applicationGBeanName, long bundleId, File bundleFile) throws GBeanNotFoundException, NoSuchOperationException, Exception;
+    public void updateEBAContent(AbstractName applicationGBeanName, long bundleId, File newfile) throws GBeanNotFoundException, NoSuchOperationException, Exception;
     
     public AbstractName getApplicationGBeanName(Artifact configurationId);
     

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryWithKernel.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryWithKernel.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryWithKernel.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryWithKernel.java Tue Apr 26 23:18:49 2011
@@ -42,6 +42,11 @@ public class DeploymentFactoryWithKernel
 
     private final Kernel kernel;
 
+    public DeploymentFactoryWithKernel() {
+        this.kernel = null;
+        DeploymentFactoryManager.getInstance().registerDeploymentFactory(this);
+    }
+
     public DeploymentFactoryWithKernel(@ParamSpecial(type = SpecialAttributeType.kernel) Kernel kernel) {
         if (null == kernel) {
             throw new IllegalArgumentException("kernel is required");

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/ExtendedDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/ExtendedDeploymentManager.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/ExtendedDeploymentManager.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/ExtendedDeploymentManager.java Tue Apr 26 23:18:49 2011
@@ -301,8 +301,8 @@ public abstract class ExtendedDeployment
     /**
      * Only support local bundle update
      */
-    public void updateEBAContent(AbstractName applicationGBeanName, long bundleId, File bundleFile) throws GBeanNotFoundException, NoSuchOperationException, Exception{
-        kernel.invoke(applicationGBeanName, "updateApplicationContent", new Object[]{bundleId, bundleFile}, new String[]{long.class.getName(), bundleFile.getClass().getName()});
+    public void updateEBAContent(AbstractName applicationGBeanName, long bundleId, File newfile) throws GBeanNotFoundException, NoSuchOperationException, Exception{
+        kernel.invoke(applicationGBeanName, "updateApplicationContent", new Object[]{bundleId, newfile.toURI()}, new String[]{long.class.getName(), newfile.toURI().getClass().getName()});
     }
     
     public AbstractName getApplicationGBeanName(Artifact configurationId) {

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-tool/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-tool/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-tool/pom.xml Tue Apr 26 23:18:49 2011
@@ -38,25 +38,43 @@
             <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         </dependency>
 
-        <!-- g-deployment comes from this -->
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
+            <artifactId>geronimo-cli</artifactId>
             <version>${project.version}</version>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-cli</artifactId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
             <version>${project.version}</version>
         </dependency>
-        
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <artifactId>geronimo-kernel</artifactId>
             <version>${project.version}</version>
         </dependency>
-        
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <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-crypto</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.console</artifactId>

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StreamConsoleReader.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StreamConsoleReader.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StreamConsoleReader.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StreamConsoleReader.java Tue Apr 26 23:18:49 2011
@@ -99,7 +99,6 @@ public class StreamConsoleReader impleme
     public void println(String s) throws IOException {
         if (jlineConsoleEnabled) {
             jlineConsoleReader.println(s);
-
         } else {
             console.println(s);
             console.println();
@@ -148,11 +147,7 @@ public class StreamConsoleReader impleme
     @Override
     public void flushConsole() throws IOException {
         if (jlineConsoleEnabled) {
-<<<<<<< HEAD
-             jlineConsoleReader.flush();
-=======
             jlineConsoleReader.flush();
->>>>>>> d253307... ServiceConfigBuilder as a service.  Remove use of xmlbeans from ServiceConfigBuilder
         } else {
             console.flush();
         }

Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml Tue Apr 26 23:18:49 2011
@@ -34,6 +34,11 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.annotations</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${project.version}</version>
@@ -44,15 +49,15 @@
             <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.2_spec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.2_spec</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-stax-api_1.2_spec</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-jaxb_2.2_spec</artifactId>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>

Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java Tue Apr 26 23:18:49 2011
@@ -29,19 +29,22 @@ import org.apache.geronimo.common.Deploy
  * @version $Rev:$ $Date:$
  */
 public interface Deployer {
-    List deploy(boolean inPlace, File moduleFile, File planFile) throws DeploymentException;
+    List<String> deploy(boolean inPlace, File moduleFile, File planFile) throws DeploymentException;
 
-    List deploy(boolean inPlace, File moduleFile, File planFile, String targetConfigStore) throws DeploymentException;
+    List<String> deploy(boolean inPlace, File moduleFile, File planFile, String targetConfigStore) throws DeploymentException;
 
     String getRemoteDeployUploadURL();
 
-    List deploy(boolean inPlace,
+    List<String> deploy(boolean inPlace,
                 File moduleFile,
                 File planFile,
                 File targetFile,
                 boolean install,
                 String mainClass,
-                String mainGBean, String mainMethod, String manifestConfigurations, String classPath,
+                String mainGBean,
+                String mainMethod,
+                String manifestConfigurations,
+                String classPath,
                 String endorsedDirs,
                 String extensionDirs,
                 String targetConfigurationStore) throws DeploymentException;

Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeployerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeployerImpl.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeployerImpl.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeployerImpl.java Tue Apr 26 23:18:49 2011
@@ -80,7 +80,7 @@ public class DeployerImpl implements Dep
     @Reference(cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, referenceInterface = ConfigurationBuilder.class)
     private final Collection<ConfigurationBuilder> configurationBuilders = new ArrayList<ConfigurationBuilder>();
 
-    @Reference(cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, referenceInterface = ConfigurationStore.class)
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_MULTIPLE, referenceInterface = ConfigurationStore.class)
     private final Collection<ConfigurationStore> configurationStores = new ArrayList<ConfigurationStore>();
 
     @Reference(cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, referenceInterface = DeploymentWatcher.class)
@@ -167,12 +167,12 @@ public class DeployerImpl implements Dep
     }
 
     @Override
-    public List deploy(boolean inPlace, File moduleFile, File planFile) throws DeploymentException {
+    public List<String> deploy(boolean inPlace, File moduleFile, File planFile) throws DeploymentException {
         return deploy(inPlace, moduleFile, planFile, null);
     }
 
     @Override
-    public List deploy(boolean inPlace, File moduleFile, File planFile, String targetConfigStore) throws DeploymentException {
+    public List<String> deploy(boolean inPlace, File moduleFile, File planFile, String targetConfigStore) throws DeploymentException {
         File originalModuleFile = moduleFile;
         File tmpDir = null;
         if (moduleFile != null && !moduleFile.isDirectory()) {
@@ -272,7 +272,7 @@ public class DeployerImpl implements Dep
     }
 
     @Override
-    public List deploy(boolean inPlace,
+    public List<String> deploy(boolean inPlace,
                        File moduleFile,
                        File planFile,
                        File targetFile,
@@ -399,7 +399,7 @@ public class DeployerImpl implements Dep
         return configID;
     }
 
-    private List install(File targetFile,
+    private List<String> install(File targetFile,
             boolean install,
             Manifest manifest,
             ConfigurationStore store,
@@ -454,7 +454,7 @@ public class DeployerImpl implements Dep
                 return deployedURIs;
             } else {
                 configsCleanupRequired = true;
-                return Collections.EMPTY_LIST;
+                return Collections.emptyList();
             }
         } catch (DeploymentException e) {
             configsCleanupRequired = true;

Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java Tue Apr 26 23:18:49 2011
@@ -39,8 +39,6 @@ import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import javax.xml.bind.JAXBException;
-import javax.xml.stream.XMLStreamException;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.common.IllegalConfigurationException;
 import org.apache.geronimo.deployment.util.osgi.DummyExportPackagesSelector;
@@ -211,7 +209,7 @@ public class DeploymentContext {
         }
     }
 
-    private void createPluginMetadata() throws IOException, JAXBException, XMLStreamException {
+    private void createPluginMetadata() throws IOException {
         PluginType pluginType = new PluginType();
         pluginType.setName("Temporary Plugin metadata for deployment");
         PluginArtifactType instance = new PluginArtifactType();
@@ -568,11 +566,11 @@ public class DeploymentContext {
             osgiMetaDataBuilder = new OSGiMetaDataBuilder(bundleContext, new DummyExportPackagesSelector());
         }
 
-        try {
-            osgiMetaDataBuilder.build(environment, configuration.getModuleType() == ConfigurationModuleType.CAR);
-        } catch (IllegalConfigurationException e) {
-            throw new DeploymentException(e);
-        }
+//        try {
+//            osgiMetaDataBuilder.build(environment, configuration.getModuleType() == ConfigurationModuleType.CAR);
+//        } catch (IllegalConfigurationException e) {
+//            throw new DeploymentException(e);
+//        }
 
         if (tempBundle != null) {
             try {

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml Tue Apr 26 23:18:49 2011
@@ -84,10 +84,10 @@
             <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.2_spec</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-stax-api_1.2_spec</artifactId>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.testsupport</groupId>

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java Tue Apr 26 23:18:49 2011
@@ -88,11 +88,12 @@ public class GBeanSingleReference extend
     }
 
     public synchronized void stop() {
-        Object proxy = getProxy();
-        if (proxy != null) {
-            getKernel().getProxyManager().destroyProxy(proxy);
-            setProxy(null);
-        }
+        setProxy(null);
+//        Object proxy = getProxy();
+//        if (proxy != null) {
+//            getKernel().getProxyManager().destroyProxy(proxy);
+//            setProxy(null);
+//        }
     }
 
 



Mime
View raw message