geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r513482 - in /geronimo/server/trunk: ./ assemblies/geronimo-boilerplate-minimal/src/main/resources/ maven-plugins/car-maven-plugin/src/site/apt/ modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/log/ modules/geronimo-system/s...
Date Thu, 01 Mar 2007 20:19:43 GMT
Author: jdillon
Date: Thu Mar  1 12:19:42 2007
New Revision: 513482

URL: http://svn.apache.org/viewvc?view=rev&rev=513482
Log:
Remove mx4j more mx4j

Modified:
    geronimo/server/trunk/LICENSE.txt
    geronimo/server/trunk/NOTICE.txt
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/LICENSE.txt
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/NOTICE.txt
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/site/apt/usage.apt
    geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/log/GeronimoLogging.java
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/ExceptionUtil.java

Modified: geronimo/server/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/LICENSE.txt?view=diff&rev=513482&r1=513481&r2=513482
==============================================================================
--- geronimo/server/trunk/LICENSE.txt (original)
+++ geronimo/server/trunk/LICENSE.txt Thu Mar  1 12:19:42 2007
@@ -2219,62 +2219,6 @@
 
 
 =========================================================================
-==  MX4J License                                                       ==
-=========================================================================
-
-The MX4J License, Version 1.0
-
-Copyright (c) 2001-2004 by the MX4J contributors.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. The end-user documentation included with the redistribution,
-   if any, must include the following acknowledgment:
-      "This product includes software developed by the
-       MX4J project (http://sourceforge.net/projects/mx4j)."
-   Alternately, this acknowledgment may appear in the software itself,
-   if and wherever such third-party acknowledgments normally appear.
-
-4. The names "MX4J" and "mx4j" must not be used to endorse or promote
-   products derived from this software without prior written
-   permission. For written permission, please contact 
-   biorn_steedom@users.sourceforge.net
-
-5. Products derived from this software may not be called "MX4J",
-   nor may "MX4J" appear in their name, without prior written
-   permission of Simone Bordet.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL THE CHRIS SEGUIN OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-====================================================================
-
-This software consists of voluntary contributions made by many
-individuals on behalf of MX4J.  For more information on
-MX4J, please see <http://sourceforge.net/projects/mx4j>.
-
-
-=========================================================================
 ==  OGNL License                                                       ==
 =========================================================================
 

Modified: geronimo/server/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/NOTICE.txt?view=diff&rev=513482&r1=513481&r2=513482
==============================================================================
--- geronimo/server/trunk/NOTICE.txt (original)
+++ geronimo/server/trunk/NOTICE.txt Thu Mar  1 12:19:42 2007
@@ -423,7 +423,7 @@
 
 
 =========================================================================
-==  JLine Notice                                                       ==
+==  Jetty Notice                                                       ==
 =========================================================================
 
 ==============================================================
@@ -452,16 +452,6 @@
 
 Copyright (c) 2002-2006, Marc Prud'hommeaux <mwp1@cornell.edu>
 All rights reserved.
-
-
-=========================================================================
-==  MX4J Notice                                                        ==
-=========================================================================
-
-This product includes software developed by the MX4J project 
-(http://sourceforge.net/projects/mx4j).
-
-Copyright (c) 2001-2004 by the MX4J contributors.  All rights reserved.
 
 
 =========================================================================

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/LICENSE.txt?view=diff&rev=513482&r1=513481&r2=513482
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/LICENSE.txt
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/LICENSE.txt
Thu Mar  1 12:19:42 2007
@@ -2219,62 +2219,6 @@
 
 
 =========================================================================
-==  MX4J License                                                       ==
-=========================================================================
-
-The MX4J License, Version 1.0
-
-Copyright (c) 2001-2004 by the MX4J contributors.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. The end-user documentation included with the redistribution,
-   if any, must include the following acknowledgment:
-      "This product includes software developed by the
-       MX4J project (http://sourceforge.net/projects/mx4j)."
-   Alternately, this acknowledgment may appear in the software itself,
-   if and wherever such third-party acknowledgments normally appear.
-
-4. The names "MX4J" and "mx4j" must not be used to endorse or promote
-   products derived from this software without prior written
-   permission. For written permission, please contact 
-   biorn_steedom@users.sourceforge.net
-
-5. Products derived from this software may not be called "MX4J",
-   nor may "MX4J" appear in their name, without prior written
-   permission of Simone Bordet.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL THE CHRIS SEGUIN OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-====================================================================
-
-This software consists of voluntary contributions made by many
-individuals on behalf of MX4J.  For more information on
-MX4J, please see <http://sourceforge.net/projects/mx4j>.
-
-
-=========================================================================
 ==  OGNL License                                                       ==
 =========================================================================
 

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/NOTICE.txt?view=diff&rev=513482&r1=513481&r2=513482
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/NOTICE.txt
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/NOTICE.txt
Thu Mar  1 12:19:42 2007
@@ -423,7 +423,7 @@
 
 
 =========================================================================
-==  JLine Notice                                                       ==
+==  Jetty Notice                                                       ==
 =========================================================================
 
 ==============================================================
@@ -452,16 +452,6 @@
 
 Copyright (c) 2002-2006, Marc Prud'hommeaux <mwp1@cornell.edu>
 All rights reserved.
-
-
-=========================================================================
-==  MX4J Notice                                                        ==
-=========================================================================
-
-This product includes software developed by the MX4J project 
-(http://sourceforge.net/projects/mx4j).
-
-Copyright (c) 2001-2004 by the MX4J contributors.  All rights reserved.
 
 
 =========================================================================

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/site/apt/usage.apt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/site/apt/usage.apt?view=diff&rev=513482&r1=513481&r2=513482
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/site/apt/usage.apt (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/site/apt/usage.apt Thu Mar  1
12:19:42 2007
@@ -104,14 +104,6 @@
                     </archive>
                     <classpath>
                         <classpathElement>
-                            <groupId>mx4j</groupId>
-                            <artifactId>mx4j</artifactId>
-                        </classpathElement>
-                        <classpathElement>
-                            <groupId>mx4j</groupId>
-                            <artifactId>mx4j-remote</artifactId>
-                        </classpathElement>
-                        <classpathElement>
                             <groupId>commons-cli</groupId>
                             <artifactId>commons-cli</artifactId>
                         </classpathElement>

Modified: geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/log/GeronimoLogging.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/log/GeronimoLogging.java?view=diff&rev=513482&r1=513481&r2=513482
==============================================================================
--- geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/log/GeronimoLogging.java
(original)
+++ geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/log/GeronimoLogging.java
Thu Mar  1 12:19:42 2007
@@ -44,9 +44,7 @@
 
     /**
      * Initializes the logging system used by Geronimo.  This MUST be called in
-     * in the main class used to start the geronimo server.  This method forces
-     * commons logging to use GeronimoLogFactory, starts the initial commons-logging
-     * logging system, and forces mx4j to use commons logging.
+     * in the main class used to start the geronimo server.
      */
     public static void initialize(GeronimoLogging level) {
         if (!initialized) {
@@ -56,26 +54,6 @@
             // force the log factory to initialize
             LogFactory.getLog(GeronimoLogging.class);
             
-            //
-            // FIXME: Replace the bits below with this:
-            //
-            // System.setProperty("mx4j.log.prototype", "mx4j.log.CommonsLogger");
-            
-            // force mx4j to use commons logging
-            // Use reflection so mx4j is not required (this is important in JDK 1.5)
-            // mx4j.log.Log.redirectTo(new mx4j.log.CommonsLogger());
-            try {
-                Class clazz = Class.forName("mx4j.log.Log");
-                Class paramClazz = Class.forName("mx4j.log.Logger");
-                Method method = clazz.getDeclaredMethod("redirectTo", new Class[] {paramClazz});
-                paramClazz = Class.forName("mx4j.log.CommonsLogger");
-                method.invoke(null, new Object[] {paramClazz.newInstance()});
-            } catch (ClassNotFoundException e) {
-                // MX4J is not present.
-            } catch (Exception e) {
-                throw (AssertionError) new AssertionError("Cannot force MX4J to use commons
logging.").initCause(e);
-            }
-
             initialized = true;
         }
     }

Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/ExceptionUtil.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/ExceptionUtil.java?view=diff&rev=513482&r1=513481&r2=513482
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/ExceptionUtil.java
(original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/ExceptionUtil.java
Thu Mar  1 12:19:42 2007
@@ -24,7 +24,7 @@
 public class ExceptionUtil {
 
     private static final String[] excludedPackages = {
-        "org.apache.geronimo.gbean.jmx.", "mx4j.", "net.sf.cglib.reflect.", "sun.reflect."
+        "org.apache.geronimo.gbean.jmx.", "net.sf.cglib.reflect.", "sun.reflect."
     };
 
     private static final String[] excludedStrings = {



Mime
View raw message