geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r953283 [4/5] - in /geronimo/server/trunk: ./ framework/ framework/configs/karaf-framework/src/main/distribution/instance/var/log/ framework/configs/karaf-framework/src/main/distribution/text/ framework/configs/karaf-framework/src/main/dist...
Date Thu, 10 Jun 2010 11:35:18 GMT
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/NOTICE?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/NOTICE (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/NOTICE Thu Jun 10 11:35:16 2010
@@ -1,97 +1,34 @@
-=========================================================================
-==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-==  Version 2.0, in this case for the Apache Geronimo distribution.    ==
-=========================================================================
-
-Apache Geronimo 
-Copyright 2003-2008 The Apache Software Foundation
+Apache Geronimo
+Copyright 2003-2010 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
+Portions of the Web Console were orginally developed by International
+Business Machines Corporation and are licensed to the Apache Software
+Foundation under the "Software Grant and Corporate Contribution
+License Agreement", informally known as the "IBM Console CLA".
 
-=========================================================================
-==  Apache Geronimo Web Console Notice                                 ==
-=========================================================================
-
-Portions of the Web Console were orginally developed by International 
-Business Machines Corporation and are licensed to the Apache Software 
-Foundation under the "Software Grant and Corporate Contribution License 
-Agreement", informally known as the "IBM Console CLA".
-
+Portions of the ASN1 codec implementation in
+framework/modules/geronimo-crypto/ were developed by the Bouncy Castle
+project (http://www.bouncycastle.org/).
 
-=========================================================================
-==  Bouncy Castle Notice                                               ==
-=========================================================================
-
-This product includes software (the ASN1 codec implementation in 
-geronimo-crypto) developed by the Bouncy Castle project. 
-(http://www.bouncycastle.org/)
-
-Copyright (c) 2000-2005 
+Copyright (c) 2000-2005
 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
 
-=========================================================================
-==  W3C¨ SOFTWARE NOTICE AND LICENSE                                   ==
-=========================================================================
-Copyright © 1994-2002 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
-
-This W3C work (including software, documents, or other related items) is being provided by the copyright holders under the following license. By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions:
-
-Permission to use, copy, modify, and distribute this software and its documentation, with or without modification,  for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications, that you make:
-
-   1. The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
-   2. Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, a short notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed or derivative code: "Copyright © [$date-of-software] World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/"
-   3. Notice of any changes or modifications to the W3C files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-
-The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
-
-
-#########################################################################
-## APACHE GERONIMO DEPENDENCIES                                        ##
-#########################################################################
-
-A binary distribution of Apache Geronimo, or an Apache Geronimo server 
-which is built from source, includes a number of dependent packages 
-with separate copyright notices and license terms. The following notices
-apply to these dependencies.
-
-=========================================================================
-==  ANNOGEN Notice                                                     ==
-=========================================================================
-
-This product includes software developed by the Annogen project 
-(http://annogen.codehaus.org/)
-
-This software consists of voluntary contributions made by many
-individuals on behalf of the Apache Software Foundation and was
-originally based on software copyright (c) 2000-2004 BEA Systems 
-Inc., <http://www.bea.com/>. For more information on the Apache 
-Software Foundation, please see <http://www.apache.org/>.
-
-=========================================================================
-==  Apache ActiveMQ Notice                                             ==
-=========================================================================
-
-Copyright 2005-2007 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
+ORB Portions of this software were developed at IONA Technologies.
 
+Object Management Group (OMG) classes used by the orb.
+The original classes are available from www.org.omg.
 
-=========================================================================
-==  Apache Ant Notice                                                  ==
-=========================================================================
+The RMI over IIOP implementation were developed at Trifork Technologies.
 
-Apache Ant
-Copyright 1999-2006 The Apache Software Foundation
+Copyright 2004-2009 Tranql project committers
+This product includes software developed at
+Tranql (http://tranql.codehaus.org/).
 
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed by the Protocol Buffers
+project (http://code.google.com/apis/protocolbuffers).
 
 This product includes also software developed by :
   - the W3C consortium (http://www.w3c.org) ,
@@ -101,155 +38,42 @@ The <sync> task is based on code Copyrig
 Graphics Corp that has been kindly donated to the Apache Software
 Foundation.
 
+Portions of this software were originally based on the following:
+  - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+  - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+  - voluntary contributions made by Paul Eng on behalf of the
+    Apache Software Foundation that were originally developed at iClick, Inc.,
+    software copyright (c) 1999.
 
-=========================================================================
-==  Apache Axiom Notice                                                ==
-=========================================================================
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-Portions Copyright 2006 International Business Machines Corp.
-
-
-=========================================================================
-==  Apache Commons BeanUtils Notice                                    ==
-=========================================================================
 
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
 Portions Copyright 2006 International Business Machines Corp.
+Portions Copyright 2005-2007 WSO2, Inc.
 
+This product also includes schemas and specification developed by:
+- the W3C consortium (http://www.w3c.org)
 
-=========================================================================
-==  Apache Commons BeanUtils                                           ==
-=========================================================================
-
-Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
-reserved.
-
-
-=========================================================================
-==  Apache Commons CLI Notice                                          ==
-=========================================================================
-
-This product includes software developed by the Apache Software
-Foundation (http://www.apache.org/).
-
-Copyright (c) 1999-2001 The Apache Software Foundation.  All rights
-reserved.
-
-
-=========================================================================
-==  Apache Commons Lang Notice                                         ==
-=========================================================================
-
-This product includes software developed by the Apache Software
-Foundation (http://www.apache.org/).
-
-Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
-reserved.
-
-
-=========================================================================
-==  Apache Commons XML Resolver                                        ==
-=========================================================================
-
-This product includes software developed by the Apache Software
-Foundation (http://www.apache.org/).
-
-Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
-reserved.
-
-
-=========================================================================
-==  Apache CXF                                                         ==
-=========================================================================
-
-Apache CXF
-Copyright 2006-2007 Apache Software Foundation
-
-This product includes software developed at
-Apache Software Foundation (http://www.apache.org/).
-
-This product includes/uses software, Web Services Metadata 2.0 (http://geronimo.apache.org/specs/geronimo-ws-metadata_2.0_spec),
-developed by Apache Software Foundation  (http://www.apache.org)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, AOP alliance (http://aopalliance.sourceforge.net)
-License: Public Domain 
-
-This product includes/uses software, Logging (http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/),
-developed by The Apache Software Foundation  (http://jakarta.apache.org)
-License: The Apache Software License, Version 2.0  (/LICENSE.txt)
-
-This product includes/uses software, Woodstox (http://woodstox.codehaus.org),
-developed by Codehaus  (http://www.codehaus.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Activation 1.1 (http://geronimo.apache.org/specs/geronimo-activation_1.1_spec),
-developed by Apache Software Foundation  (http://www.apache.org)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Spring Framework: Core (http://www.springframework.org),
-developed by Spring Framework  (http://www.springframework.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Lang (http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/),
-developed by The Apache Software Foundation  (http://jakarta.apache.org)
-License: The Apache Software License, Version 2.0  (/LICENSE.txt)
-
-This product includes/uses software, StAX API (http://stax.codehaus.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, WSDL4J (http://sf.net/projects/wsdl4j)
-License: CPL  (http://www.opensource.org/licenses/cpl1.0.txt)
-
-This product includes/uses software, Neethi,
-developed by The Apache Software Foundation  (http://www.apache.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Java Architecture for XML Binding (JAXB API),
-developed by Sun Microsystems  (http://www.sun.com/)
-License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0  (http://www.sun.com/cddl/cddl.html)
-
-This product includes/uses software, XmlSchema (http://ws.apache.org/commons/XmlSchema),
-developed by Apache Software Foundation  (http://www.apache.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, XML Commons Resolver Component (http://xml.apache.org/commons/components/resolver/),
-developed by Apache Software Foundation  (http://www.apache.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Apache CXF Common Utilities (http://cwiki.apache.org/CXF),
-developed by Apache Software Foundation  (http://www.apache.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Spring Framework: Beans (http://www.springframework.org),
-developed by Spring Framework  (http://www.springframework.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Annotation 1.0 (http://geronimo.apache.org/specs/geronimo-annotation_1.0_spec),
-developed by Apache Software Foundation  (http://www.apache.org)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Apache CXF Common Schemas (http://cwiki.apache.org/CXF/cxf-common-schemas),
-developed by Apache Software Foundation  (http://www.apache.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Spring Framework: Context (http://www.springframework.org),
-developed by Spring Framework  (http://www.springframework.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-
-=========================================================================
-==  Apache Derby Notice                                                ==
-=========================================================================
-
-Apache Derby
-Copyright 2004-2006 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
+This product also includes WS-* schemas developed by International
+Business Machines Corporation, Microsoft Corporation, BEA Systems,
+TIBCO Software, SAP AG, Sonic Software, and VeriSign
+
+This product also includes a WSDL developed by salesforce.com
+- Copyright 1999-2006 salesforce.com, inc.
+
+Portions of the included xmlbeans library were originally based on the following:
+- software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
+
+This product also includes schemas and specification developed by:
+      - the W3C consortium (http://www.w3c.org)
+      (http://www.w3.org/XML/1998/namespace)
+
+This product also includes WS-* schemas developed by International
+   Business Machines Corporation, Microsoft Corporation, BEA Systems,
+   TIBCO Software, SAP AG, Sonic Software, and VeriSign
+   (http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd)
+   (http://schemas.xmlsoap.org/ws/2004/08/addressing/)
+   (http://schemas.xmlsoap.org/wsdl/http)
+   (http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm.xsd)
+   (http://www.w3.org/2005/08/addressing/ws-addr.xsd)
 
 Portions of Derby were originally developed by
 International Business Machines Corporation and are
@@ -262,93 +86,35 @@ and are placed here unaltered.
 
 (C) Copyright 1997,2004 International Business Machines Corporation.  All rights reserved.
 
-(C) Copyright IBM Corp. 2003. 
+(C) Copyright IBM Corp. 2003.
 
-The portion of the functionTests under 'nist' was originally 
-developed by the National Institute of Standards and Technology (NIST), 
+The portion of the functionTests under 'nist' was originally
+developed by the National Institute of Standards and Technology (NIST),
 an agency of the United States Department of Commerce, and adapted by
 International Business Machines Corporation in accordance with the NIST
 Software Acknowledgment and Redistribution document at
 http://www.itl.nist.gov/div897/ctg/sql_form.htm
 
+* OpenJPA includes software written by Miroslav Nachev.
 
-=========================================================================
-==  Apache Geronimo Gshell Notice                                      ==
-=========================================================================
+* OpenJPA uses test code written by Charles Tillman.
 
-Apache Geronimo
-Copyright 2007 The Apache Software Foundation
-
-
-=========================================================================
-==  Apache MyFaces Notice                                              ==
-=========================================================================
-
-This software includes Sun's web-facesconfig.dtd files 
-(see http://java.sun.com/dtd/).
-
-
-=========================================================================
-==  Apache OpenEJB Notice                                              ==
-=========================================================================
-
-Apache OpenEJB
-Copyright 1999-2008 The Apache OpenEJB development community
-
-
-=========================================================================
-==  Apache OpenJPA Notice                                              ==
-=========================================================================
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-COPYRIGHT NOTICES
-
-* OpenJPA includes software developed by the SERP project
-    Copyright (c) 2002-2006, A. Abram White. All rights reserved.
+XMLSec was originally based on software copyright (c) 2001, Institute for
+Data Communications Systems, <http://www.nue.et-inf.uni-siegen.de/>.
 
-* OpenJPA is bundled with the binaries from the JPA specification, by
-    Sun Microsystems and licensed under the CDDL 1.0. The source code is
-    available at: https://glassfish.dev.java.net/source/browse/glassfish/
+The development of XMLSec was partly funded by the European
+Commission in the <WebSig> project in the ISIS Programme.
 
+This product also includes software developed by :
 
-=========================================================================
-==  Apache Scout                                                       ==
-=========================================================================
+  - IBM Corporation (http://www.ibm.com),
+      WSDL4J was the initial code contribution for the Apache Woden
+      project and some of the WSDL4J design and code has been reused.
+  - The W3C Consortium (http://www.w3c.org),
+      Common W3C XML Schema and DTD files are packaged with Apache Woden.
 
-This product includes software developed by the Apache Software
-Foundation (http://www.apache.org/).
-
-Copyright 2001-2004 The Apache Software Foundation.
-
-
-=========================================================================
-==  Apache Tomcat Notice                                               ==
-=========================================================================
-
-Java compilation software for JSP pages is provided by Eclipse, 
-which is open source software.  The orginal software and 
-related infomation is available at
-http://www.eclipse.org.
-
-
-=========================================================================
-==  Apache WS Commons Notice                                           ==
-=========================================================================
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
 Portions Copyright 2006 International Business Machines Corp.
 
-
-=========================================================================
-==  Apache XmlBeans Notice                                             ==
-=========================================================================
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
 Portions of this software were originally based on the following:
   - software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
 
@@ -371,320 +137,79 @@ software also includes:
  - JSR-173 Streaming API for XML from http://sourceforge.net/projects/xmlpullparser/,
    Copyright 2005 BEA under the terms of the Apache Software License 2.0
 
+This product includes software developed by the Simple XML Compiler (SXC)
+project (http://sxc.codehaus.org/project-info.html)
 
-=========================================================================
-==  Apache Yoko Notice                                                 ==
-=========================================================================
-
-Apache Yoko Project
-Copyright 1999-2006 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-ORB Portions of this software were developed at IONA Technologies.
-   
-Object Management Group (OMG) classes used by the orb.
-The original classes are available from www.org.omg.
-
-The RMI over IIOP implementation were developed at Trifork Technologies.
-
-
-=========================================================================
-==  ASM Notice                                                         ==
-=========================================================================
-
-Copyright (c) 2000-2005 INRIA, France Telecom
-All rights reserved.
-
-=========================================================================
-==  AspectJ Notice                                                     ==
-=========================================================================
-
-This product includes software developed by
-  the Eclipse Foundation (http://www.eclipse.org/).
-
-AspectJ source code can be obtained from the AspectJ web site
-  http://www.eclipse.org/aspectj/
-
-
-=========================================================================
-==  Backport Util Concurrent Notice                                    ==
-=========================================================================
-
-The backport-util-concurrent software has been released to the public domain, 
-as explained at: http://creativecommons.org/licenses/publicdomain.
-
-Acknowledgements: backport-util-concurrent is based in large part on the public 
-domain sources from: 
-1) JSR166, 
-2) package dl.util.concurrent,
-3) Doug Lea's "collections" package.
-
-
-=========================================================================
-==  Castor Notice                                                      ==
-=========================================================================
-
-Copyright 2004-2005 Werner Guttmann
-
-This product includes software developed by the Exolab project.
-((http://www.exolab.org/)
-
-Copyright 1999-2004 (C) Intalio Inc., and others. All Rights Reserved..
-
-
-=========================================================================
-==  Dojo Notice                                                        ==
-=========================================================================
-
-Copyright (c) 2004-2006, The Dojo Foundation, All Rights Reserved
-
-
-=========================================================================
-==  Howl Notice                                                        ==
-=========================================================================
-
-Copyright (c) 2004, Bull S.A.
-All rights reserved.
-
-
-=========================================================================
-==  jaxen  Notice                                                      ==
-=========================================================================
-
-This product includes software developed by the jaxen project
-(http://jaxen.org/). 
-
- Copyright 2003-2006 The Werken Company. All Rights Reserved.
-
-=========================================================================
-==  JDBM Notice                                                        ==
-=========================================================================
-
-This product includes software developed by the JDBM Project 
-(http://jdbm.sourceforge.net/).
-
-Copyright 2000 (C) Cees de Groot. All Rights Reserved.
-Contributions are Copyright (C) 2000 by their associated contributors.
-
-
-=========================================================================
-==  JDOM Notice                                                        ==
-=========================================================================
-
-This product includes software developed by the JDOM Project 
-(http://www.jdom.org/).
-
-Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
- All rights reserved.
-
-
-=========================================================================
-==  Jetty Notice                                                       ==
-=========================================================================
-
-==============================================================
- Jetty Web Container 
- Copyright 1995-2006 Mort Bay Consulting Pty Ltd
-==============================================================
-
-This product includes software developed at The Apache Software Foundation
-(http://www.apache.org/).
-
-The UnixCrypt.java code ~Implements the one way cryptography used by
-Unix systems for simple password protection.  Copyright 1996 Aki Yoshida,
-modified April 2001  by Iris Van den Broeke, Daniel Deville.
-
-The default JSP implementation is provided by the Glassfish JSP engine
-from project Glassfish http://glassfish.dev.java.net.  Copyright 2005
-Sun Microsystems, Inc. and portions Copyright Apache Software Foundation.
-
-Some portions of the code are Copyright:
-  2006 Tim Vernum 
-  1999 Jason Gilbert.
-
-=========================================================================
-==  JLine Notice                                                       ==
-=========================================================================
-
-Copyright (c) 2002-2006, Marc Prud'hommeaux <mwp1@cornell.edu>
-All rights reserved.
-
-
-=========================================================================
-==  SAAJ Notice                                                        ==
-=========================================================================
-
-=========================================================================
-==  OGNL Notice                                                        ==
-=========================================================================
-
-This product includes software developed by the OpenSymphony Group 
-(http://www.opensymphony.com/).
-
-Copyright (c) 2001-2004 The OpenSymphony Group. All rights reserved.
-
-=========================================================================
-==  Plexus Notice                                                      ==
-=========================================================================
-
-This product includes software developed by the Plexus project
-(http://plexus.codehaus.org/)
-
-The source code for the Plexus project can be downloaded from:
-
-http://plexus.codehaus.org/source-repository.html
-
-
-=========================================================================
-==  Serp Notice                                                        ==
-=========================================================================
-
-Copyright (c) 2002, A. Abram White
-All rights reserved.
-
-
-=========================================================================
-==  SL4J Notice                                                        ==
-=========================================================================
-
-Copyright (c) 2004-2005 SLF4J.ORG
-Copyright (c) 2004-2005 QOS.ch
-All rights reserved.
-
-
-=========================================================================
-==  Sun CDDL Notice                                                    ==
-=========================================================================
-
-This product includes software developed for the JAXB Reference 
-Implementation project. (https://jaxb.dev.java.net/)
-
-This product includes software developed for Java API for XML Web Services
-project (JAX-WS) (https://jax-ws.dev.java.net/)
-
-This product includes software developed for the Java Server Pages Tag 
-Library project (https://jstl.dev.java.net/)
+This product includes software developed for the JAXB Reference
+Implementation project. (https://jaxb.dev.java.net/).  Apache Geronimo elects
+to include this software in this distribution under the CDDL license.
 
 This product includes software developed for SOAP with Attachments
-API for Java (SAAJ). The software is available from the GlassFish project 
-(https://saaj.dev.java.net/)
-
-
-=========================================================================
-==  WADI Notice                                                        ==
-=========================================================================
-
-This product includes software developed by the WADI project
-(http://wadi.codehaus.org/)
-
-
-=========================================================================
-==  Spring Notice                                                      ==
-=========================================================================
-
-This product also includes software developed by Spring Framework
-Project (http://www.springframework.org)
-
-This product includes software developed by
-the Apache Software Foundation (http://www.apache.org).
-
-This product also includes software developed by
-Clinton Begin (http://www.ibatis.com).
+API for Java (SAAJ). The software is available from the GlassFish project
+(https://saaj.dev.java.net/).  Apache Geronimo elects to include this
+software in this distribution under the CDDL license.
 
-The end-user documentation included with a redistribution, if any,
-must include the following acknowledgement:
-
-"This product includes software developed by the Spring Framework
-Project (http://www.springframework.org)."
-
-Alternately, this acknowledgement may appear in the software itself,
-if and wherever such third-party acknowledgements normally appear.
-
-The names "Spring" and "Spring Framework" must not be used to
-endorse or promote products derived from this software without
-prior written permission. For written permission, please contact
-rod.johnson@interface21.com or juergen.hoeller@interface21.com.
-
-
-=========================================================================
-==  W3C DOM Notice                                                     ==
-=========================================================================
-
-Copyright (c) 2000 World Wide Web Consortium, (Massachusetts Institute
-of Technology, Institut National de Recherche en Informatique et en
-Automatique, Keio University). All Rights Reserved.
-
-The DOM bindings are published under the W3C Software Copyright Notice
-and License. The software license requires "Notice of any changes or
-modifications to the W3C files, including the date changes were made."
-Consequently, modified versions of the DOM bindings must document that
-they do not conform to the W3C standard; in the case of the IDL
-binding, the pragma prefix can no longer be 'w3c.org'; in the case of
-the Java binding, the package names can no longer be in the 'org.w3c'
-package.
-
-Note: The original version of the W3C Software Copyright Notice and
-License could be found at
-http://www.w3.org/Consortium/Legal/copyright-software-19980720
-
-Copyright (c) 1994-2000 World Wide Web Consortium, (Massachusetts
-Institute of Technology, Institut National de Recherche en
-Informatique et en Automatique, Keio University). All Rights
-Reserved. http://www.w3.org/Consortium/Legal/
-
-
-=========================================================================
-==  Woodstox Notice                                                    ==
-=========================================================================
-
-This product currently only contains code developed by authors
-of specific components, as identified by the source code files.
-
-Since product implements StAX API, it has dependencies to StAX API
-classes.
-
-For additional credits (generally to people who reported problems)
-see CREDITS file.
-
-
-=========================================================================
-==  W3C Software Notice                                                ==
-=========================================================================
-
-Copyright (c) 1994-2002 World Wide Web Consortium, (Massachusetts
-Institute of Technology, Institut National de Recherche en
-Informatique et en Automatique, Keio University). All Rights
-Reserved. http://www.w3.org/Consortium/Legal/
-
-
-=========================================================================
-==  WSDL4J Notice                                                      ==
-=========================================================================
-
-The Program includes all or portions of the following software which is 
-subject to the Common Public License ("CPL Code").  This software 
-consists of voluntary contributions made by many individuals on behalf of
-the WSDL4J project.
-
-You may download the source version of the WSDL4J component at 
-http://sourceforge.net/projects/wsdl4j
-
-
-=========================================================================
-==  XPP3 Notice                                                        ==
-=========================================================================
-
-This product includes software developed by the Indiana University 
-  Extreme! Lab (http://www.extreme.indiana.edu/).
-
-Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.
+This product includes software developed for Java API for XML Web Services
+project (JAX-WS) (https://jax-ws.dev.java.net/).  Apache Geronimo elects
+to include this software in this distribution under the CDDL license.
 
+This product includes software developed for the Java Server Pages Tag
+Library project (https://jstl.dev.java.net/).   Apache Geronimo elects
+to include this software in this distribution under the CDDL license.
+
+This product includes schema files developed for the Glassfish Java EE
+reference implementation (http://java.sun.com/xml/ns/j2ee/).
+Apache Geronimo elects to include this software in this distribution
+under the CDDL license.  You can obtain a copy of the License at:
+    https://glassfish.dev.java.net/public/CDDL+GPL.html
+The source code is available at:
+    https://glassfish.dev.java.net/source/browse/glassfish/
+
+The following schemas are included:
+
+===========================
+  application-client_1_4.xsd
+  application_1_4.xsd
+  connector_1_5.xsd
+  datatypes.dtd
+  ejb-jar_2_1.xsd
+  j2ee_1_4.xsd
+  j2ee_jaxrpc_mapping_1_1.xsd
+  j2ee_web_services_1_1.xsd
+  j2ee_web_services_client_1_1.xsd
+  jsp_2_0.xsd
+  web-app_2_4.xsd
+  web-jsptaglibrary_2_0.xsd
+  application-client_5.xsd
+  application_5.xsd
+  ejb-jar_3_0.xsd
+  handler-chain.xsd
+  javaee_5.xsd
+  javaee_web_services_1_2.xsd
+  javaee_web_services_client_1_2.xsd
+  jsp_2_1.xsd
+  persistence_1_0.xsd
+  web-app_2_5.xsd
+  web-facelettaglibrary_2_0.xsd
+  web-facesconfig_2_0.xsd
+  web-partialresponse_2_0.xsd
+  web-jsptaglibrary_2_1.xsd
+  application_6.xsd
+  application-client_6.xsd
+  connector_1_6.xsd
+  ejb-jar_3_1.xsd
+  javaee_6.xsd
+  javaee_web_services_1_3.xsd
+  javaee_web_services_client_1_3.xsd
+  jsp_2_2.xsd
+  persistence_2_0.xsd
+  web-app_3_0.xsd
+  web-common_3_0.xsd
+  web-fragment_3_0.xsd
+===========================
 
-=========================================================================
-==  XStream Notice                                                     ==
-=========================================================================
+This product includes software developed at
+the OSGi Alliance (http://www.osgi.org/).
 
-Copyright (c) 2003-2006, Joe Walnes
-All rights reserved.
+ This product includes software developed at
+ OPS4J (http://www.ops4j.org/).

Added: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/README.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/README.txt?rev=953283&view=auto
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/README.txt (added)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/README.txt Thu Jun 10 11:35:16 2010
@@ -0,0 +1,199 @@
+======================================================
+Apache Geronimo v3.0-M1
+
+http://geronimo.apache.org/
+------------------------------------------------------
+
+
+______________________
+Release Notes
+======================
+
+ Please read the RELEASE_NOTES-3.0-M1.txt for a complete list of new features 
+ available in this release. 
+ 
+  
+______________________
+Documentation
+======================
+ 
+ This README serves as quick introduction to Geronimo. More complete documentation 
+ can be found here:
+ 
+   -  http://cwiki.apache.org/GMOxDOC30/documentation.html
+   OR
+   -  http://cwiki.apache.org/GMOxDOC21/documentation.html
+   (Geronimo 2.2 documentation until Geronimo 3.0-M1 documentation is created)
+
+
+______________________
+Installing Geronimo
+======================
+
+ To install Geronimo, simply unpack the .zip (Windows) or tar.gz (Unix) file containing
+ Geronimo.
+
+ Note for Windows platforms:
+ The maximum path length for a directory path is 255 characters. Installing
+ Geronimo into a long directory path may cause the installation or server start up to fail. 
+ It is recommended that you use a short directory name, such as "c:\g\".
+
+
+______________________
+Starting Geronimo 
+======================
+
+ To start Geronimo in foreground type (assuming the current directory is <geronimo_home>):
+
+   ./bin/geronimo run
+
+ To start Geronimo in background type (assuming the current directory is <geronimo_home>):
+
+   ./bin/geronimo start
+
+Additional information on command environments can be found below.
+
+
+______________________
+Application Deployment
+======================
+
+ Applications can be deployed to a Geronimo server in several ways:
+
+ 1. Administrative command scripts -- "./bin/deploy deploy MyApp.war MyDeploymentPlan.xml"
+ 2. Administrative console -- login to the admin console and click "Deploy New" under Applications
+ 3. Hot deploy -- copy your archive(s) into the "<geronimo-home>/deploy" directory. The
+    hot deploy service will automatically deploy these artifacts.
+ 4. Maven -- applications can be installed as part of a maven build
+
+ When you deploy an application using an administrative command, you will need
+ to supply an administrator's username/password. If you do not specify the username
+ and password, you will be prompted for them.
+
+
+______________________
+Configuration
+======================
+
+ Commonly modified configuration parameters, such as port numbers, can be set by 
+ editing the file:
+
+ <geronimo_home>/var/config/config-substitutions.properties
+ 
+ Additional configuration attributes can be updated in the file:
+
+ <geronimo_home>/var/config/config.xml
+
+ Note: The server must not be running when these files are modified.
+
+ Once the server has started, you can access the Geronimo Administration Console
+ at http://localhost:8080/console/ . The default user name is "system" and the
+ default password is "manager".
+
+ 
+______________________
+Security Configuration
+======================
+
+ The default administration user/password for the Geronimo Administration Console
+ and command line deployment tool is system/manager.  You can change these defaults
+ directly from the Geronimo Administration Console by accessing Security -> Users 
+ and Groups and change the user name and password from the Console Realm Users portlet.
+
+ As an alternative, you can make the same changes by editing the
+ <geronimo_home>/var/security/users.properties and
+ <geronimo_home>/var/security/groups.properties files.
+
+ Access to the var/security directory should be appropriately secured on systems where
+ you install Geronimo.
+
+ Passwords in users.properties are encrypted by the server. Passwords can be changed 
+ using the Geronimo Administration Console. They can also be changed using a text
+ editor. While the server is stopped, simply edit the users.properties file. The 
+ password(s) will be encrypted the next time the server is started. 
+
+ To prevent potential security exposures, we strongly recommend you update the 
+ default user names and passwords on your system.
+
+______________________
+Script
+======================
+
+ Geronimo provides a number of shell or batch scripts that can be used to administer Geronimo
+ servers. To use most of these scripts, you must first set either the JAVA_HOME 
+ or JRE_HOME environment variable:
+
+   export JAVA_HOME=<path-to-JDK>
+  or
+   export JRE_HOME=<path-to-JRE>
+
+ Unix scripts provided by Geronimo (there are .bat equivalents):
+
+   geronimo -- used to start and stop servers; either as a foreground or background process.
+   startup -- start a Geronimo server running as a background process
+   shutdown -- stop a running Geronimo server
+   client -- start a Geronimo application client
+   deploy -- deploy, list, and undeploy plugins and applications
+
+ For example, "./bin/deploy list-modules"
+
+ The 'geronimo' and 'shutdown' scripts have multiple sub-commands. Executing the scripts without
+ any arguments will generate usage information. Executing "help <sub-command>" will generate
+ usage information for that particular command.
+
+
+______________________
+Support
+======================
+ 
+ Any problems with this release can be reported to the Geronimo user mailing list 
+ or Jira issue tracker.
+
+ Mailing list archive:
+ http://mail-archives.apache.org/mod_mbox/geronimo-user/
+
+ User mailing list:
+ user@geronimo.apache.org
+
+ User mailing list subscription:
+ user-subscribe@geronimo.apache.org
+
+ Jira:
+ https://issues.apache.org/jira/browse/GERONIMO
+
+ Information concerning security issues and reporting security concerns: 
+ http://geronimo.apache.org/security-reports.html
+
+ _______________________________________
+ Notice Regarding Cryptographic Software
+ =======================================
+ This distribution includes cryptographic software.  The country in 
+ which you currently reside may have restrictions on the import, 
+ possession, use, and/or re-export to another country, of 
+ encryption software.  BEFORE using any encryption software, please 
+ check your country's laws, regulations and policies concerning the
+ import, possession, or use, and re-export of encryption software, to 
+ see if this is permitted.  See <http://www.wassenaar.org/> for more
+ information.
+
+ The U.S. Government Department of Commerce, Bureau of Industry and
+ Security (BIS), has classified this software as Export Commodity 
+ Control Number (ECCN) 5D002.C.1, which includes information security
+ software using or performing cryptographic functions with asymmetric
+ algorithms.  The form and manner of this Apache Software Foundation
+ distribution makes it eligible for export under the License Exception
+ ENC Technology Software Unrestricted (TSU) exception (see the BIS 
+ Export Administration Regulations, Section 740.13) for both object 
+ code and source code.
+
+ The following provides more details on the included cryptographic
+ software:
+   
+   Software related to cryptographic functionality is located in 
+   an artifcact referred to as geronimo-util.  The source code for
+   this functionality can be reviewed at:
+   
+   http://svn.apache.org/repos/asf/geronimo/server/
+   
+   The URL above is a reference to the Apache Geronimo Server source
+   tree for all development (and released) source trees.

Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/README.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/README.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/RELEASE_NOTES-3.0-SNAPSHOT.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/RELEASE_NOTES-3.0-SNAPSHOT.txt?rev=953283&view=auto
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/RELEASE_NOTES-3.0-SNAPSHOT.txt (added)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/RELEASE_NOTES-3.0-SNAPSHOT.txt Thu Jun 10 11:35:16 2010
@@ -0,0 +1,236 @@
+Release Notes -- Apache Geronimo -- Version Geronimo @VERSION@
+
+
+Geronimo URLs
+-------------
+Home Page:     http://geronimo.apache.org/
+Downloads:     http://geronimo.apache.org/downloads.html
+Documentation: http://geronimo.apache.org/documentation.html
+Mailing Lists: http://geronimo.apache.org/mailing-lists.html
+Source Code:   http://geronimo.apache.org/source-code.html
+Bug Tracking:  http://issues.apache.org/jira/browse/GERONIMO
+Wiki:          http://cwiki.apache.org/geronimo
+
+
+Documentation
+-------------
+Please see http://cwiki.apache.org/GMOxDOC30/documentation.html for the
+latest documentation on this release.
+OR
+Please see http://cwiki.apache.org/GMOxDOC22/documentation.html for Geronimo 
+2.2 documentation until Geronimo @VERSION@ documentation is created
+
+IMPORTANT
+---------
+This is a Milestone release, that means that is not the final version of
+Apache Geronimo v3.0 Take a look at "Known Issues and Limitations" section for
+further details.
+
+
+System Requirements
+-------------------
+You need a platform that supports the Sun JDK 6.0+ (J2SE 1.6.0+) or greater.
+
+Most testing has been done on Linux, Mac OS X, and Windows.
+
+
+Geronimo @VERSION@ Enhancements
+-------------------------
+
+Support for portions of SUN's Java Enterprise Edition 6.0 specification:
+  - EJB 3.1 (partial) 
+  - JPA 2.0
+  - Servlet 3.0
+  - JSP 2.2 
+  - EL 2.2 
+  - JSF 2.0 
+  - JSTL 1.2 
+  - JCA 1.6 
+  - JACC 1.4 
+  - JASPIC 1.0 
+  - JAXB-2.2 
+  - Annocations 1.1 
+  - Interceptors 1.1 
+  - OSGi application support 
+  - Apache Aries programming model, including support for 
+       - OSGi Blueprint service
+       - OSGi JNDI extender 
+       - OSGi Web Application Bundle Support 
+  
+
+Geronimo @VERSION@ Issues Resolved
+------------------------------
+
+** Sub-task
+    * [GERONIMO-4410] - Update JPA 2.0 spec component
+    * [GERONIMO-4680] - Create a plugin in for OpenJPA 2.0. 
+    * [GERONIMO-4831] - stop building dojo-0.4.3 from ext
+    * [GERONIMO-4832] - Modify EJB portlets to fit the new APIs of Tree and TreeEntry
+    * [GERONIMO-4902] - need license file modifications for imported plexus code in osgi sandbox modules/geronimo-plugin
+    * [GERONIMO-4914] - gogo commands for manipulating g. plugins
+    * [GERONIMO-4917] - Figure out how to use ext and endorsed classpaths under felix/karaf and get our corba spec in there.
+    * [GERONIMO-4919] - The @WebListener annotation needs to be able to accept a value as the description
+    * [GERONIMO-4923] - Remove those classloader plugins
+    * [GERONIMO-4924] - Reenable the client container in Geronimo
+    * [GERONIMO-4933] - Some optimization for loaded bundle checking
+    * [GERONIMO-4948] - To migrate existing geronimo gshell commands to karaf based shell.
+    * [GERONIMO-4962] - prevent jasper from assuming all classloaders are URLClassLoaders
+    * [GERONIMO-4964] - base jetty servletcontext getResource on bundle getEntry
+    * [GERONIMO-4973] - Classpath entrys in karaf-client.jar is ../system/ instead of ../repository/ 
+    * [GERONIMO-4976] - rfc 66 support for jetty and tomcat
+    * [GERONIMO-4989] - Jetty and tomcat need to support ServletContext.getResource from a bundle, not file system location
+    * [GERONIMO-4990] - Add serialVersionUID to serializable spec classes from javadoc
+    * [GERONIMO-4992] - Tomcat StandardContext use of Class.forName(className) doesn't work well in osgi
+    * [GERONIMO-4994] - To support multiple level navigation tree in geronimo web console.
+    * [GERONIMO-5008] - Create util methods for all the Geronimo components
+    * [GERONIMO-5017] - Create geronimo-annotation_1.1_spec jar
+    * [GERONIMO-5018] - Remove -EA- versioning from the JEE6 spec versions. 
+    * [GERONIMO-5029] - Integrate WAR to WAB converter/url handler from Apache Aries
+    * [GERONIMO-5031] - Implement EL spec 2.2 
+    * [GERONIMO-5034] - Integrate JMX (RFC 142) implementation from Apache Aries
+    * [GERONIMO-5037] - Support Servlet 3.0 annotation and fragment web file
+    * [GERONIMO-5038] - Need to URLEncode temp bundle location since felix URLDecodes it
+    * [GERONIMO-5093] - Create JAXB 2.2 spec jar
+    * [GERONIMO-5094] - Integrate the 2.2 version of the jaxb reference implementation. 
+    * [GERONIMO-5098] - Create Servlet 3.0 version of the spec jar. 
+    * [GERONIMO-5099] - Create JSP 2.2 spec jar 
+    * [GERONIMO-5100] - Create connector 1.6 spec jar
+    * [GERONIMO-5104] - Update the jsf spec level to 2.o 
+    * [GERONIMO-5105] - Create JACC 1.4 spec jar 
+    * [GERONIMO-5106] - Create a spec jar for JASPIC 1.0 
+    * [GERONIMO-5107] - Implement JASPIC 1.0 in Geronimo
+    * [GERONIMO-5108] - Create interceptor 1.1 spec jar
+    * [GERONIMO-5111] - Create a bundle version of jstl 1.2 and change dependencies to new version 
+    * [GERONIMO-5112] - Implement the DataSourceDefinition annotation
+    * [GERONIMO-5114] - Implement the ManagedBean annotation
+    * [GERONIMO-5118] - Create an ejb 3.1 spec jar implementation 
+    * [GERONIMO-5133] - Geroinimo versions of the specs should pick up the additions made to the service mix versions of the bundles. 
+    * [GERONIMO-5165] - Discover database drivers in META-INF/services/java.sql.Driver files
+    * [GERONIMO-5169] - Remove GShell
+    * [GERONIMO-5174] - System bundle exports JAX-WS packages with wrong version
+    * [GERONIMO-5178] - Inconsistent handling of META-INF/services files by different Geronmo specs. 
+    * [GERONIMO-5188] - Uplevel the stax spec implementation to the 1.3 maintenance release level. 
+    * [GERONIMO-5201] - Repace service versions of spec bundles with Geronimo latest versions. 
+    * [GERONIMO-5202] - jaxb 2.2 version problem. 
+    * [GERONIMO-5203] - JTA OSGi services & blueprint extensions
+    * [GERONIMO-5218] - The portlets page in iframe height is limited in debug view, so that some content is not visible when expanding the tree in debug view.
+    * [GERONIMO-5234] - JavaEE6 sample - Servlet 3.0 - Web Fragment
+    * [GERONIMO-5235] - JavaEE6 sample - Servlet 3.0 - Part attribute
+    * [GERONIMO-5236] - JavaEE6 sample - Servlet 3.0 - Annotations for servlets, filters and listeners
+    * [GERONIMO-5237] - JavaEE6 sample - Servlet 3.0 - JAR resources support
+    * [GERONIMO-5238] - JavaEE6 sample - Servlet 3.0 - Programmatically register and initialize servlets and filters
+    * [GERONIMO-5239] - Restructure samples layout to categorize samples into Java EE 5, Java EE 6, and OSGi
+    * [GERONIMO-5240] - Add daytrader(JavaEE) into the samples code tree
+    * [GERONIMO-5251] - Support environment entires of type Class or Enum
+    * [GERONIMO-5266] - JavaEE6 sample - JPA 2.0 - Criteria API
+    * [GERONIMO-5272] - JavaEE6 sample - JSF 2.0 - AJAX interaction
+    * [GERONIMO-5273] - JavaEE6 sample - EJB 3.1 - Singleton
+    * [GERONIMO-5275] - JavaEE6 sample - RESTful service
+    * [GERONIMO-5276] - JavaEE6 sample - EJB 3.1 - Timer Service
+
+** Bug
+    * [GERONIMO-4566] - Need extra servlet mappings for jetty and tomcat for welcome jsps compiled into servlets
+    * [GERONIMO-4859] - Default JMX monitoring MBeans list should include JVM MBean.
+    * [GERONIMO-4886] - Request Time Count attribute does not exist in connector mbean.
+    * [GERONIMO-4928] - In the JPA persistence.xml loading code, exclude-unlisted-classes handling not compliant with JPA3.0 spec
+    * [GERONIMO-5147] - deploy.sh exits with non-zero status because of stty echo
+    * [GERONIMO-5151] - JSTL sql tags do not work
+    * [GERONIMO-5176] - our DependencyManager needs to know about artifact aliases.
+    * [GERONIMO-5211] - geronimo start command is very verbose
+    * [GERONIMO-5213] - Review Geronimo 3.0 commands need a thorough review
+    * [GERONIMO-5246] - Geronimo 3.0 version of activemq still has spring dependencies. 
+    * [GERONIMO-5247] - IllegalStateException during Geronimo build. 
+    * [GERONIMO-5249] - Use karaf jaas boot code to load login modules
+    * [GERONIMO-5259] - Annoying "access denied" security exceptions for oenwebbeans while java2 security is enabled.
+    * [GERONIMO-5260] - Geronimo bundle members need to be released separately 
+    * [GERONIMO-5261] - Fix LICENSE and NOTICE files for the Geronimo bundles subprojects. 
+    * [GERONIMO-5279] - search-plugins, install-library deploy command fails with NoClassDefFoundError
+    * [GERONIMO-5281] - MergeHelper should not load all classes in bundle
+    * [GERONIMO-5285] - deploy, undeploy, deploy of blog sample fails
+    * [GERONIMO-5286] - Many irrelevant build properties end up in the manifest
+    * [GERONIMO-5287] - Felix instance cache is not cleared for client/shutdown/deploy
+    * [GERONIMO-5289] - Test all combinations of heuristic exceptions
+    * [GERONIMO-5291] - Can not get multipart data sent from html form.
+    * [GERONIMO-5301] - DatabaseInitializationGBean class not found.
+    * [GERONIMO-5308] - Use cookie version 0 for Tomcat 7
+    * [GERONIMO-5321] - mvn install -Dstage=bootstrap no longer working. 
+    * [GERONIMO-5330] - env-entry values should not be trimmed
+    * [GERONIMO-5333] - Server start fails, but java process stays active
+    * [GERONIMO-5335] - ClassNotFoundException running 'geronimo stop'
+    * [GERONIMO-5337] - ServerHostName does not control the bind ip address for Tomcat Connectors
+
+** Improvement
+    * [GERONIMO-434] - Connection factories extracted from conceptually wrong gbean
+    * [GERONIMO-4694] - Upgrade to Derby 10.5.3.0
+    * [GERONIMO-4723] - Replace our dojo repackaging with the released dojo-war
+    * [GERONIMO-4907] - GBeanInstance to Ignore Missing Setters
+    * [GERONIMO-4975] - Simplify integrating new ModuleBuilders with EARConfigBuilder
+    * [GERONIMO-4984] - EjbDaemonGBean can start multiple daemons
+    * [GERONIMO-5149] - More flexibility checking for dependency changes
+
+** New Feature
+    * [GERONIMO-4918] - EJB 3.1 Singleton Support
+    * [GERONIMO-5263] - Support Servlet 3.0 new features in Tomcat assembly
+
+
+
+
+
+** Task
+    * [GERONIMO-4888] - Update the version of dojo-war dependency to 1.3.2
+    * [GERONIMO-4916] - move osgi framework in to replace pre-osgi framwork
+    * [GERONIMO-5171] - Upgrade WADI from 2.1.1. to 2.1.2  in 22 branch and trunk.
+
+
+Certification Status
+--------------------
+
+Apache Geronimo vGeronimo @VERSION@, being a MILESTONE release is not yet certified.
+
+
+Distributions
+-------------
+Apache Geronimo vGeronimo @VERSION@ is available in five distributions so you can pick
+the one that best fits your environment.
+
+The available distributions are as follows:
+
+Non-Certified distributions:
+- Apache Geronimo with Tomcat web container and OpenJPA for persistence.
+- Apache Geronimo with Jetty web container and OpenJPA for persistence.
+- Little-G with Tomcat web container, minimal configuration.
+- Little-G with Jetty web container, minimal configuration.
+- Geronimo framework, stripped down Geronimo pluggable framework.
+
+Note: Non-Certified distributions do not contain a complete Java EE 6 stack and
+so cannot be certified.  
+
+Supported features
+------------------
+- Web applications using servlet 3.0, jsf 2.0, and jsp 2.2.
+- Web Application Bundles in the OSGi style .
+- The OSGi/Aries EBA programming model with support for blueprint, 
+- JPA, transactions, and JNDI. 
+- Traditional Java EE apps, including support for JPA 2.0, EJB 3.0, 
+  ActiveMQ 5.3.2, and JCA 1.6 
+  
+
+Known Issues and Limitations
+----------------------------
+Geronimo @VERSION@ is a milestone release and should only
+be used for learning about the upcoming Geronimo 3.0 release with Java
+EE 6 and OSGi/Aries support and not for any type of production usage...
+
+In particular, the following limitations need to be noted:                
+   - This release does not include support for Web Services.  Web Services 
+   support is not a required component for the Java EE 6 Web Profile, which is 
+   the focus of the Geronimo 3.0 release. 
+   - The OpenEJB version used in this milestone is still largely at the EJB 3.0 
+   support level.  
+   - The following components required by the Java EE 6 Web Profile are not yet 
+   included in this release:
+       - Java Context and Dependency Injection (JSRs 299 and 330).   
+       - Bean Validation (JSR 302) 
+       - Managed Beans (JSR 318) 
+       
+

Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/RELEASE_NOTES-3.0-SNAPSHOT.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/RELEASE_NOTES-3.0-SNAPSHOT.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/RELEASE_NOTES-3.0-SNAPSHOT.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,3 +1,3 @@
 /geronimo/server/branches/2.2/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf:826768
-/geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client:948864
+/geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client:948864,951792
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,3 +1,3 @@
 /geronimo/server/branches/2.2/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf:826768
-/geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo:948864
+/geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo:948864,951792
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/shutdown
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,3 +1,3 @@
 /geronimo/server/branches/2.2/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf:826768
-/geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/shutdown:948864
+/geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/shutdown:948864,951792
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,3 +1,3 @@
 /geronimo/server/branches/2.2/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/karaf.bat:826768
-/geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat:948864
+/geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat:948864,951792
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/karaf.bat:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,3 +1,3 @@
 /geronimo/server/branches/2.2/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/karaf.bat:826768
-/geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat:948864
+/geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat:948864,951792
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/karaf.bat:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/shutdown.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,3 +1,3 @@
 /geronimo/server/branches/2.2/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/karaf.bat:826768
-/geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/shutdown.bat:948864
+/geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/shutdown.bat:948864,951792
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/karaf.bat:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,2 +1,2 @@
-/geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties:948864
+/geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties:948864,951792
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties:809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,2 +1,2 @@
-/geronimo/server/branches/3.0-M1/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi:948864
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi:948864,951792
 /geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi:749113,749116-807432,809079-825588*

Propchange: geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,2 +1,2 @@
-/geronimo/server/branches/3.0-M1/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java:948864
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java:948864,951792
 /geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,3 +1,3 @@
 /geronimo/server/branches/2.2/framework/modules/geronimo-deploy-tool:826768,832538,885058,917413
-/geronimo/server/branches/3.0-M1/framework/modules/geronimo-deploy-tool:948864
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-deploy-tool:948864,951792
 /geronimo/server/trunk/framework/modules/geronimo-deploy-tool:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,2 +1,2 @@
 /geronimo/server/branches/2.2/framework/modules/geronimo-kernel/pom.xml:832538,885058
-/geronimo/server/branches/3.0-M1/framework/modules/geronimo-kernel/pom.xml:948864
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-kernel/pom.xml:948864,951792

Propchange: geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,2 +1,2 @@
-/geronimo/server/branches/3.0-M1/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi:948864
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi:948864,951792
 /geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi:749113,749116-807432,809079-825588*

Propchange: geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,2 +1,2 @@
-/geronimo/server/branches/3.0-M1/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java:948864
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java:948864,951792
 /geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,2 +1,2 @@
-/geronimo/server/branches/3.0-M1/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java:948864
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java:948864,951792
 /geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,2 +1,2 @@
-/geronimo/server/branches/3.0-M1/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java:948864
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java:948864,951792
 /geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/SystemLog.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,3 +1,3 @@
 /geronimo/server/branches/2.2/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/SystemLog.java:826768
-/geronimo/server/branches/3.0-M1/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/SystemLog.java:948864
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/SystemLog.java:948864,951792
 /geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/SystemLog.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,3 +1,3 @@
 /geronimo/server/branches/2.2/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/Log4jService.java:826768
-/geronimo/server/branches/3.0-M1/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java:948864
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java:948864,951792
 /geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/Log4jService.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,2 +1,2 @@
-/geronimo/server/branches/3.0-M1/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java:948864
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java:948864,951792
 /geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,2 +1,2 @@
-/geronimo/server/branches/3.0-M1/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean:948864
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean:948864,951792
 /geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean:749113,749116-807432,809079-825588*

Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,2 +1,2 @@
-/geronimo/server/branches/3.0-M1/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java:948864
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java:948864,951792
 /geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,2 +1,2 @@
-/geronimo/server/branches/3.0-M1/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java:948864
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java:948864,951792
 /geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,2 +1,2 @@
-/geronimo/server/branches/3.0-M1/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java:948864
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java:948864,951792
 /geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,2 +1,2 @@
-/geronimo/server/branches/3.0-M1/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java:948864
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java:948864,951792
 /geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,2 +1,2 @@
-/geronimo/server/branches/3.0-M1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi:948864
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi:948864,951792
 /geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi:749113,749116-807432,809079-825588*

Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,2 +1,2 @@
-/geronimo/server/branches/3.0-M1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java:948864
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java:948864,951792
 /geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,3 +1,3 @@
 /geronimo/server/branches/2.2/framework/modules/geronimo-upgrade/src/test/resources:826768,832538,885058
-/geronimo/server/branches/3.0-M1/framework/modules/geronimo-upgrade/src/test/resources:948864
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-upgrade/src/test/resources:948864,951792
 /geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources:809079-825588

Propchange: geronimo/server/trunk/plugins/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,3 +1,3 @@
 /geronimo/server/branches/2.2/plugins:832538,885058
-/geronimo/server/branches/3.0-M1/plugins:948864
+/geronimo/server/branches/3.0-M1/plugins:948864,951792
 /geronimo/server/trunk/plugins/j2ee:887507

Modified: geronimo/server/trunk/plugins/activemq/activemq-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-jetty-server/pom.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-jetty-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-jetty-server/pom.xml Thu Jun 10 11:35:16 2010
@@ -72,6 +72,13 @@
           </servers>
         </configuration>
       </plugin>
+      <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <configuration>
+              <skip>true</skip>
+          </configuration>
+      </plugin>
     </plugins>
   </build>
   <dependencies>

Modified: geronimo/server/trunk/plugins/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/pom.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/pom.xml Thu Jun 10 11:35:16 2010
@@ -49,6 +49,17 @@
 
     <profiles>
         <profile>
+            <id>all-subprojects</id>
+            <modules>
+                <module>activemq-broker-blueprint</module>
+                <module>geronimo-activemq-ra</module>
+                <module>activemq-ra</module>
+                <module>geronimo-activemq-blueprint</module>
+                <module>geronimo-activemq-management</module>
+                <module>activemq-jetty-server</module>
+            </modules>
+        </profile>
+        <profile>
             <id>mini-servers</id>
             <modules>
                 <module>activemq-jetty-server</module>

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1 +1 @@
-/geronimo/server/branches/3.0-M1/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java:948864
+/geronimo/server/branches/3.0-M1/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java:948864,951792

Propchange: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,4 +1,4 @@
 /geronimo/server/branches/2.1/plugins/clustering/geronimo-farm:903520
 /geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm:832538,885058
-/geronimo/server/branches/3.0-M1/plugins/clustering/geronimo-deploy-farm:948864
+/geronimo/server/branches/3.0-M1/plugins/clustering/geronimo-deploy-farm:948864,951792
 /geronimo/server/trunk/plugins/j2ee/clustering/geronimo-deploy-farm:887507

Propchange: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,3 +1,3 @@
 /geronimo/server/branches/2.1/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java:903520
 /geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java:832538
-/geronimo/server/branches/3.0-M1/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java:948864
+/geronimo/server/branches/3.0-M1/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java:948864,951792

Propchange: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,3 +1,3 @@
 /geronimo/server/branches/2.1/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java:903520
 /geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java:832538
-/geronimo/server/branches/3.0-M1/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java:948864
+/geronimo/server/branches/3.0-M1/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java:948864,951792

Propchange: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,2 +1,2 @@
 /geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java:832538
-/geronimo/server/branches/3.0-M1/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java:948864
+/geronimo/server/branches/3.0-M1/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java:948864,951792

Propchange: geronimo/server/trunk/plugins/connector-1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,2 +1,2 @@
-/geronimo/server/branches/3.0-M1/plugins/connector-1_6:948864
+/geronimo/server/branches/3.0-M1/plugins/connector-1_6:948864,951792
 /geronimo/server/trunk/plugins/connector:799922,803943

Propchange: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,3 +1,3 @@
-/geronimo/server/branches/3.0-M1/plugins/connector-1_6/connector-deployer-1_6:948864
+/geronimo/server/branches/3.0-M1/plugins/connector-1_6/connector-deployer-1_6:948864,951792
 /geronimo/server/trunk/plugins/connector/connector-deployer:803943
 /geronimo/server/trunk/plugins/connector/connector-deployer-1_6:799922,803943

Modified: geronimo/server/trunk/plugins/connector-1_6/db-connectors/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/db-connectors/src/main/history/dependencies.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/db-connectors/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/db-connectors/src/main/history/dependencies.xml Thu Jun 10 11:35:16 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
     <module-id>
-        <groupId>org.apache.geronimo.plugins</groupId>
+        <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>db-connectors</artifactId>
         <version>3.0-SNAPSHOT</version>
         <type>car</type>
@@ -23,16 +23,6 @@
     </dependency>
     <dependency>
         <groupId>org.tranql</groupId>
-        <artifactId>tranql-connector-derby-embed-local</artifactId>
-        <type>rar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.tranql</groupId>
-        <artifactId>tranql-connector-derby-embed-xa</artifactId>
-        <type>rar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.tranql</groupId>
         <artifactId>tranql-connector-informix-xa</artifactId>
         <type>rar</type>
     </dependency>

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,3 +1,3 @@
-/geronimo/server/branches/3.0-M1/plugins/connector-1_6/geronimo-connector-builder-1_6:948864
+/geronimo/server/branches/3.0-M1/plugins/connector-1_6/geronimo-connector-builder-1_6:948864,951792
 /geronimo/server/trunk/plugins/connector/geronimo-connector-builder:799922
 /geronimo/server/trunk/plugins/connector/geronimo-connector-builder-1_6:799922,803943



Mime
View raw message