geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r428856 [4/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
Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/server-log4j.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/server-log4j.properties?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/server-log4j.properties (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/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-minimal/src/main/resources/var/log/server-log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/demo_groups.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/demo_groups.properties?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/demo_groups.properties (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/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-minimal/src/main/resources/var/security/demo_groups.properties
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/demo_users.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/demo_users.properties?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/demo_users.properties (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/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-minimal/src/main/resources/var/security/demo_users.properties
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/groups.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/groups.properties?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/groups.properties (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/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-minimal/src/main/resources/var/security/groups.properties
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/keystores/geronimo-default
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/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-minimal/src/main/resources/var/security/keystores/geronimo-default
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/users.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/users.properties?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/users.properties (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/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-minimal/src/main/resources/var/security/users.properties
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/temp/README.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/temp/README.txt?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/temp/README.txt (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/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-minimal/src/main/resources/var/temp/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-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-jetty-j2ee/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/LICENSE.txt?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/LICENSE.txt (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-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-jetty-j2ee/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/NOTICE.txt?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/NOTICE.txt (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-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-jetty-j2ee/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/pom.xml?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/pom.xml (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/pom.xml Fri Aug  4 12:44:18 2006
@@ -0,0 +1,758 @@
+<?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-jetty-j2ee</artifactId>
+    <name>Geronimo Assemblies :: J2EE + Jetty</name>
+    <!--
+    
+    HACK:  See build/resources below...
+    
+    <packaging>pom</packaging>
+    -->
+    <packaging>jar</packaging>
+    
+    <description>
+        An assembly of Geronimo into a J2EE Server using Jetty as the web container.
+    </description>
+    
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-system</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>rmi-naming</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-security</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb</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.configs</groupId>
+            <artifactId>j2ee-corba</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>directory</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>ldap-realm</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <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>activemq-broker</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>activemq</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client-system</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client-security</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client-corba</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>javamail</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>hot-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>welcome-jetty</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>webconsole-jetty</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>remote-deploy-jetty</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>uddi-jetty</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>shutdown</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>sharedlib</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>online-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <!-- lib dependencies -->
+        
+        <dependency>
+            <groupId>cglib</groupId>
+            <artifactId>cglib-nodep</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-common</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-tool</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deployment</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j-remote</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>xpp3</groupId>
+            <artifactId>xpp3</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>xstream</groupId>
+            <artifactId>xstream</artifactId>
+        </dependency>
+        
+        <!-- endorsed -->
+        
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xmlParserAPIs</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-util</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-activation</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-axis</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-axis-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-client</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-client-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-core</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-derby</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-directory</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee-schema</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-jetty</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-jetty-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-jmx-remoting</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-mail</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-management</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-naming</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-security</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-security-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-timer</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-tomcat</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-transaction</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-web-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-webservices</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <resources>
+            <!--
+            
+            HACK: Because this is a pom packaging and assembly files/file is broke
+                  we need to filter with the resources plugin... and must be a jar packaging
+                  because for some %^&#ing reason maven-resources-plugin can not
+                  be attached!!!!
+            -->
+            <resource>
+                <directory>${pom.basedir}/src/main/var/config</directory>
+                <includes>
+                    <include>config.xml</include>
+                    <include>offline-deployer-list</include>
+                </includes>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>dependency-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-boilerplate</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.assemblies</groupId>
+                                    <artifactId>geronimo-boilerplate-j2ee</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${project.build.directory}/boilerplate</outputDirectory>
+                        </configuration>
+                    </execution>
+                    
+                    <!--
+                    
+                    TODO: Move scripts to boilerplate
+                    
+                    -->
+                    <execution>
+                        <id>unpack-scripts</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-scripts</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${project.build.directory}/scripts</outputDirectory>
+                        </configuration>
+                    </execution>
+                    
+                    <execution>
+                        <id>unpack-schemas</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-axis-builder</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-client-builder</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-connector-builder</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-j2ee-builder</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-naming-builder</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-security-builder</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-service-builder</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-jetty-builder</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-web-builder</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-j2ee-builder</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>pre-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <!-- Flatten all schemas -->
+                                <mkdir dir="${project.build.directory}/schema"/>
+                                <copy todir="${project.build.directory}/schema">
+                                    <fileset dir="${project.build.directory}/scratch/schema">
+                                        <include name="**/*.xsd"/>
+                                        <include name="**/*.dtd"/>
+                                    </fileset>
+                                    <mapper type="flatten"/>
+                                </copy>
+                                
+                                <!-- Move filtered files -->
+                                <move todir="${project.build.directory}/scratch">
+                                    <fileset dir="${project.build.directory}/classes">
+                                        <include name="config.xml"/>
+                                        <include name="offline-deployer-list"/>
+                                    </fileset>
+                                </move>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>installConfig</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>bin</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attached</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>${pom.basedir}/src/main/assembly/bin.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>

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

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

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

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml Fri Aug  4 12:44:18 2006
@@ -0,0 +1,185 @@
+<?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$ -->
+
+<assembly>
+    <id>bin</id>
+    
+    <formats>
+        <format>zip</format>
+        <format>tar.gz</format>
+        
+        <!--
+        
+        HACK: Turn off bz2 for now, it takes too long to generate.
+        
+        <format>tar.bz2</format>
+        -->
+    </formats>
+
+    <includeBaseDirectory>true</includeBaseDirectory>
+
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>lib</outputDirectory>
+            <includes>
+                <include>cglib:cglib-nodep</include>
+                <include>commons-cli:commons-cli</include>
+                <include>commons-logging:commons-logging</include>
+                <include>concurrent:concurrent</include>
+                <include>org.apache.geronimo.modules:geronimo-common</include>
+                <include>org.apache.geronimo.modules:geronimo-deploy-jsr88</include>
+                <include>org.apache.geronimo.modules:geronimo-deploy-tool</include>
+                <include>org.apache.geronimo.modules:geronimo-deployment</include>
+                <include>org.apache.geronimo.modules:geronimo-kernel</include>
+                <include>org.apache.geronimo.modules:geronimo-system</include>
+                <include>org.apache.geronimo.modules:geronimo-util</include>
+                <include>org.apache.geronimo.specs:geronimo-qname_1.1_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-j2ee-deployment_1.1_spec</include>
+                <include>log4j:log4j</include>
+                <include>mx4j:mx4j</include>
+                <include>mx4j:mx4j-remote</include>
+                <include>xpp3:xpp3</include>
+                <include>xstream:xstream</include>
+            </includes>
+        </dependencySet>
+        
+        <dependencySet>
+            <outputDirectory>lib/endorsed</outputDirectory>
+            <includes>
+                <include>xerces:xercesImpl</include>
+                <include>xerces:xmlParserAPIs</include>
+            </includes>
+        </dependencySet>
+        
+        <dependencySet>
+            <outputDirectory>bin</outputDirectory>
+            <outputFileNameMapping>server.jar</outputFileNameMapping>
+            <includes>
+                <include>org.apache.geronimo.configs:j2ee-system</include>
+            </includes>
+        </dependencySet>
+        
+        <dependencySet>
+            <outputDirectory>bin</outputDirectory>
+            <outputFileNameMapping>client.jar</outputFileNameMapping>
+            <includes>
+                <include>org.apache.geronimo.configs:client-system</include>
+            </includes>
+        </dependencySet>
+        
+        <dependencySet>
+            <outputDirectory>bin</outputDirectory>
+            <outputFileNameMapping>deployer.jar</outputFileNameMapping>
+            <includes>
+                <include>org.apache.geronimo.configs:online-deployer</include>
+            </includes>
+        </dependencySet>
+        
+        <dependencySet>
+            <outputDirectory>bin</outputDirectory>
+            <outputFileNameMapping>shutdown.jar</outputFileNameMapping>
+            <includes>
+                <include>org.apache.geronimo.configs:shutdown</include>
+            </includes>
+        </dependencySet>
+        
+        <dependencySet>
+            <outputDirectory>bin</outputDirectory>
+            <outputFileNameMapping>upgrade.jar</outputFileNameMapping>
+            <includes>
+                <include>org.apache.geronimo.configs:upgrade-cli</include>
+            </includes>
+        </dependencySet>
+    </dependencySets>
+
+    <fileSets>
+        <fileSet>
+            <directory>target/boilerplate</directory>
+            <outputDirectory>/</outputDirectory>
+            <excludes>
+                <exclude>META-INF/**</exclude>
+            </excludes>
+        </fileSet>
+        
+        <!-- Include previously installed CAR files -->
+        <fileSet>
+            <directory>target/archive-tmp/repository</directory>
+            <outputDirectory>repository</outputDirectory>
+            <excludes>
+                <exclude>**/META-INF/maven/**</exclude>
+                <exclude>**/*.pom</exclude>
+                <exclude>**/*.sha1</exclude>
+                <exclude>**/*.md5</exclude>
+            </excludes>
+        </fileSet>
+        
+        <fileSet>
+            <directory>target/schema</directory>
+            <outputDirectory>schema</outputDirectory>
+            <includes>
+                <include>**/*.xsd</include>
+                <include>**/*.dtd</include>
+            </includes>
+            <lineEnding>dos</lineEnding>
+        </fileSet>
+        
+        <fileSet>
+            <directory>target/scripts</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>**/*.sh</include>
+            </includes>
+            <lineEnding>unix</lineEnding>
+            <fileMode>0755</fileMode>
+        </fileSet>
+        
+        <fileSet>
+            <directory>target/scripts</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>**/*.bat</include>
+                <include>*.txt</include>
+            </includes>
+            <lineEnding>dos</lineEnding>
+        </fileSet>
+        
+        <fileSet>
+            <directory>src/main/var</directory>
+            <outputDirectory>var</outputDirectory>
+        </fileSet>
+        
+        <fileSet>
+            <directory>target/scratch</directory>
+            <outputDirectory>var/config</outputDirectory>
+            <includes>
+                <include>offline-deployer-list</include>
+            </includes>
+        </fileSet>
+        
+        <fileSet>
+            <directory>target/scratch</directory>
+            <outputDirectory>var/config</outputDirectory>
+            <fileMode>0644</fileMode>
+            <includes>
+                <include>config.xml</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+
+</assembly>

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml Fri Aug  4 12:44:18 2006
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ======================================================== -->
+<!-- Warning - This XML file is re-generated by Geronimo when -->
+<!-- changes are made to Geronimo's configuration, therefore  -->
+<!-- any comments added to this file will be lost.            -->
+<!-- ======================================================== -->
+
+<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
+
+    <module name="org.apache.geronimo.configs/rmi-naming/${pom.version}/car">
+        <gbean name="RMIRegistry">
+            <attribute name="port">${PlanNamingPort}</attribute>
+        </gbean>
+        <gbean name="NamingProperties">
+            <!-- Check whether this really works if host name is 0.0.0.0 -->
+            <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
+        </gbean>
+        <gbean name="DownloadedPluginRepos">
+          <attribute name="repositoryList">http://people.apache.org/~ammulder/plugin-repository-list-1.2.txt</attribute>
+          <attribute name="userRepositories">[]</attribute>
+        </gbean>
+    </module>
+    
+    <module name="org.apache.geronimo.configs/j2ee-server/${pom.version}/car">
+    </module>
+    
+    <module name="org.apache.geronimo.configs/j2ee-security/${pom.version}/car">
+        <gbean name="JaasLoginServiceRemotingServer">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanRemoteLoginPort}</attribute>
+        </gbean>
+        <gbean name="JMXService">
+            <attribute name="protocol">rmi</attribute>
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanJMXPort}</attribute>
+            <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
+        </gbean>
+    </module>
+    
+    <module name="org.apache.geronimo.configs/axis/${pom.version}/car"/>
+    
+    <module name="org.apache.geronimo.configs/openejb/${pom.version}/car">
+        <gbean name="EJBNetworkService">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanOpenEJBPort}</attribute>
+        </gbean>
+    </module>
+    
+    <module name="org.apache.geronimo.configs/j2ee-corba/${pom.version}/car" load="false">
+        <gbean name="NameServer">
+            <attribute name="dbDir">var/cosnaming.db</attribute>
+            <attribute name="port">${PlanCOSNamingPort}</attribute>
+        </gbean>
+        <gbean name="Server">
+            <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
+        </gbean>
+        <gbean name="UnprotectedServer">
+            <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
+        </gbean>
+    </module>
+    
+    <module name="org.apache.geronimo.configs/system-database/${pom.version}/car">
+        <gbean name="DerbyNetwork">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanDerbyPort}</attribute>
+        </gbean>
+    </module>
+    
+    <module name="org.apache.geronimo.configs/activemq-broker/${pom.version}/car">
+        <gbean name="ActiveMQ.tcp.default">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanActiveMQPort}</attribute>
+        </gbean>
+    </module>
+    
+    <module name="org.apache.geronimo.configs/activemq/${pom.version}/car"/>
+    
+    <module name="org.apache.geronimo.configs/jetty/${pom.version}/car">
+        <gbean name="JettyWebConnector">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanHTTPPortPrimary}</attribute>
+            <attribute name="redirectPort">${PlanHTTPSPortPrimary}</attribute>
+        </gbean>
+        <gbean name="JettySSLConnector">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
+        </gbean>
+        <gbean name="JettyAJP13Connector">
+            <attribute name="host">0.0.0.0</attribute>
+            <attribute name="port">8009</attribute>
+        </gbean>
+    </module>
+    
+    <!--
+    
+    NOTE: n.b. be sure the gbean deployer is explicitly loaded before j2ee-deployer 
+          so that defaultEnvironment overrides work properly
+    -->
+    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car"/>
+    
+    <module name="org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car">
+        <gbean name="WebBuilder">
+            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1</attribute>
+        </gbean>
+    </module>
+    
+    <module name="org.apache.geronimo.configs/openejb-deployer/${pom.version}/car">
+        <gbean name="EJBBuilder">
+            <attribute name="listener">?name=JettyWebContainer</attribute>
+        </gbean>
+    </module>
+    
+    <module name="org.apache.geronimo.configs/client-deployer/${pom.version}/car"/>
+    
+    <module name="org.apache.geronimo.configs/axis-deployer/${pom.version}/car"/>
+    
+    <module name="org.apache.geronimo.configs/javamail/${pom.version}/car" load="false">
+        <gbean name="SMTPTransport">
+            <attribute name="host">localhost</attribute>
+            <attribute name="port">25</attribute>
+        </gbean>
+    </module>
+    
+    <module name="org.apache.geronimo.configs/sharedlib/${pom.version}/car">
+        <gbean name="SharedLib">
+            <attribute name="classesDirs">var/shared/classes</attribute>
+            <attribute name="libDirs">var/shared/lib</attribute>
+        </gbean>
+    </module>
+
+    <module name="org.apache.geronimo.configs/jetty-deployer/${pom.version}/car"/>
+    
+    <module name="org.apache.geronimo.configs/welcome-jetty/${pom.version}/car"/>
+    
+    <module name="org.apache.geronimo.configs/webconsole-jetty/${pom.version}/car"/>
+    
+    <module name="org.apache.geronimo.configs/uddi-jetty/${pom.version}/car" load="false"/>
+    
+    <module name="org.apache.geronimo.configs/remote-deploy-jetty/${pom.version}/car"/>
+    
+    <!--
+    <module name="org.apache.geronimo.configs/hot-deployer/${pom.version}/car"/>
+    -->
+    
+</attributes>

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/offline-deployer-list
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/offline-deployer-list?rev=428856&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/offline-deployer-list (added)
+++ geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/offline-deployer-list Fri Aug  4 12:44:18 2006
@@ -0,0 +1,9 @@
+##
+## List of deployers to be started for offline deployment
+##
+org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car
+org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car
+org.apache.geronimo.configs/openejb-deployer/${pom.version}/car
+org.apache.geronimo.configs/client-deployer/${pom.version}/car
+org.apache.geronimo.configs/axis-deployer/${pom.version}/car
+org.apache.geronimo.configs/jetty-deployer/${pom.version}/car

Propchange: geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-minimal/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug  4 12:44:18 2006
@@ -0,0 +1,2 @@
+target
+velocity*



Mime
View raw message