geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r574483 [2/3] - in /geronimo/server/trunk: assemblies/ assemblies/geronimo-framework/ assemblies/geronimo-framework/src/main/resources/var/config/ configs/ configs/jetty6/ configs/myfaces-deployer/ configs/myfaces-deployer/src/main/plan/ co...
Date Tue, 11 Sep 2007 06:34:57 GMT
Modified: geronimo/server/trunk/configs/remote-deploy-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/remote-deploy-tomcat/src/main/plan/plan.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/remote-deploy-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/remote-deploy-tomcat/src/main/plan/plan.xml Mon Sep 10 23:34:53 2007
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one or more
+<!--
+    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
@@ -12,43 +13,27 @@
     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$-->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.2" xmlns:cfg="http://geronimo.apache.org/xml/ns/deployment-1.2">
-  <cfg:environment>
-    <cfg:moduleId>
-      <cfg:groupId>org.apache.geronimo.configs</cfg:groupId>
-      <cfg:artifactId>remote-deploy-tomcat</cfg:artifactId>
-      <cfg:version>2.1-SNAPSHOT</cfg:version>
-      <cfg:type>car</cfg:type>
-    </cfg:moduleId>
-    <cfg:dependencies>
-      <cfg:dependency>
-        <cfg:groupId>org.apache.geronimo.configs</cfg:groupId>
-        <cfg:artifactId>jasper</cfg:artifactId>
-        <cfg:type>car</cfg:type>
-      </cfg:dependency>
-      <cfg:dependency>
-        <cfg:groupId>org.apache.geronimo.configs</cfg:groupId>
-        <cfg:artifactId>xmlbeans</cfg:artifactId>
-        <cfg:type>car</cfg:type>
-      </cfg:dependency>
-    </cfg:dependencies>
-    <cfg:hidden-classes/>
-    <cfg:non-overridable-classes/>
-  </cfg:environment>
-  <context-root>/remote-deploy</context-root>
-  <security-realm-name>geronimo-admin</security-realm-name>
-  <sec:security>
-    <!--<sec:default-subject>-->
-    <!--<sec:realm>geronimo-admin</sec:realm>-->
-    <!--<sec:id>anonymous</sec:id>-->
-    <!--</sec:default-subject>-->
-    <sec:role-mappings>
-      <sec:role role-name="admin">
-        <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin"/>
-      </sec:role>
-    </sec:role-mappings>
-  </sec:security>
-  <cfg:gbean name="LocatorToken" class="org.apache.geronimo.deployment.remote.RemoteDeployGBean"/>
-</web-app>
\ No newline at end of file
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-${geronimoSchemaVersion}" xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}" xmlns:cfg="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <context-root>/remote-deploy</context-root>
+    <security-realm-name>geronimo-admin</security-realm-name>
+    <sec:security>
+        <!--<sec:default-subject>-->
+            <!--<sec:realm>geronimo-admin</sec:realm>-->
+            <!--<sec:id>anonymous</sec:id>-->
+        <!--</sec:default-subject>-->
+        <sec:role-mappings>
+            <sec:role role-name="admin">
+                <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"
+                               name="admin"/>
+            </sec:role>
+        </sec:role-mappings>
+    </sec:security>
+    <cfg:gbean name="LocatorToken" class="org.apache.geronimo.deployment.remote.RemoteDeployGBean"/>
+
+</web-app>

Modified: geronimo/server/trunk/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/rmi-naming/pom.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/rmi-naming/pom.xml (original)
+++ geronimo/server/trunk/configs/rmi-naming/pom.xml Mon Sep 10 23:34:53 2007
@@ -21,7 +21,7 @@
 <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.configs</groupId>
         <artifactId>configs</artifactId>
@@ -32,16 +32,18 @@
     <artifactId>rmi-naming</artifactId>
     <name>Geronimo Configs :: RMI Naming</name>
     <packaging>car</packaging>
-    
+
+    <description>Fundamental geronimo services including the plugin installer.</description>
+
     <dependencies>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-system</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jee-specs</artifactId>
@@ -61,19 +63,19 @@
             <artifactId>geronimo-core</artifactId>
             <version>${version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-interceptor</artifactId>
             <version>${version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-naming</artifactId>
             <version>${version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-util</artifactId>
@@ -81,5 +83,36 @@
         </dependency>
 
     </dependencies>
-    
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <category>Geronimo Core</category>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <config-xml-content>
+                        <gbean name="RMIRegistry">
+                            <attribute name="port">${NamingPort + PortOffset}</attribute>
+                        </gbean>
+                        <gbean name="NamingProperties">
+                            <!-- Check whether this really works if host name is 0.0.0.0 -->
+                            <attribute name="namingProviderUrl">rmi://${ServerHostname}:${NamingPort + PortOffset}</attribute>
+                        </gbean>
+                        <gbean name="DownloadedPluginRepos">
+                            <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.1.txt</attribute>
+                            <attribute name="userRepositories">~/.m2/repository</attribute>
+                        </gbean>
+                    </config-xml-content>
+                    <config-substitution key="ServerHostname">localhost</config-substitution>
+                    <config-substitution key="NamingPort">1099</config-substitution>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: geronimo/server/trunk/configs/rmi-naming/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/rmi-naming/src/main/plan/plan.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/rmi-naming/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/rmi-naming/src/main/plan/plan.xml Mon Sep 10 23:34:53 2007
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one or more
+<!--
+    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
@@ -12,120 +13,78 @@
     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-1.2">
-  <environment>
-    <moduleId>
-      <groupId>org.apache.geronimo.configs</groupId>
-      <artifactId>rmi-naming</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-interceptor</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jee-specs</artifactId>
-        <type>car</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-management</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-system</artifactId>
-        <type>car</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-util</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-core</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-naming</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="RMIRegistry" class="org.apache.geronimo.kernel.rmi.RMIRegistryService">
-    <attribute name="port">1099</attribute>
-  </gbean>
-  <gbean name="NamingProperties" class="org.apache.geronimo.system.properties.NamingProperties">
-    <attribute name="namingFactoryInitial">org.apache.xbean.naming.global.GlobalContextManager</attribute>
-    <attribute name="namingFactoryUrlPkgs">org.apache.xbean.naming</attribute>
-    <attribute name="namingProviderUrl">rmi://0.0.0.0:1099</attribute>
-  </gbean>
-  <gbean name="GlobalContext" class="org.apache.geronimo.gjndi.GlobalContextGBean"/>
-  <gbean name="JavaCompContext" class="org.apache.geronimo.gjndi.JavaCompContextGBean"/>
-  <gbean name="JavaContext" class="org.apache.geronimo.gjndi.WritableContextGBean">
-    <attribute name="nameInNamespace">java:</attribute>
-  </gbean>
-  <gbean name="GeronimoContext" class="org.apache.geronimo.gjndi.WritableContextGBean">
-    <attribute name="nameInNamespace">ger:</attribute>
-  </gbean>
-  <gbean name="MBeanServerReference" class="org.apache.geronimo.system.jmx.RealMBeanServerReference"/>
-  <!--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">5000</attribute>
-    <attribute name="poolSize">500</attribute>
-    <attribute name="poolName">DefaultThreadPool</attribute>
-  </gbean>
-  <!--Configuration Installer-->
-  <gbean name="PluginInstaller" class="org.apache.geronimo.system.plugin.PluginInstallerGBean">
-    <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="PluginAttributeStore">
-      <name>AttributeManager</name>
-    </reference>
-    <reference name="ArtifactResolver">
-      <name>ArtifactResolver</name>
-    </reference>
-  </gbean>
-  <gbean name="DownloadedPluginRepos" class="org.apache.geronimo.system.plugin.PluginRepositoryDownloader">
-    <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.0.txt</attribute>
-    <attribute name="userRepositories">~/.m2/repository</attribute>
-  </gbean>
-</module>
\ No newline at end of file
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <gbean name="RMIRegistry" class="org.apache.geronimo.kernel.rmi.RMIRegistryService">
+        <attribute name="port">${PlanNamingPort}</attribute>
+    </gbean>
+
+    <gbean name="NamingProperties" class="org.apache.geronimo.system.properties.NamingProperties">
+        <attribute name="namingFactoryInitial">org.apache.xbean.naming.global.GlobalContextManager</attribute>
+        <attribute name="namingFactoryUrlPkgs">org.apache.xbean.naming</attribute>
+        <attribute name="namingProviderUrl">rmi://localhost:1099</attribute>
+    </gbean>
+
+    <gbean name="GlobalContext" class="org.apache.geronimo.gjndi.GlobalContextGBean"/>
+
+    <gbean name="JavaCompContext" class="org.apache.geronimo.gjndi.JavaCompContextGBean"/>
+
+    <gbean name="JavaContext" class="org.apache.geronimo.gjndi.WritableContextGBean">
+        <attribute name="nameInNamespace">java:</attribute>
+    </gbean>
+
+    <gbean name="GeronimoContext" class="org.apache.geronimo.gjndi.WritableContextGBean">
+        <attribute name="nameInNamespace">ger:</attribute>
+    </gbean>
+
+    <gbean name="MBeanServerReference" class="org.apache.geronimo.system.jmx.RealMBeanServerReference"/>
+
+    <!-- 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">5000</attribute>
+        <attribute name="poolSize">500</attribute>
+        <attribute name="poolName">DefaultThreadPool</attribute>
+    </gbean>
+
+    <!-- Configuration Installer -->
+    <gbean name="PluginInstaller" class="org.apache.geronimo.system.plugin.PluginInstallerGBean">
+        <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="PluginAttributeStore">
+            <name>AttributeManager</name>
+        </reference>
+        <reference name="ArtifactResolver">
+          <name>ArtifactResolver</name>
+        </reference>
+    </gbean>
+
+    <gbean name="DownloadedPluginRepos" class="org.apache.geronimo.system.plugin.PluginRepositoryDownloader">
+        <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.1.txt</attribute>
+        <attribute name="userRepositories">~/.m2/repository</attribute>
+    </gbean>
+
+</module>

Modified: geronimo/server/trunk/configs/server-security-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/server-security-config/pom.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/server-security-config/pom.xml (original)
+++ geronimo/server/trunk/configs/server-security-config/pom.xml Mon Sep 10 23:34:53 2007
@@ -32,6 +32,8 @@
     <artifactId>server-security-config</artifactId>
     <name>Geronimo Configs :: Server Security Configuration</name>
     <packaging>car</packaging>
+
+    <description>Sample security configuration for a demo geronimo server. Not suitable for production use.</description>
     
     <dependencies>
         
@@ -54,6 +56,11 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                     </deploymentConfigs>
+                    <category>Security</category>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/configs/server-security-config/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/server-security-config/src/main/plan/plan.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/server-security-config/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/server-security-config/src/main/plan/plan.xml Mon Sep 10 23:34:53 2007
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one or more
+<!--
+    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
@@ -12,31 +13,19 @@
     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-1.2">
-  <environment>
-    <moduleId>
-      <groupId>org.apache.geronimo.configs</groupId>
-      <artifactId>server-security-config</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-security</artifactId>
-        <type>car</type>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="CredentialStore" class="org.apache.geronimo.security.credentialstore.SimpleCredentialStoreImpl">
-    <xml-attribute name="credentialStore">
-      <credential-store xmlns="http://geronimo.apache.org/xml/ns/credentialstore-1.0">
-        <!--uncomment this and the default subject in the jettty console plan gives you admin console permissions-->
-        <!--<realm name="geronimo-admin">
+    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">
+        <xml-attribute name="credentialStore">
+            <credential-store xmlns="http://geronimo.apache.org/xml/ns/credentialstore-1.0">
+                <!-- uncomment this and the default subject in the jettty console plan gives you admin console permissions -->
+<!--
+                <realm name="geronimo-admin">
                     <subject>
                         <id>default</id>
                         <credential>
@@ -48,39 +37,46 @@
                             <value>manager</value>
                         </credential>
                     </subject>
-                </realm>-->
-      </credential-store>
-    </xml-attribute>
-  </gbean>
-  <!--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>
-    <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="keyPasswords">geronimo=secret</attribute>
-    <reference name="ServerInfo">
-      <name>ServerInfo</name>
-    </reference>
-  </gbean>
-</module>
\ No newline at end of file
+                </realm>
+-->
+            </credential-store>
+        </xml-attribute>
+    </gbean>
+
+
+    <!-- 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>
+        <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="keyPasswords">geronimo=secret</attribute>
+        <reference name="ServerInfo"><name>ServerInfo</name></reference>
+    </gbean>
+
+</module>

Modified: geronimo/server/trunk/configs/tomcat6-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat6-deployer/pom.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/tomcat6-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/tomcat6-deployer/pom.xml Mon Sep 10 23:34:53 2007
@@ -21,7 +21,7 @@
 <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.configs</groupId>
         <artifactId>configs</artifactId>
@@ -32,16 +32,18 @@
     <artifactId>tomcat6-deployer</artifactId>
     <name>Geronimo Configs :: Tomcat Deployer</name>
     <packaging>car</packaging>
-    
+
+    <description>Geronimo deployer for Tomcat web container.</description>
+
     <dependencies>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <!--ResourceEnvironmentSetter-->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -75,9 +77,9 @@
             <groupId>org.apache.geronimo.schema</groupId>
             <artifactId>geronimo-schema-jee_5</artifactId>
         </dependency>
-        
+
     </dependencies>
-    
+
     <build>
         <resources>
             <resource>
@@ -85,20 +87,58 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        
-<!--
+
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                    </deploymentConfigs>
+                    <useMavenDependencies>
+                        <value>false</value>
+                    </useMavenDependencies>
+                    <category>Tomcat</category>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>connector-deployer</artifactId>
+                            <type>car</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-tomcat6-builder</artifactId>
+                            <version>2.1-SNAPSHOT</version>
+                            <type>jar</type>
+                            <import>classes</import>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.schema</groupId>
+                            <artifactId>geronimo-schema-jee_5</artifactId>
+                            <version>1.1</version>
+                            <type>jar</type>
+                            <import>classes</import>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>j2ee-deployer</artifactId>
+                            <type>car</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-web-2.5-builder</artifactId>
+                            <version>2.1-SNAPSHOT</version>
+                            <type>jar</type>
+                            <import>classes</import>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>tomcat6</artifactId>
+                            <type>car</type>
+                            <import>classes</import>
+                        </dependency>
+                    </dependencies>
                 </configuration>
             </plugin>
         </plugins>
--->
     </build>
-    
+
 </project>

Modified: geronimo/server/trunk/configs/tomcat6-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat6-deployer/src/main/plan/plan.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/tomcat6-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/tomcat6-deployer/src/main/plan/plan.xml Mon Sep 10 23:34:53 2007
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one or more
+<!--
+    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
@@ -12,124 +13,81 @@
     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-1.2">
-  <environment>
-    <moduleId>
-      <groupId>org.apache.geronimo.configs</groupId>
-      <artifactId>tomcat6-deployer</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>connector-deployer</artifactId>
-        <type>car</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-tomcat6-builder</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.schema</groupId>
-        <artifactId>geronimo-schema-jee_5</artifactId>
-        <version>1.1</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-deployer</artifactId>
-        <type>car</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-web-2.5-builder</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>tomcat6</artifactId>
-        <type>car</type>
-        <import>classes</import>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="TomcatWebBuilder" class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder">
-    <attribute name="tomcatContainerName">?name=TomcatWebContainer</attribute>
-    <reference name="SecurityBuilders">
-      <name>SecurityBuilder</name>
-    </reference>
-    <references name="ServiceBuilders">
-      <pattern>
-        <name>GBeanBuilder</name>
-      </pattern>
-    </references>
-    <references name="WebServiceBuilder">
-      <pattern>
-        <name>CXFBuilder</name>
-      </pattern>
-      <pattern>
-        <name>Axis2Builder</name>
-      </pattern>
-      <pattern>
-        <name>WebServiceBuilder</name>
-      </pattern>
-      <pattern>
-        <name>UnavailableWebServiceBuilder</name>
-      </pattern>
-    </references>
-    <reference name="NamingBuilders">
-      <name>NamingBuilders</name>
-    </reference>
-    <references name="ModuleBuilderExtensions">
-      <pattern>
-        <name>PersistenceUnitBuilder</name>
-      </pattern>
-      <pattern>
-        <name>MyFacesModuleBuilderExtension</name>
-      </pattern>
-      <pattern>
-        <name>JspModuleBuilderExtension</name>
-      </pattern>
-    </references>
-    <reference name="ResourceEnvironmentSetter">
-      <name>ResourceRefBuilder</name>
-    </reference>
-    <xml-attribute name="defaultEnvironment">
-      <environment>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6</artifactId>
-            <type>car</type>
-          </dependency>
-        </dependencies>
-        <hidden-classes/>
-        <non-overridable-classes>
-          <filter>java.</filter>
-          <filter>javax.</filter>
-          <filter>org.apache.geronimo.</filter>
-          <filter>org.apache.jasper.</filter>
-          <filter>org.apache.naming.</filter>
-          <filter>org.apache.catalina.</filter>
-          <filter>org.apache.tomcat.</filter>
-          <filter>org.apache.myfaces.</filter>
-          <filter>org.apache.taglibs.</filter>
-          <filter>org.xml.</filter>
-          <filter>org.w3c.</filter>
-        </non-overridable-classes>
-      </environment>
-    </xml-attribute>
-  </gbean>
-  <gbean name="Tomcat6WARConfigurer" class="org.apache.geronimo.web.deployment.WARConfigurer"/>
-</module>
\ No newline at end of file
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <gbean name="TomcatWebBuilder" class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder">
+        <attribute name="tomcatContainerName">?name=TomcatWebContainer</attribute>
+        <reference name="SecurityBuilders">
+            <name>SecurityBuilder</name>
+        </reference>
+        <references name="ServiceBuilders">
+            <pattern>
+                <name>GBeanBuilder</name>
+            </pattern>
+        </references>
+        <references name="WebServiceBuilder">
+            <pattern>
+                <name>CXFBuilder</name>
+            </pattern>
+            <pattern>
+                <name>Axis2Builder</name>
+            </pattern>
+            <pattern>
+                <name>WebServiceBuilder</name>
+            </pattern>
+            <pattern>
+                <name>UnavailableWebServiceBuilder</name>
+            </pattern>
+        </references>
+        <reference name="NamingBuilders">
+            <name>NamingBuilders</name>
+        </reference>
+        <references name="ModuleBuilderExtensions">
+            <pattern>
+                <name>PersistenceUnitBuilder</name>
+            </pattern>
+            <pattern>
+                <name>MyFacesModuleBuilderExtension</name>
+            </pattern>
+            <pattern>
+                <name>JspModuleBuilderExtension</name>
+            </pattern>
+        </references>
+        <reference name="ResourceEnvironmentSetter">
+            <name>ResourceRefBuilder</name>
+        </reference>
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+                <dependencies>
+                    <dependency>
+                        <groupId>${pom.groupId}</groupId>
+                        <artifactId>tomcat6</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+                <hidden-classes/>
+                <non-overridable-classes>
+                    <filter>java.</filter>
+                    <filter>javax.</filter>
+                    <filter>org.apache.geronimo.</filter>
+                    <filter>org.apache.jasper.</filter>
+                    <filter>org.apache.naming.</filter>
+                    <filter>org.apache.catalina.</filter>
+                    <filter>org.apache.tomcat.</filter>
+                    <filter>org.apache.myfaces.</filter>
+                    <filter>org.apache.taglibs.</filter>
+                    <filter>org.xml.</filter>
+                    <filter>org.w3c.</filter>
+                </non-overridable-classes>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
+    <gbean name="Tomcat6WARConfigurer" class="org.apache.geronimo.web.deployment.WARConfigurer"/>
+
+</module>

Modified: geronimo/server/trunk/configs/tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat6/pom.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/tomcat6/pom.xml (original)
+++ geronimo/server/trunk/configs/tomcat6/pom.xml Mon Sep 10 23:34:53 2007
@@ -33,6 +33,8 @@
     <name>Geronimo Configs :: Tomcat</name>
     <packaging>car</packaging>
 
+    <description>Geronimo Tomcat web server integration.</description>
+
     <dependencies>
 
         <dependency>
@@ -96,20 +98,52 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-
-<!--
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                    </deploymentConfigs>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>Tomcat</category>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content>
+                                <!-- To disable accesslogging uncomment the following lines
+                                <gbean name="TomcatEngine">
+                                    <reference name="TomcatValveChain" />
+                                </gbean>
+                                <gbean name="FirstValve" load="false"></gbean>
+                                -->
+                                <gbean name="TomcatResources"/>
+                                <gbean name="TomcatWebConnector">
+                                    <attribute name="host">${ServerHostname}</attribute>
+                                    <attribute name="port">${HTTPPort + PortOffset}</attribute>
+                                    <attribute name="redirectPort">${HTTPSPort + PortOffset}</attribute>
+                                </gbean>
+                                <gbean name="TomcatAJPConnector">
+                                    <attribute name="host">${ServerHostname}</attribute>
+                                    <attribute name="port">${AJPPort + PortOffset}</attribute>
+                                    <attribute name="redirectPort">${HTTPSPort + PortOffset}</attribute>
+                                </gbean>
+                                <gbean name="TomcatWebSSLConnector">
+                                    <attribute name="host">${ServerHostname}</attribute>
+                                    <attribute name="port">${HTTPSPort + PortOffset}</attribute>
+                                </gbean>
+                            </config-xml-content>
+                            <config-substitution key="HTTPPort">8080</config-substitution>
+                            <config-substitution key="AJPPort">8009</config-substitution>
+                            <config-substitution key="HTTPSPort">8443</config-substitution>
+                            <config-substitution key="ServerHostname">0.0.0.0</config-substitution>
+                            <config-substitution key="webcontainer">TomcatWebContainer</config-substitution>
+                            <config-substitution key="webcontainerName">tomcat6</config-substitution>
+                        </plugin-artifact>
+                    </instance>
                 </configuration>
             </plugin>
         </plugins>
--->
     </build>
 
 

Modified: geronimo/server/trunk/configs/tomcat6/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat6/src/main/plan/plan.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/tomcat6/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/tomcat6/src/main/plan/plan.xml Mon Sep 10 23:34:53 2007
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one or more
+<!--
+    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
@@ -12,240 +13,217 @@
     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-1.2">
-  <environment>
-    <moduleId>
-      <groupId>org.apache.geronimo.configs</groupId>
-      <artifactId>tomcat6</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>server-security-config</artifactId>
-        <type>car</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jasper</artifactId>
-        <type>car</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>webservices-common</artifactId>
-        <type>car</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>transaction</artifactId>
-        <type>car</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-server</artifactId>
-        <type>car</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>tribes</artifactId>
-        <version>6.0.13</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>catalina-ha</artifactId>
-        <version>6.0.13</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-tomcat6</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="CatalinaSystemProperties" class="org.apache.geronimo.system.properties.SystemProperties">
-    <attribute name="systemProperties">org.apache.catalina.STRICT_SERVLET_COMPLIANCE=true</attribute>
-  </gbean>
-  <gbean name="TomcatResources" class="org.apache.geronimo.system.util.DirectoryInitializationGBean">
-    <!--copies tomcat initialization files into specified location-->
-    <attribute name="prefix">META-INF/geronimo-tomcat6</attribute>
-    <attribute name="path">var/catalina</attribute>
-    <reference name="ServerInfo">
-      <name>ServerInfo</name>
-    </reference>
-  </gbean>
-  <!--david jencks is not convinced that this gbean should be in this plan and thinks it might
-    belong in the console plan-->
-  <gbean name="TomcatWebManager" class="org.apache.geronimo.tomcat.TomcatManagerImpl"></gbean>
-  <!--The following is the equivalent of the server.xml file, but done with GBeans-->
-  <!--The TomcatContainer/Service-->
-  <gbean name="TomcatWebContainer" class="org.apache.geronimo.tomcat.TomcatContainer">
-    <attribute name="catalinaHome">var/catalina</attribute>
-    <!--<attribute name="applicationListeners">org.apache.myfaces.webapp.StartupServletContextListener</attribute>-->
-    <reference name="EngineGBean">
-      <name>TomcatEngine</name>
-    </reference>
-    <reference name="ServerInfo">
-      <name>ServerInfo</name>
-    </reference>
-    <reference name="WebManager">
-      <name>TomcatWebManager</name>
-    </reference>
-  </gbean>
-  <gbean name="TomcatWebConnector" class="org.apache.geronimo.tomcat.connector.Http11ConnectorGBean">
-    <attribute name="name">HTTP</attribute>
-    <attribute name="host">0.0.0.0</attribute>
-    <attribute name="port">8080</attribute>
-    <attribute name="maxHttpHeaderSize">8192</attribute>
-    <attribute name="maxThreads">150</attribute>
-    <attribute name="minSpareThreads">25</attribute>
-    <attribute name="maxSpareThreads">75</attribute>
-    <attribute name="enableLookups">false</attribute>
-    <attribute name="redirectPort">8443</attribute>
-    <attribute name="acceptCount">100</attribute>
-    <attribute name="connectionTimeout">20000</attribute>
-    <attribute name="disableUploadTimeout">true</attribute>
-    <reference name="TomcatContainer">
-      <name>TomcatWebContainer</name>
-    </reference>
-    <reference name="ServerInfo">
-      <name>ServerInfo</name>
-    </reference>
-  </gbean>
-  <gbean name="TomcatAJPConnector" class="org.apache.geronimo.tomcat.connector.AJP13ConnectorGBean">
-    <attribute name="name">AJP</attribute>
-    <attribute name="host">0.0.0.0</attribute>
-    <attribute name="port">8019</attribute>
-    <attribute name="minSpareThreads">25</attribute>
-    <attribute name="maxSpareThreads">75</attribute>
-    <attribute name="enableLookups">false</attribute>
-    <attribute name="redirectPort">8443</attribute>
-    <reference name="TomcatContainer">
-      <name>TomcatWebContainer</name>
-    </reference>
-    <reference name="ServerInfo">
-      <name>ServerInfo</name>
-    </reference>
-  </gbean>
-  <!--SSL support
-    NOTE: If keystoreFile is a relative path, it is relative to GERONIMO_HOME-->
-  <gbean name="TomcatWebSSLConnector" class="org.apache.geronimo.tomcat.connector.Https11ConnectorGBean">
-    <attribute name="name">HTTPS</attribute>
-    <attribute name="host">0.0.0.0</attribute>
-    <attribute name="port">8443</attribute>
-    <attribute name="maxHttpHeaderSize">8192</attribute>
-    <attribute name="maxThreads">150</attribute>
-    <attribute name="minSpareThreads">25</attribute>
-    <attribute name="maxSpareThreads">75</attribute>
-    <attribute name="enableLookups">false</attribute>
-    <attribute name="acceptCount">100</attribute>
-    <attribute name="disableUploadTimeout">false</attribute>
-    <attribute name="clientAuth">false</attribute>
-    <attribute name="algorithm">Default</attribute>
-    <attribute name="sslProtocol">TLS</attribute>
-    <attribute name="keystoreFile">var/security/keystores/geronimo-default</attribute>
-    <attribute name="keystorePass">secret</attribute>
-    <reference name="TomcatContainer">
-      <name>TomcatWebContainer</name>
-    </reference>
-    <reference name="ServerInfo">
-      <name>ServerInfo</name>
-    </reference>
-  </gbean>
-  <!--Engine-->
-  <gbean name="TomcatEngine" class="org.apache.geronimo.tomcat.EngineGBean">
-    <attribute name="className">org.apache.geronimo.tomcat.TomcatEngine</attribute>
-    <attribute name="initParams">name=Geronimo</attribute>
-    <reference name="DefaultHost">
-      <name>TomcatHost</name>
-    </reference>
-    <references name="Hosts">
-      <pattern>
-        <type>Host</type>
-      </pattern>
-    </references>
-    <reference name="RealmGBean">
-      <name>TomcatJAASRealm</name>
-    </reference>
-    <reference name="TomcatValveChain">
-      <name>FirstValve</name>
-    </reference>
-    <reference name="MBeanServerReference">
-      <name>MBeanServerReference</name>
-    </reference>
-    <dependency>
-      <name>TomcatResources</name>
-    </dependency>
-    <!--n.b. is you have more hosts, you want them to start before the engine gbean-->
-    <!--ensure this by including dependencies like this-->
-    <!--<dependency>
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <gbean name="CatalinaSystemProperties" class="org.apache.geronimo.system.properties.SystemProperties">
+        <attribute name="systemProperties">
+        org.apache.catalina.STRICT_SERVLET_COMPLIANCE=true
+        </attribute>
+    </gbean>
+
+    <gbean name="TomcatResources" class="org.apache.geronimo.system.util.DirectoryInitializationGBean">
+        <!-- copies tomcat initialization files into specified location -->
+        <attribute name="prefix">META-INF/geronimo-tomcat6</attribute>
+        <attribute name="path">var/catalina</attribute>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
+    <!-- david jencks is not convinced that this gbean should be in this plan and thinks it might
+    belong in the console plan -->
+    <gbean name="TomcatWebManager" class="org.apache.geronimo.tomcat.TomcatManagerImpl">
+    </gbean>
+
+    <!-- The following is the equivalent of the server.xml file, but done with GBeans -->
+
+    <!-- The TomcatContainer/Service -->
+    <gbean name="TomcatWebContainer" class="org.apache.geronimo.tomcat.TomcatContainer">
+        <attribute name="catalinaHome">var/catalina</attribute>
+        <!--<attribute name="applicationListeners">org.apache.myfaces.webapp.StartupServletContextListener</attribute>-->
+        <reference name="EngineGBean">
+            <name>TomcatEngine</name>
+        </reference>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+        <reference name="WebManager">
+            <name>TomcatWebManager</name>
+        </reference>
+    </gbean>
+
+    <gbean name="TomcatWebConnector" class="org.apache.geronimo.tomcat.connector.Http11ConnectorGBean">
+        <attribute name="name">HTTP</attribute>
+        <attribute name="host">${PlanServerHostname}</attribute>
+        <attribute name="port">${PlanHTTPPort}</attribute>
+        <attribute name="maxHttpHeaderSize">8192</attribute>
+        <attribute name="maxThreads">150</attribute>
+        <attribute name="minSpareThreads">25</attribute>
+        <attribute name="maxSpareThreads">75</attribute>
+        <attribute name="enableLookups">false</attribute>
+        <attribute name="redirectPort">${PlanHTTPSPort}</attribute>
+        <attribute name="acceptCount">100</attribute>
+        <attribute name="connectionTimeout">20000</attribute>
+        <attribute name="disableUploadTimeout">true</attribute>
+        <reference name="TomcatContainer">
+            <name>TomcatWebContainer</name>
+        </reference>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
+    <gbean name="TomcatAJPConnector" class="org.apache.geronimo.tomcat.connector.AJP13ConnectorGBean">
+        <attribute name="name">AJP</attribute>
+        <attribute name="host">${PlanServerHostname}</attribute>
+        <attribute name="port">${PlanAJPPort}</attribute>
+        <attribute name="minSpareThreads">25</attribute>
+        <attribute name="maxSpareThreads">75</attribute>
+        <attribute name="enableLookups">false</attribute>
+        <attribute name="redirectPort">${PlanHTTPSPort}</attribute>
+        <reference name="TomcatContainer">
+            <name>TomcatWebContainer</name>
+        </reference>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
+    <!-- SSL support
+    NOTE: If keystoreFile is a relative path, it is relative to GERONIMO_HOME
+    -->
+    <gbean name="TomcatWebSSLConnector" class="org.apache.geronimo.tomcat.connector.Https11ConnectorGBean">
+        <attribute name="name">HTTPS</attribute>
+        <attribute name="host">${PlanServerHostname}</attribute>
+        <attribute name="port">${PlanHTTPSPort}</attribute>
+        <attribute name="maxHttpHeaderSize">8192</attribute>
+        <attribute name="maxThreads">150</attribute>
+        <attribute name="minSpareThreads">25</attribute>
+        <attribute name="maxSpareThreads">75</attribute>
+        <attribute name="enableLookups">false</attribute>
+        <attribute name="acceptCount">100</attribute>
+        <attribute name="disableUploadTimeout">false</attribute>
+        <attribute name="clientAuth">false</attribute>
+        <attribute name="algorithm">Default</attribute>
+        <attribute name="sslProtocol">TLS</attribute>
+        <attribute name="keystoreFile">var/security/keystores/geronimo-default</attribute>
+        <attribute name="keystorePass">secret</attribute>
+        <reference name="TomcatContainer">
+            <name>TomcatWebContainer</name>
+        </reference>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
+    <!-- Engine -->
+    <gbean name="TomcatEngine" class="org.apache.geronimo.tomcat.EngineGBean">
+        <attribute name="className">org.apache.geronimo.tomcat.TomcatEngine</attribute>
+        <attribute name="initParams">
+            name=Geronimo
+        </attribute>
+        <reference name="DefaultHost">
+            <name>TomcatHost</name>
+        </reference>
+        <references name="Hosts">
+            <pattern>
+                <type>Host</type>
+            </pattern>
+        </references>
+        <reference name="RealmGBean">
+            <name>TomcatJAASRealm</name>
+        </reference>
+        <reference name="TomcatValveChain">
+            <name>FirstValve</name>
+        </reference>
+        <reference name="MBeanServerReference">
+            <name>MBeanServerReference</name>
+        </reference>
+        <dependency>
+            <name>TomcatResources</name>
+        </dependency>
+        <!-- n.b. is you have more hosts, you want them to start before the engine gbean -->
+        <!-- ensure this by including dependencies like this -->
+        <!--
+        <dependency>
             <name>MyAdditionalHost</name>
-        </dependency>-->
-  </gbean>
-  <gbean name="TomcatAccessLogManager" class="org.apache.geronimo.tomcat.TomcatLogManagerImpl">
-    <reference name="ServerInfo">
-      <name>ServerInfo</name>
-    </reference>
-    <references name="LogGBeans">
-      <pattern>
-        <name>FirstValve</name>
-      </pattern>
-    </references>
-  </gbean>
-  <!--Valve-->
-  <gbean name="FirstValve" class="org.apache.geronimo.tomcat.ValveGBean">
-    <attribute name="className">org.apache.catalina.valves.AccessLogValve</attribute>
-    <attribute name="initParams">prefix=0.0.0.0_access_log.
+        </dependency>
+        -->
+    </gbean>
+
+    <gbean name="TomcatAccessLogManager" class="org.apache.geronimo.tomcat.TomcatLogManagerImpl">
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+        <references name="LogGBeans">
+            <pattern>
+                <name>FirstValve</name>
+            </pattern>
+        </references>
+    </gbean>
+
+    <!-- Valve -->
+    <gbean name="FirstValve" class="org.apache.geronimo.tomcat.ValveGBean">
+        <attribute name="className">org.apache.catalina.valves.AccessLogValve</attribute>
+        <attribute name="initParams">
+            prefix=${PlanServerHostname}_access_log.
             suffix=.txt
-            pattern=common</attribute>
-    <!--Uncomment this section to add second valve for a chain.  This example consists of the Tomcat
+            pattern=common
+        </attribute>
+        <!-- Uncomment this section to add second valve for a chain.  This example consists of the Tomcat
               AccessLogValve and SingleSignOn. Notice the dependency that chains the FirstValve with the
               SecondValve.  The valves will be added in the order that they are chained.
-            <reference name="NextValve"><moduleType>J2EEModule</moduleType><name>SecondValve</name></reference>-->
-  </gbean>
-  <!--Uncomment this section to add this valve  to the chain.  This example consists of the Tomcat
+            <reference name="NextValve"><moduleType>J2EEModule</moduleType><name>SecondValve</name></reference>
+        -->
+    </gbean>
+    <!-- Uncomment this section to add this valve  to the chain.  This example consists of the Tomcat
           SingleSignOn.
     <gbean name="SecondValve" class="org.apache.geronimo.tomcat.ValveGBean">
         <attribute name="className">org.apache.catalina.authenticator.SingleSignOn</attribute>
-    </gbean>-->
-  <!--Realm-->
-  <!--This is an example TomcatJAASRealm-->
-  <gbean name="TomcatJAASRealm" class="org.apache.geronimo.tomcat.RealmGBean">
-    <attribute name="className">org.apache.geronimo.tomcat.realm.TomcatJAASRealm</attribute>
-    <attribute name="initParams">userClassNames=org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal
-            roleClassNames=org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal</attribute>
-  </gbean>
-  <!--Host-->
-  <gbean name="TomcatHost" class="org.apache.geronimo.tomcat.HostGBean">
-    <attribute name="className">org.apache.catalina.core.StandardHost</attribute>
-    <attribute name="initParams">name=0.0.0.0
+    </gbean>
+    -->
+
+    <!-- Realm -->
+    <!-- This is an example TomcatJAASRealm -->
+    <gbean name="TomcatJAASRealm" class="org.apache.geronimo.tomcat.RealmGBean">
+        <attribute name="className">org.apache.geronimo.tomcat.realm.TomcatJAASRealm</attribute>
+        <attribute name="initParams">
+            userClassNames=org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal
+            roleClassNames=org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal
+        </attribute>
+    </gbean>
+
+    <!-- Host -->
+    <gbean name="TomcatHost" class="org.apache.geronimo.tomcat.HostGBean">
+        <attribute name="className">org.apache.catalina.core.StandardHost</attribute>
+        <attribute name="initParams">
+            name=${PlanServerHostname}
             appBase=
-            workDir=work</attribute>
-    <!--You may attach a Realm to a Host as well.  Only attach to the Engine *or* the Host.
+            workDir=work
+        </attribute>
+        <!-- You may attach a Realm to a Host as well.  Only attach to the Engine *or* the Host.
              Attempting to add the same Realm GBeans to the Engine *and* Host at the same time
              will result in an error.
 
              Uncomment this to add the Realm to the Host
         <reference name="RealmGBean">
             <name>TomcatJAASRealm</name>
-        </reference>-->
-    <!--You may attach a Valve chain to a Host as well.  Only attach to the Engine *or* the Host.
+        </reference>
+        -->
+        <!-- You may attach a Valve chain to a Host as well.  Only attach to the Engine *or* the Host.
              Attempting to add the same valve GBeans to the Engine *and* Host at the same time
              will result in an error.
 
              Uncomment this to add the valve chain to the Host
         <reference name="TomcatValveChain">
             <name>FirstValve</name>
-        </reference>-->
-  </gbean>
-</module>
\ No newline at end of file
+        </reference>
+        -->
+    </gbean>
+
+</module>

Modified: geronimo/server/trunk/configs/transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/transaction/pom.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/transaction/pom.xml (original)
+++ geronimo/server/trunk/configs/transaction/pom.xml Mon Sep 10 23:34:53 2007
@@ -32,6 +32,8 @@
     <artifactId>transaction</artifactId>
     <name>Geronimo Configs :: Transaction Manager (JTA11)</name>
     <packaging>car</packaging>
+
+    <description>Geronimo transaction manager module.</description>
     
     <dependencies>
         
@@ -96,5 +98,21 @@
         </dependency>
 
     </dependencies>
-    
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <category>Geronimo Core</category>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: geronimo/server/trunk/configs/transaction/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/transaction/src/main/plan/plan.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/transaction/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/transaction/src/main/plan/plan.xml Mon Sep 10 23:34:53 2007
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one or more
+<!--
+  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
@@ -12,157 +13,90 @@
   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$-->
+  limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
-  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-    <dep:moduleId>
-      <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-      <dep:artifactId>transaction</dep:artifactId>
-      <dep:version>2.1-SNAPSHOT</dep:version>
-      <dep:type>car</dep:type>
-    </dep:moduleId>
-    <dep:dependencies>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.components</dep:groupId>
-        <dep:artifactId>geronimo-transaction</dep:artifactId>
-        <dep:version>2.0.1</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
-        <dep:artifactId>geronimo-persistence-jpa10</dep:artifactId>
-        <dep:version>2.1-SNAPSHOT</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.objectweb.howl</dep:groupId>
-        <dep:artifactId>howl</dep:artifactId>
-        <dep:version>1.0.1-1</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
-        <dep:artifactId>geronimo-transformer</dep:artifactId>
-        <dep:version>2.1-SNAPSHOT</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-        <dep:artifactId>j2ee-server</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
-        <dep:artifactId>geronimo-transaction</dep:artifactId>
-        <dep:version>2.1-SNAPSHOT</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
-        <dep:artifactId>geronimo-connector</dep:artifactId>
-        <dep:version>2.1-SNAPSHOT</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-        <dep:artifactId>j2ee-security</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
-        <dep:artifactId>geronimo-core</dep:artifactId>
-        <dep:version>2.1-SNAPSHOT</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.components</dep:groupId>
-        <dep:artifactId>geronimo-connector</dep:artifactId>
-        <dep:version>2.0.1</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-    </dep:dependencies>
-    <dep:hidden-classes/>
-    <dep:non-overridable-classes/>
-  </dep:environment>
-  <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
-    <attribute name="lazyConnect">true</attribute>
-    <reference name="TransactionManager">
-      <name>TransactionManager</name>
-    </reference>
-  </gbean>
-  <gbean name="ConnectorThreadPool" class="org.apache.geronimo.pool.ThreadPool">
-    <attribute name="keepAliveTime">5000</attribute>
-    <attribute name="poolSize">30</attribute>
-    <attribute name="poolName">ConnectorThreadPool</attribute>
-  </gbean>
-  <gbean name="DefaultWorkManager" class="org.apache.geronimo.connector.work.GeronimoWorkManagerGBean">
-    <reference name="SyncPool">
-      <name>ConnectorThreadPool</name>
-    </reference>
-    <reference name="StartPool">
-      <name>ConnectorThreadPool</name>
-    </reference>
-    <reference name="ScheduledPool">
-      <name>ConnectorThreadPool</name>
-    </reference>
-    <reference name="TransactionManager">
-      <name>TransactionManager</name>
-    </reference>
-  </gbean>
-  <gbean name="HOWLTransactionLog" class="org.apache.geronimo.transaction.log.HOWLLogGBean">
-    <attribute name="bufferClassName">org.objectweb.howl.log.BlockLogBuffer</attribute>
-    <attribute name="bufferSizeKBytes">32</attribute>
-    <attribute name="checksumEnabled">true</attribute>
-    <attribute name="adler32Checksum">true</attribute>
-    <attribute name="flushSleepTimeMilliseconds">50</attribute>
-    <attribute name="logFileDir">var/txlog</attribute>
-    <attribute name="logFileExt">log</attribute>
-    <attribute name="logFileName">howl</attribute>
-    <attribute name="maxBlocksPerFile">-1</attribute>
-    <attribute name="maxBuffers">0</attribute>
-    <attribute name="maxLogFiles">2</attribute>
-    <attribute name="minBuffers">4</attribute>
-    <attribute name="threadsWaitingForceThreshold">-1</attribute>
-    <reference name="XidFactory">
-      <name>XidFactory</name>
-    </reference>
-    <reference name="ServerInfo">
-      <name>ServerInfo</name>
-    </reference>
-  </gbean>
-  <gbean name="XidFactory" class="org.apache.geronimo.transaction.manager.XidFactoryImplGBean">
-    <attribute name="tmId">71,84,77,73,68</attribute>
-  </gbean>
-  <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.GeronimoTransactionManagerGBean">
-    <attribute name="defaultTransactionTimeoutSeconds">600</attribute>
-    <reference name="XidFactory">
-      <name>XidFactory</name>
-    </reference>
-    <reference name="TransactionLog">
-      <name>HOWLTransactionLog</name>
-    </reference>
-  </gbean>
-  <gbean name="TransactionManagerBinding" class="org.apache.geronimo.gjndi.binding.GBeanBinding">
-    <attribute name="name">TransactionManager</attribute>
-    <attribute name="abstractNameQuery">?name=TransactionManager#</attribute>
-    <reference name="Context">
-      <name>JavaContext</name>
-    </reference>
-  </gbean>
-  <gbean name="TransactionSynchronizationRegistryBinding" class="org.apache.geronimo.gjndi.binding.GBeanBinding">
-    <attribute name="name">TransactionSynchronizationRegistry</attribute>
-    <attribute name="abstractNameQuery">?name=TransactionManager#</attribute>
-    <reference name="Context">
-      <name>JavaContext</name>
-    </reference>
-  </gbean>
-</module>
\ No newline at end of file
+
+    <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
+        <attribute name="lazyConnect">true</attribute>
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
+        </reference>
+    </gbean>
+
+    <gbean name="ConnectorThreadPool" class="org.apache.geronimo.pool.ThreadPool">
+        <attribute name="keepAliveTime">5000</attribute>
+        <attribute name="poolSize">30</attribute>
+        <attribute name="poolName">ConnectorThreadPool</attribute>
+    </gbean>
+
+    <gbean name="DefaultWorkManager" class="org.apache.geronimo.connector.work.GeronimoWorkManagerGBean">
+        <reference name="SyncPool">
+            <name>ConnectorThreadPool</name>
+        </reference>
+        <reference name="StartPool">
+            <name>ConnectorThreadPool</name>
+        </reference>
+        <reference name="ScheduledPool">
+            <name>ConnectorThreadPool</name>
+        </reference>
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
+        </reference>
+    </gbean>
+
+    <gbean name="HOWLTransactionLog" class="org.apache.geronimo.transaction.log.HOWLLogGBean">
+        <attribute name="bufferClassName">org.objectweb.howl.log.BlockLogBuffer</attribute>
+        <attribute name="bufferSizeKBytes">32</attribute>
+        <attribute name="checksumEnabled">true</attribute>
+        <attribute name="adler32Checksum">true</attribute>
+        <attribute name="flushSleepTimeMilliseconds">50</attribute>
+        <attribute name="logFileDir">var/txlog</attribute>
+        <attribute name="logFileExt">log</attribute>
+        <attribute name="logFileName">howl</attribute>
+        <attribute name="maxBlocksPerFile">-1</attribute>
+        <attribute name="maxBuffers">0</attribute>
+        <attribute name="maxLogFiles">2</attribute>
+        <attribute name="minBuffers">4</attribute>
+        <attribute name="threadsWaitingForceThreshold">-1</attribute>
+        <reference name="XidFactory">
+            <name>XidFactory</name>
+        </reference>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
+    <gbean name="XidFactory" class="org.apache.geronimo.transaction.manager.XidFactoryImplGBean">
+        <attribute name="tmId">71,84,77,73,68</attribute>
+    </gbean>
+
+    <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.GeronimoTransactionManagerGBean">
+        <attribute name="defaultTransactionTimeoutSeconds">600</attribute>
+        <reference name="XidFactory">
+            <name>XidFactory</name>
+        </reference>
+        <reference name="TransactionLog">
+            <name>HOWLTransactionLog</name>
+        </reference>
+    </gbean>
+
+    <gbean name="TransactionManagerBinding" class="org.apache.geronimo.gjndi.binding.GBeanBinding">
+        <attribute name="name">TransactionManager</attribute>
+        <attribute name="abstractNameQuery">?name=TransactionManager#</attribute>
+        <reference name="Context">
+            <name>JavaContext</name>
+        </reference>
+    </gbean>
+    <gbean name="TransactionSynchronizationRegistryBinding" class="org.apache.geronimo.gjndi.binding.GBeanBinding">
+        <attribute name="name">TransactionSynchronizationRegistry</attribute>
+        <attribute name="abstractNameQuery">?name=TransactionManager#</attribute>
+        <reference name="Context">
+            <name>JavaContext</name>
+        </reference>
+    </gbean>
+
+</module>

Modified: geronimo/server/trunk/configs/transformer-agent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/transformer-agent/pom.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/transformer-agent/pom.xml (original)
+++ geronimo/server/trunk/configs/transformer-agent/pom.xml Mon Sep 10 23:34:53 2007
@@ -32,6 +32,8 @@
     <artifactId>transformer-agent</artifactId>
     <name>Geronimo Configs :: Transformer Agent</name>
     <packaging>car</packaging>
+
+    <description>Geronimo class transformer registry agent.</description>
     
     <build>
         <plugins>
@@ -58,6 +60,13 @@
                         </element>
                     </classpath>
                     <classpathPrefix>../lib</classpathPrefix>
+
+                    <category>Geronimo Core</category>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/configs/transformer-agent/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/transformer-agent/src/main/plan/plan.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/transformer-agent/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/transformer-agent/src/main/plan/plan.xml Mon Sep 10 23:34:53 2007
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Copyright 2004-2005 The Apache Software Foundation
+<!--
+    Copyright 2004-2005 The Apache Software Foundation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -11,18 +12,11 @@
     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-1.2">
-  <environment>
-    <moduleId>
-      <groupId>org.apache.geronimo.configs</groupId>
-      <artifactId>transformer-agent</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies/>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-</module>
\ No newline at end of file
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+    <environment/>
+</module>

Modified: geronimo/server/trunk/configs/webconsole-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty6/pom.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty6/pom.xml Mon Sep 10 23:34:53 2007
@@ -235,170 +235,11 @@
                         <type>ear</type>
                     </module>
 
-                    <category>Core Geronimo</category>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.pluto</groupId>
-                            <artifactId>pluto-descriptors</artifactId>
-                            <version>1.0.1</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>connector-deployer</artifactId>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>commons-io</groupId>
-                            <artifactId>commons-io</artifactId>
-                            <version>1.1</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>j2ee-corba-yoko</artifactId>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>jetty6-deployer</artifactId>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-upgrade</artifactId>
-                            <version>2.1-SNAPSHOT</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>commons-digester</groupId>
-                            <artifactId>commons-digester</artifactId>
-                            <version>1.8</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>portlet-api</groupId>
-                            <artifactId>portlet-api</artifactId>
-                            <version>1.0</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-management</artifactId>
-                            <version>2.1-SNAPSHOT</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>jasper</artifactId>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-activemq-management</artifactId>
-                            <version>2.1-SNAPSHOT</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>commons-fileupload</groupId>
-                            <artifactId>commons-fileupload</artifactId>
-                            <version>1.1.1</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>jdom</groupId>
-                            <artifactId>jdom</artifactId>
-                            <version>1.0</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-deploy-jsr88</artifactId>
-                            <version>2.1-SNAPSHOT</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-converter</artifactId>
-                            <version>2.1-SNAPSHOT</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-activemq</artifactId>
-                            <version>2.1-SNAPSHOT</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.pluto</groupId>
-                            <artifactId>pluto-portal</artifactId>
-                            <version>1.0.1</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>dojo-jetty6</artifactId>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>j2ee-server</artifactId>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>system-database</artifactId>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.codehaus.castor</groupId>
-                            <artifactId>castor</artifactId>
-                            <version>1.0.5</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.applications.console</groupId>
-                            <artifactId>geronimo-console-core</artifactId>
-                            <version>2.1-SNAPSHOT</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>xerces</groupId>
-                            <artifactId>xercesImpl</artifactId>
-                            <version>2.8.1</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>dwr</groupId>
-                            <artifactId>dwr</artifactId>
-                            <version>1.1.3</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.pluto</groupId>
-                            <artifactId>pluto</artifactId>
-                            <version>1.0.1</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                    </dependencies>
+                    <category>Administration</category>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
                             <prerequisite>

Modified: geronimo/server/trunk/configs/webconsole-jetty6/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty6/src/main/plan/plan.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty6/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty6/src/main/plan/plan.xml Mon Sep 10 23:34:53 2007
@@ -19,29 +19,6 @@
     <web>framework.war</web>
     <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
       <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-        <dependencies>
-          <dependency>
-            <groupId>org.codehaus.castor</groupId>
-            <artifactId>castor</artifactId>
-            <type>jar</type>
-          </dependency>
-          <!--required for castor-->
-          <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <type>jar</type>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.pluto</groupId>
-            <artifactId>pluto-descriptors</artifactId>
-            <type>jar</type>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.pluto</groupId>
-            <artifactId>pluto-portal</artifactId>
-            <type>jar</type>
-          </dependency>
-        </dependencies>
         <inverse-classloading/>
       </environment>
       <context-root>console</context-root>



Mime
View raw message