geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r514100 - in /geronimo/server/trunk: ./ applications/console/geronimo-console-framework/ assemblies/geronimo-boilerplate-minimal/src/main/resources/ configs/webconsole-jetty6/ configs/webconsole-jetty6/src/plan/ configs/webconsole-tomcat/ c...
Date Sat, 03 Mar 2007 08:36:29 GMT
Author: jdillon
Date: Sat Mar  3 00:36:28 2007
New Revision: 514100

URL: http://svn.apache.org/viewvc?view=rev&rev=514100
Log:
Upgrade to Castor 1.0.5

Modified:
    geronimo/server/trunk/LICENSE.txt
    geronimo/server/trunk/NOTICE.txt
    geronimo/server/trunk/applications/console/geronimo-console-framework/pom.xml
    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/configs/webconsole-jetty6/pom.xml
    geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml
    geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
    geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml
    geronimo/server/trunk/modules/geronimo-webservices/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/LICENSE.txt?view=diff&rev=514100&r1=514099&r2=514100
==============================================================================
--- geronimo/server/trunk/LICENSE.txt (original)
+++ geronimo/server/trunk/LICENSE.txt Sat Mar  3 00:36:28 2007
@@ -1565,46 +1565,76 @@
 
 
 =========================================================================
-==  Castor Intalio License                                             ==
+==  Castor License                                                     ==
 =========================================================================
 
-Copyright 1999-2004 (C) Intalio Inc., and others. All Rights Reserved.
+New Apache-style license
 
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided
-that the following conditions are met:
-
-1. Redistributions of source code must retain copyright statements
-   and notices. Redistributions must also contain a copy of this
-   document.
-
-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 name "ExoLab" must not be used to endorse or promote products
-   derived from this Software without prior written permission of
-   Intalio Inc. For written permission, please contact info@exolab.org.
-
-4. Products derived from this Software may not be called "Castor"
-   nor may "Castor" appear in their names without prior written
-   permission of Intalio Inc. Exolab, Castor and Intalio are
-   trademarks of Intalio Inc.
+As of release 0.9.7, any new code artifacts should carry a new, Apache 2.0-style
+license. This shall include files that have been changed substantially through 
+e.g. refactoring.
+
+Copyright 2004-2005 Werner Guttmann
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+
+Original Intalio license
+
+The code of this project is released under a BSD-like license [license.txt]:
+
+Copyright 1999-2004 (C) Intalio Inc., and others. All Rights
+Reserved. Redistribution and use of this software and
+associated documentation ("Software"), with or without
+modification, are permitted provided that the following
+conditions are met:
+
+1. Redistributions of source code must
+   retain copyright statements and notices. Redistributions must
+   also contain a copy of this document.
+
+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 name "ExoLab" must not be used to endorse
+   or promote products derived from this Software without prior
+   written permission of Intalio Inc. For written permission,
+   please contact info@exolab.org.
+
+4. Products derived from this Software may not be called "Castor" nor may
+   "Castor" appear in their names without prior written permission
+   of Intalio Inc. Exolab, Castor and Intalio are trademarks of
+   Intalio Inc.
 
 5. Due credit should be given to the ExoLab Project
    (http://www.exolab.org/).
 
+
 THIS SOFTWARE IS PROVIDED BY INTALIO AND CONTRIBUTORS ``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 INTALIO 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
+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 INTALIO 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.
 
 

Modified: geronimo/server/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/NOTICE.txt?view=diff&rev=514100&r1=514099&r2=514100
==============================================================================
--- geronimo/server/trunk/NOTICE.txt (original)
+++ geronimo/server/trunk/NOTICE.txt Sat Mar  3 00:36:28 2007
@@ -343,8 +343,7 @@
    Community Process. The original software is available 
    as part of the project glassfish
    		https://glassfish.dev.java.net/
-   
- 
+
 
 =========================================================================
 ==  ASM Notice                                                         ==
@@ -369,13 +368,15 @@
 
 
 =========================================================================
-==  Castor Intalio Notice                                              ==
+==  Castor Notice                                                      ==
 =========================================================================
 
-This product includes software developed by the Exolab project. 
+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.
+Copyright 1999-2004 (C) Intalio Inc., and others. All Rights Reserved..
 
 
 =========================================================================

Modified: geronimo/server/trunk/applications/console/geronimo-console-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-framework/pom.xml?view=diff&rev=514100&r1=514099&r2=514100
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-framework/pom.xml (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-framework/pom.xml Sat Mar
 3 00:36:28 2007
@@ -60,7 +60,7 @@
         </dependency>
         
         <dependency>
-            <groupId>castor</groupId>
+            <groupId>org.codehaus.castor</groupId>
             <artifactId>castor</artifactId>
             <scope>provided</scope>
         </dependency>

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=514100&r1=514099&r2=514100
==============================================================================
--- 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
Sat Mar  3 00:36:28 2007
@@ -1565,46 +1565,76 @@
 
 
 =========================================================================
-==  Castor Intalio License                                             ==
+==  Castor License                                                     ==
 =========================================================================
 
-Copyright 1999-2004 (C) Intalio Inc., and others. All Rights Reserved.
+New Apache-style license
 
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided
-that the following conditions are met:
-
-1. Redistributions of source code must retain copyright statements
-   and notices. Redistributions must also contain a copy of this
-   document.
-
-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 name "ExoLab" must not be used to endorse or promote products
-   derived from this Software without prior written permission of
-   Intalio Inc. For written permission, please contact info@exolab.org.
-
-4. Products derived from this Software may not be called "Castor"
-   nor may "Castor" appear in their names without prior written
-   permission of Intalio Inc. Exolab, Castor and Intalio are
-   trademarks of Intalio Inc.
+As of release 0.9.7, any new code artifacts should carry a new, Apache 2.0-style
+license. This shall include files that have been changed substantially through 
+e.g. refactoring.
+
+Copyright 2004-2005 Werner Guttmann
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+
+Original Intalio license
+
+The code of this project is released under a BSD-like license [license.txt]:
+
+Copyright 1999-2004 (C) Intalio Inc., and others. All Rights
+Reserved. Redistribution and use of this software and
+associated documentation ("Software"), with or without
+modification, are permitted provided that the following
+conditions are met:
+
+1. Redistributions of source code must
+   retain copyright statements and notices. Redistributions must
+   also contain a copy of this document.
+
+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 name "ExoLab" must not be used to endorse
+   or promote products derived from this Software without prior
+   written permission of Intalio Inc. For written permission,
+   please contact info@exolab.org.
+
+4. Products derived from this Software may not be called "Castor" nor may
+   "Castor" appear in their names without prior written permission
+   of Intalio Inc. Exolab, Castor and Intalio are trademarks of
+   Intalio Inc.
 
 5. Due credit should be given to the ExoLab Project
    (http://www.exolab.org/).
 
+
 THIS SOFTWARE IS PROVIDED BY INTALIO AND CONTRIBUTORS ``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 INTALIO 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
+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 INTALIO 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.
 
 

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=514100&r1=514099&r2=514100
==============================================================================
--- 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
Sat Mar  3 00:36:28 2007
@@ -343,8 +343,7 @@
    Community Process. The original software is available 
    as part of the project glassfish
    		https://glassfish.dev.java.net/
-   
- 
+
 
 =========================================================================
 ==  ASM Notice                                                         ==
@@ -369,10 +368,12 @@
 
 
 =========================================================================
-==  Castor Intalio Notice                                              ==
+==  Castor Notice                                                      ==
 =========================================================================
 
-This product includes software developed by the Exolab project. 
+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.

Modified: geronimo/server/trunk/configs/webconsole-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty6/pom.xml?view=diff&rev=514100&r1=514099&r2=514100
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty6/pom.xml Sat Mar  3 00:36:28 2007
@@ -153,7 +153,7 @@
         </dependency>
 
         <dependency>
-            <groupId>castor</groupId>
+            <groupId>org.codehaus.castor</groupId>
             <artifactId>castor</artifactId>
         </dependency>
 

Modified: geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml?view=diff&rev=514100&r1=514099&r2=514100
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml Sat Mar  3 00:36:28
2007
@@ -26,7 +26,7 @@
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
               <dependencies>
                 <dependency>
-                    <groupId>castor</groupId>
+                    <groupId>org.codehaus.castor</groupId>
                     <artifactId>castor</artifactId>
                     <type>jar</type>
                 </dependency>

Modified: geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-tomcat/pom.xml?view=diff&rev=514100&r1=514099&r2=514100
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/pom.xml Sat Mar  3 00:36:28 2007
@@ -157,7 +157,7 @@
         </dependency>
 
         <dependency>
-            <groupId>castor</groupId>
+            <groupId>org.codehaus.castor</groupId>
             <artifactId>castor</artifactId>
         </dependency>
 

Modified: geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml?view=diff&rev=514100&r1=514099&r2=514100
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml Sat Mar  3 00:36:28
2007
@@ -26,7 +26,7 @@
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
               <dependencies>
                 <dependency>
-                    <groupId>castor</groupId>
+                    <groupId>org.codehaus.castor</groupId>
                     <artifactId>castor</artifactId>
                     <type>jar</type>
                 </dependency>

Modified: geronimo/server/trunk/modules/geronimo-webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-webservices/pom.xml?view=diff&rev=514100&r1=514099&r2=514100
==============================================================================
--- geronimo/server/trunk/modules/geronimo-webservices/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-webservices/pom.xml Sat Mar  3 00:36:28 2007
@@ -68,7 +68,7 @@
         </dependency>
         
         <dependency>
-            <groupId>castor</groupId>
+            <groupId>org.codehaus.castor</groupId>
             <artifactId>castor</artifactId>
         </dependency>
 

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=514100&r1=514099&r2=514100
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Sat Mar  3 00:36:28 2007
@@ -321,13 +321,51 @@
                 <artifactId>concurrent</artifactId>
                 <version>1.3.4</version>
             </dependency>
-
+            
             <dependency>
-                <groupId>castor</groupId>
+                <groupId>org.codehaus.castor</groupId>
                 <artifactId>castor</artifactId>
-                <version>0.9.5.3</version>
+                <version>1.0.5</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>adaptx</groupId>
+                        <artifactId>adaptx</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.transaction</groupId>
+                        <artifactId>jta</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>jakarta-regexp</groupId>
+                        <artifactId>jakarta-regexp</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.servlet</groupId>
+                        <artifactId>servlet-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.cenqua.clover</groupId>
+                        <artifactId>clover</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>ant</groupId>
+                        <artifactId>ant</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>ldapsdk</groupId>
+                        <artifactId>ldapsdk</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>xerces</groupId>
+                        <artifactId>xerces</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>cglib</groupId>
+                        <artifactId>cglib-full</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
-
+            
             <dependency>
                 <groupId>cglib</groupId>
                 <artifactId>cglib-nodep</artifactId>



Mime
View raw message