geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r428856 [3/12] - in /geronimo/sandbox/svkmerge/trunk: ./ applications/ applications/console/ applications/console/console-core/ applications/console/console-ear/ applications/console/console-framework/ applications/console/console-framework...
Date Fri, 04 Aug 2006 19:44:34 GMT
Modified: geronimo/sandbox/svkmerge/trunk/configs/uddi-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/uddi-jetty/src/plan/plan.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/uddi-jetty/src/plan/plan.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/uddi-jetty/src/plan/plan.xml Fri Aug  4 12:44:18 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     Copyright 2004-2005 The Apache Software Foundation
 
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,11 +16,12 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
 
     <ext-module>
         <web>uddi-jetty</web>
-        <external-path>geronimo/geronimo-uddi-server/${pom.currentVersion}/war</external-path>
+        <external-path>${geronimo_groupId}/geronimo-uddi-server/${pom.currentVersion}/war</external-path>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
 
             <context-root>/juddi</context-root>

Added: geronimo/sandbox/svkmerge/trunk/configs/uddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/uddi-tomcat/pom.xml?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/uddi-tomcat/pom.xml (added)
+++ geronimo/sandbox/svkmerge/trunk/configs/uddi-tomcat/pom.xml Fri Aug  4 12:44:18 2006
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  Copyright 2006 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.
+  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>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>uddi-tomcat</artifactId>
+    <name>Geronimo Configs :: UDDI Tomcat</name>
+    <packaging>car</packaging>
+    
+    <properties>
+        <!--
+        FIXME: Remove the need for these properties
+        -->
+        <geronimo_groupId>org.apache.geronimo.applications</geronimo_groupId>
+        <tranql_vendors_version>${tranqlVendorsVersion}</tranql_vendors_version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>system-database</artifactId>
+            <version>${pom.Version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis</artifactId>
+            <version>${pom.Version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.applications</groupId>
+            <artifactId>geronimo-uddi-db</artifactId>
+            <version>${pom.Version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>tranql</groupId>
+            <artifactId>tranql-connector-derby-embed-local</artifactId>
+            <type>rar</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>juddi</groupId>
+            <artifactId>juddi</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>scout</groupId>
+            <artifactId>scout</artifactId>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+                        <deploymentConfig>${clientDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>

Propchange: geronimo/sandbox/svkmerge/trunk/configs/uddi-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/trunk/configs/uddi-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/trunk/configs/uddi-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/sandbox/svkmerge/trunk/configs/uddi-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/uddi-tomcat/src/plan/plan.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/uddi-tomcat/src/plan/plan.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/uddi-tomcat/src/plan/plan.xml Fri Aug  4 12:44:18 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     Copyright 2004-2005 The Apache Software Foundation
 
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,12 +16,12 @@
 -->
 
 <!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1"
-    >
+
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
 
     <ext-module>
         <web>uddi-tomcat</web>
-        <external-path>geronimo/geronimo-uddi-server/${pom.currentVersion}/war</external-path>
+        <external-path>${geronimo_groupId}/geronimo-uddi-server/${pom.currentVersion}/war</external-path>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
 
             <context-root>/juddi</context-root>

Modified: geronimo/sandbox/svkmerge/trunk/configs/unavailable-client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/unavailable-client-deployer/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/unavailable-client-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/unavailable-client-deployer/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -47,9 +48,12 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-packaging-plugin</artifactId>
+                <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer}</deploymentConfig>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/sandbox/svkmerge/trunk/configs/unavailable-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/unavailable-ejb-deployer/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/unavailable-ejb-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/unavailable-ejb-deployer/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -47,9 +48,12 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-packaging-plugin</artifactId>
+                <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer}</deploymentConfig>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/sandbox/svkmerge/trunk/configs/unavailable-webservices-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/unavailable-webservices-deployer/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/unavailable-webservices-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/unavailable-webservices-deployer/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -47,9 +48,12 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-packaging-plugin</artifactId>
+                <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer}</deploymentConfig>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/sandbox/svkmerge/trunk/configs/upgrade-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/upgrade-cli/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/upgrade-cli/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/upgrade-cli/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/trunk/configs/upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/upgrade/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/upgrade/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/upgrade/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/trunk/configs/welcome-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/welcome-jetty/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/welcome-jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/welcome-jetty/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -52,12 +53,30 @@
     </dependencies>
     
     <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/conf</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>geronimo-plugin.xml</include>
+                </includes>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-packaging-plugin</artifactId>
+                <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${j2eeJettyServer}</deploymentConfig>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
+                        <deploymentConfig>${clientDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                     <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-welcome/${pom.version}/geronimo-welcome-${pom.version}.war</moduleFile>
                 </configuration>
             </plugin>

Modified: geronimo/sandbox/svkmerge/trunk/configs/welcome-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/welcome-tomcat/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/welcome-tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/welcome-tomcat/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -52,12 +53,30 @@
     </dependencies>
     
     <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/conf</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>geronimo-plugin.xml</include>
+                </includes>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-packaging-plugin</artifactId>
+                <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${j2eeTomcatServer}</deploymentConfig>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+                        <deploymentConfig>${clientDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                     <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-welcome/${pom.version}/geronimo-welcome-${pom.version}.war</moduleFile>
                 </configuration>
             </plugin>

Propchange: geronimo/sandbox/svkmerge/trunk/etc/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug  4 12:44:18 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/etc:426509

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug  4 12:44:18 2006
@@ -0,0 +1,7 @@
+ *.iml
+.project
+.classpath
+maven.log
+velocity.log
+junit*.properties
+target

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug  4 12:44:18 2006
@@ -0,0 +1,7 @@
+ *.iml
+.project
+.classpath
+maven.log
+velocity.log
+junit*.properties
+target

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/LICENSE.txt?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/LICENSE.txt (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/LICENSE.txt Fri Aug  4 12:44:18 2006
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/NOTICE.txt?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/NOTICE.txt (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/NOTICE.txt Fri Aug  4 12:44:18 2006
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/pom.xml?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/pom.xml (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/pom.xml Fri Aug  4 12:44:18 2006
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2006 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.
+    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.assemblies</groupId>
+        <artifactId>assemblies</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>geronimo-boilerplate-j2ee</artifactId>
+    <name>Geronimo Assemblies :: Boilerplate J2EE</name>
+    <packaging>jar</packaging>
+    
+    <description>
+        Provides boilerplate files for all Geronimo J2EE server assemblies.
+    </description>
+    
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+            </resource>
+        </resources>
+        
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>dependency-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-boilerplate</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.assemblies</groupId>
+                                    <artifactId>geronimo-boilerplate-minimal</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${project.build.directory}/boilerplate</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>extend-boilerplate</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <copy todir="${project.build.directory}/classes">
+                                    <fileset dir="${project.build.directory}/boilerplate">
+                                        <include name="**"/>
+                                        <exclude name="META-INF/**"/>
+                                    </fileset>
+                                </copy>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/config/README.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/config/README.txt?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/config/README.txt (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/config/README.txt Fri Aug  4 12:44:18 2006
@@ -0,0 +1,24 @@
+When Geronimo is started it will read a configuration XML file from this 
+var/config directory.  By default the config.xml file is read, but an
+alternative file can be used by setting the file name (relative to
+the var/config directory) in the org.apache.geronimo.config.file system 
+property.
+
+The configuration XML file lists the serialized modules in the 
+repository to be started.  For each module configured to be
+started in the config.xml file, Geronimo loads a serialized module
+from under the geronimo/repository directory.
+
+A module can be marked as not to be loaded by setting the "load" attribute
+to "false" on the "module" element for a module.
+
+A module may contain GBeans.  Individual GBeans in a module can be
+marked as not to be loaded by setting the "load" attribute to "false" on the
+"gbean" element for a GBean.
+
+Site specific information such as port numbers can be specified in GBean 
+attributes to override the values in the serialized module.
+
+Do not add comments to the config.xml file as the file is regenerated by 
+Geronimo when changes are made to Geronimo's configuration, therefore any
+comments added to this file will be lost.

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/config/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/config/README.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/config/README.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/log/client-log4j.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/log/client-log4j.properties?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/log/client-log4j.properties (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/log/client-log4j.properties Fri Aug  4 12:44:18 2006
@@ -0,0 +1,50 @@
+##
+## Copyright 2004 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.
+## 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.rootCategory=DEBUG, CONSOLE, FILE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=INFO
+log4j.appender.CONSOLE.Target=System.out
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
+
+log4j.appender.FILE=org.apache.log4j.RollingFileAppender
+log4j.appender.FILE.threshold=DEBUG
+log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
+
+#
+# Note, changing log4j.appender.FILE.append=false will result in logs being 
+# overwritten without archiving the previous version of the log.
+#
+log4j.appender.FILE.append=true
+log4j.appender.FILE.file=${org.apache.geronimo.server.dir}/var/log/client.log
+log4j.appender.FILE.bufferedIO=false
+log4j.appender.FILE.maxBackupIndex=3
+log4j.appender.FILE.maxFileSize=10MB
+
+#
+# Example: enable trace logging from CONSOLE appender
+#
+#log4j.appender.CONSOLE.Threshold=TRACE#org.apache.geronimo.system.logging.log4j.XLevel
+
+#
+# Example: enable trace messages from foo.bar category
+#
+#log4j.category.foo.bar=TRACE#org.apache.geronimo.system.logging.log4j.XLevel

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/log/client-log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/log/client-log4j.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/log/client-log4j.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/log/server-log4j.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/log/server-log4j.properties?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/log/server-log4j.properties (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/log/server-log4j.properties Fri Aug  4 12:44:18 2006
@@ -0,0 +1,120 @@
+##
+## Copyright 2004 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.
+## 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.rootCategory=INFO, CONSOLE, FILE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=${org.apache.geronimo.log.ConsoleLogLevel}
+log4j.appender.CONSOLE.Target=System.out
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
+
+log4j.appender.FILE=org.apache.log4j.RollingFileAppender
+log4j.appender.FILE.threshold=DEBUG
+log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
+
+#
+# Note, changing log4j.appender.FILE.append=false will result in logs being
+# overwritten without archiving the previous version of the log.
+#
+log4j.appender.FILE.append=true
+log4j.appender.FILE.file=${org.apache.geronimo.server.dir}/var/log/geronimo.log
+log4j.appender.FILE.bufferedIO=false
+log4j.appender.FILE.maxBackupIndex=3
+log4j.appender.FILE.maxFileSize=10MB
+
+#
+# Example: enable trace logging from CONSOLE appender
+#
+#log4j.appender.CONSOLE.Threshold=TRACE#org.apache.geronimo.system.logging.log4j.XLevel
+
+#
+# Example: enable trace messages from foo.bar category
+#
+#log4j.category.foo.bar=TRACE#org.apache.geronimo.system.logging.log4j.XLevel
+
+#### Show key debug messages in the log ####
+log4j.category.org.apache.geronimo.gbean.runtime.GBeanSingleReference=DEBUG
+
+#### Eliminate any INFO level output during normal operation -- except the really relevant stuff ####
+#    We can change the Geronimo code to avoid this, but we have to just adjust the log levels for
+#    any third-party libraries.
+log4j.category.org.apache.commons.digester=ERROR
+log4j.category.org.apache.jasper.compiler.SmapUtil=WARN
+
+# ActiveMQ
+log4j.category.org.activemq.ActiveMQConnection=WARN
+log4j.category.org.activemq.store.jdbc.adapter.DefaultJDBCAdapter=WARN
+log4j.category.org.activemq.store.jdbc.JDBCPersistenceAdapter=WARN
+log4j.category.org.activemq.store.journal.JournalPersistenceAdapter=WARN
+log4j.category.org.activemq.broker.impl.BrokerContainerImpl=WARN
+log4j.category.org.activemq.broker.impl.BrokerConnectorImpl=WARN
+log4j.category.org.activemq.transport.tcp.TcpTransportChannel=ERROR
+log4j.category.org.activemq.transport.tcp.TcpTransportServerChannel=WARN
+log4j.category.org.activemq.transport.vm.VmTransportServerChannel=WARN
+
+# Don't need so much info on every web page that's rendered
+log4j.category.org.mortbay=INFO
+log4j.category.org.apache.pluto=INFO
+log4j.category.org.apache.jasper=INFO
+
+# Various Jetty startup/shutdown output
+log4j.category.org.mortbay.http.HttpServer=WARN
+log4j.category.org.mortbay.http.SocketListener=WARN
+log4j.category.org.mortbay.http.ajp.AJP13Listener=WARN
+log4j.category.org.mortbay.util.Container=WARN
+log4j.category.org.mortbay.util.Credential=WARN
+log4j.category.org.mortbay.util.ThreadedServer=WARN
+log4j.category.org.mortbay.jetty.servlet.WebApplicationContext=WARN
+log4j.category.org.mortbay.jetty.context=WARN
+
+# Various Tomcat startup output
+log4j.category.org.apache.catalina.realm.JAASRealm=WARN
+log4j.category.org.apache.catalina.realm.RealmBase=WARN
+log4j.category.org.apache.catalina.loader.WebappLoader=WARN
+log4j.category.org.apache.catalina.startup.Embedded=WARN
+log4j.category.org.apache.catalina.core.StandardEngine=WARN
+log4j.category.org.apache.catalina.core.StandardHost=WARN
+log4j.category.org.apache.jk.common.ChannelSocket=WARN
+log4j.category.org.apache.jk.server.JkMain=WARN
+log4j.category.org.apache.coyote.http11.Http11BaseProtocol=WARN
+log4j.category.org.apache.coyote.http11.Http11Protocol=WARN
+log4j.category.org.apache.catalina.core.ContainerBase=WARN
+log4j.category.org.apache.catalina.core.StandardContext=WARN
+
+# Emits a spurious WARN during startup on /some-path/* security mappings
+log4j.category.org.apache.catalina.deploy.SecurityCollection=ERROR
+
+# Prints the MBean Server ID
+log4j.category.javax.management.MBeanServerFactory=WARN
+
+# Prints the RMI connection URL
+log4j.category.javax.management.remote.rmi.RMIConnectorServer=WARN
+log4j.category.javax.management.remote.JMXServiceURL=WARN
+
+# Prints various stuff during startup
+log4j.category.org.apache.juddi.registry.RegistryServlet=WARN
+
+
+# Prints various stuff when the portal is used
+log4j.category.org.apache.pluto.portalImpl.Servlet=WARN
+# Prints stuff for AJAX calls
+log4j.category.uk.ltd.getahead.dwr.impl.DefaultConfiguration=WARN
+log4j.category.uk.ltd.getahead.dwr.impl.ExecuteQuery=WARN
+log4j.category.uk.ltd.getahead.dwr.util.Logger=WARN

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/log/server-log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/log/server-log4j.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/log/server-log4j.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/demo_groups.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/demo_groups.properties?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/demo_groups.properties (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/demo_groups.properties Fri Aug  4 12:44:18 2006
@@ -0,0 +1,22 @@
+##
+##
+##   Copyright 2004 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.
+##   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/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/demo_groups.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/demo_groups.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/demo_groups.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/demo_users.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/demo_users.properties?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/demo_users.properties (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/demo_users.properties Fri Aug  4 12:44:18 2006
@@ -0,0 +1,22 @@
+##
+##
+##   Copyright 2004 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.
+##   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/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/demo_users.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/demo_users.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/demo_users.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/groups.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/groups.properties?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/groups.properties (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/groups.properties Fri Aug  4 12:44:18 2006
@@ -0,0 +1 @@
+admin=system
\ No newline at end of file

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/groups.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/groups.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/groups.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/keystores/geronimo-default
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/keystores/geronimo-default?rev=428856&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/keystores/geronimo-default
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/users.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/users.properties?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/users.properties (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/users.properties Fri Aug  4 12:44:18 2006
@@ -0,0 +1 @@
+system=manager
\ No newline at end of file

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/users.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/users.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/users.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/temp/README.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/temp/README.txt?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/temp/README.txt (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/temp/README.txt Fri Aug  4 12:44:18 2006
@@ -0,0 +1,10 @@
+This temp directory is used by the JVM for temporary file storage.
+The JVM is configured to use this as its java.io.tmpdir in the
+geronimo.sh and geronimo.bat scripts.  Geronimo is configured to use
+this temporary directory rather than its default for security reasons.
+The temp directory must exist for Tomcat to work correctly.
+
+This file is also included in the distribution to prevent problems with users
+who download the zip or tar.gz distribution and extract it with WinZip.
+Some versions of WinZIP decide it is not necessary to create the directory 
+because it is empty.
\ No newline at end of file

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/temp/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/temp/README.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/temp/README.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/LICENSE.txt?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/LICENSE.txt (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/LICENSE.txt Fri Aug  4 12:44:18 2006
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/NOTICE.txt?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/NOTICE.txt (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/NOTICE.txt Fri Aug  4 12:44:18 2006
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/pom.xml?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/pom.xml (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/pom.xml Fri Aug  4 12:44:18 2006
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2006 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.
+    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.assemblies</groupId>
+        <artifactId>assemblies</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>geronimo-boilerplate-minimal</artifactId>
+    <name>Geronimo Assemblies :: Boilerplate Minimal</name>
+    <packaging>jar</packaging>
+    
+    <description>
+        Provides boilerplate files for all Geronimo minimal server (Little-G) assemblies.
+    </description>
+    
+    <!--
+    TODO: Move schema inclusion here, since most of it is common
+    -->
+    
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
+    
+</project>

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/README.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/README.txt?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/README.txt (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/README.txt Fri Aug  4 12:44:18 2006
@@ -0,0 +1,24 @@
+When Geronimo is started it will read a configuration XML file from this 
+var/config directory.  By default the config.xml file is read, but an
+alternative file can be used by setting the file name (relative to
+the var/config directory) in the org.apache.geronimo.config.file system 
+property.
+
+The configuration XML file lists the serialized modules in the 
+repository to be started.  For each module configured to be
+started in the config.xml file, Geronimo loads a serialized module
+from under the geronimo/repository directory.
+
+A module can be marked as not to be loaded by setting the "load" attribute
+to "false" on the "module" element for a module.
+
+A module may contain GBeans.  Individual GBeans in a module can be
+marked as not to be loaded by setting the "load" attribute to "false" on the
+"gbean" element for a GBean.
+
+Site specific information such as port numbers can be specified in GBean 
+attributes to override the values in the serialized module.
+
+Do not add comments to the config.xml file as the file is regenerated by 
+Geronimo when changes are made to Geronimo's configuration, therefore any
+comments added to this file will be lost.

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/README.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/README.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/client-log4j.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/client-log4j.properties?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/client-log4j.properties (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/client-log4j.properties Fri Aug  4 12:44:18 2006
@@ -0,0 +1,50 @@
+##
+## Copyright 2004 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.
+## 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.rootCategory=DEBUG, CONSOLE, FILE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=INFO
+log4j.appender.CONSOLE.Target=System.out
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
+
+log4j.appender.FILE=org.apache.log4j.RollingFileAppender
+log4j.appender.FILE.threshold=DEBUG
+log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
+
+#
+# Note, changing log4j.appender.FILE.append=false will result in logs being 
+# overwritten without archiving the previous version of the log.
+#
+log4j.appender.FILE.append=true
+log4j.appender.FILE.file=${org.apache.geronimo.server.dir}/var/log/client.log
+log4j.appender.FILE.bufferedIO=false
+log4j.appender.FILE.maxBackupIndex=3
+log4j.appender.FILE.maxFileSize=10MB
+
+#
+# Example: enable trace logging from CONSOLE appender
+#
+#log4j.appender.CONSOLE.Threshold=TRACE#org.apache.geronimo.system.logging.log4j.XLevel
+
+#
+# Example: enable trace messages from foo.bar category
+#
+#log4j.category.foo.bar=TRACE#org.apache.geronimo.system.logging.log4j.XLevel

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/client-log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/client-log4j.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/client-log4j.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message