geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From David Jencks <david_jen...@yahoo.com>
Subject Re: svn commit: r638053 - in /geronimo/server/trunk/plugins: ./ derby/ derby/src/ derby/src/main/ derby/src/main/plan/ system-database/geronimo-derby/ system-database/geronimo-timer/ system-database/system-database/
Date Tue, 18 Mar 2008 19:36:26 GMT

On Mar 18, 2008, at 11:37 AM, Donald Woods wrote:

> Was just following how plugins/spring was created, which is just a  
> collection of Spring depends for the console and WADI.  I started  
> with it in under system-database, but decided against that as it  
> really wouldn't be a child of the system-database POM, but system- 
> database should have it as a depend...

I think all the stuff that uses derby is under system-database.  I'd  
be fine with renaming plugins/system-database to plugins/derby- 
support, any maybe the system-database plugin to system-database-derby.

Spring is used in more places...
>
> As far as geronimo-timer, it is still as a depend in the following -
>    plugins/system-database/system-database/pom.xml
>    plugins/openejb/geronimo-openejb/pom.xml
>    plugins/openejb/openejb/pom.xml
>    plugins/corba/geronimo-corba/pom.xml

Just because there are dependencies and stray gbeans in system- 
database doesn't mean it's actually used by the ejb timer.

thanks
david jencks

>
>
> -Donald
>
> David Jencks wrote:
>> Generally the contents of plugins are groups of plugins rather  
>> than sincle plugins.  Wouldn't this be more appropriate inside  
>> system-database?
>> Also, I'm pretty sure geronimo-timer is obsolete with openejb3.   
>> It would be great if someone would check and delete it if it isn't  
>> used anywhere.
>> thanks
>> david jencks
>> On Mar 17, 2008, at 1:13 PM, dwoods@apache.org wrote:
>>> Author: dwoods
>>> Date: Mon Mar 17 13:13:46 2008
>>> New Revision: 638053
>>>
>>> URL: http://svn.apache.org/viewvc?rev=638053&view=rev
>>> Log:
>>> GERONIMO-3926 Add a Derby config/plugin for easier inclusion of  
>>> Derby jars without a system-database depend
>>>
>>> Added:
>>>     geronimo/server/trunk/plugins/derby/
>>>     geronimo/server/trunk/plugins/derby/LICENSE.txt   (with props)
>>>     geronimo/server/trunk/plugins/derby/NOTICE.txt   (with props)
>>>     geronimo/server/trunk/plugins/derby/pom.xml   (with props)
>>>     geronimo/server/trunk/plugins/derby/src/
>>>     geronimo/server/trunk/plugins/derby/src/main/
>>>     geronimo/server/trunk/plugins/derby/src/main/plan/
>>>     geronimo/server/trunk/plugins/derby/src/main/plan/plan.xml    
>>> (with props)
>>> Modified:
>>>     geronimo/server/trunk/plugins/pom.xml
>>>     geronimo/server/trunk/plugins/system-database/geronimo-derby/ 
>>> pom.xml
>>>     geronimo/server/trunk/plugins/system-database/geronimo-timer/ 
>>> pom.xml
>>>     geronimo/server/trunk/plugins/system-database/system-database/ 
>>> pom.xml
>>>
>>> Added: geronimo/server/trunk/plugins/derby/LICENSE.txt
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/ 
>>> derby/LICENSE.txt?rev=638053&view=auto
>>> ==================================================================== 
>>> ==========
>>> --- geronimo/server/trunk/plugins/derby/LICENSE.txt (added)
>>> +++ geronimo/server/trunk/plugins/derby/LICENSE.txt Mon Mar 17  
>>> 13:13:46 2008
>>> @@ -0,0 +1,203 @@
>>> +
>>> +                                 Apache License
>>> +                           Version 2.0, January 2004
>>> +                        http://www.apache.org/licenses/
>>> +
>>> +   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
>>> +
>>> +   1. Definitions.
>>> +
>>> +      "License" shall mean the terms and conditions for use,  
>>> reproduction,
>>> +      and distribution as defined by Sections 1 through 9 of  
>>> this document.
>>> +
>>> +      "Licensor" shall mean the copyright owner or entity  
>>> authorized by
>>> +      the copyright owner that is granting the License.
>>> +
>>> +      "Legal Entity" shall mean the union of the acting entity  
>>> and all
>>> +      other entities that control, are controlled by, or are  
>>> under common
>>> +      control with that entity. For the purposes of this  
>>> definition,
>>> +      "control" means (i) the power, direct or indirect, to  
>>> cause the
>>> +      direction or management of such entity, whether by  
>>> contract or
>>> +      otherwise, or (ii) ownership of fifty percent (50%) or  
>>> more of the
>>> +      outstanding shares, or (iii) beneficial ownership of such  
>>> entity.
>>> +
>>> +      "You" (or "Your") shall mean an individual or Legal Entity
>>> +      exercising permissions granted by this License.
>>> +
>>> +      "Source" form shall mean the preferred form for making  
>>> modifications,
>>> +      including but not limited to software source code,  
>>> documentation
>>> +      source, and configuration files.
>>> +
>>> +      "Object" form shall mean any form resulting from mechanical
>>> +      transformation or translation of a Source form, including but
>>> +      not limited to compiled object code, generated documentation,
>>> +      and conversions to other media types.
>>> +
>>> +      "Work" shall mean the work of authorship, whether in  
>>> Source or
>>> +      Object form, made available under the License, as  
>>> indicated by a
>>> +      copyright notice that is included in or attached to the work
>>> +      (an example is provided in the Appendix below).
>>> +
>>> +      "Derivative Works" shall mean any work, whether in Source  
>>> or Object
>>> +      form, that is based on (or derived from) the Work and for  
>>> which the
>>> +      editorial revisions, annotations, elaborations, or other  
>>> modifications
>>> +      represent, as a whole, an original work of authorship. For  
>>> the purposes
>>> +      of this License, Derivative Works shall not include works  
>>> that remain
>>> +      separable from, or merely link (or bind by name) to the  
>>> interfaces of,
>>> +      the Work and Derivative Works thereof.
>>> +
>>> +      "Contribution" shall mean any work of authorship, including
>>> +      the original version of the Work and any modifications or  
>>> additions
>>> +      to that Work or Derivative Works thereof, that is  
>>> intentionally
>>> +      submitted to Licensor for inclusion in the Work by the  
>>> copyright owner
>>> +      or by an individual or Legal Entity authorized to submit  
>>> on behalf of
>>> +      the copyright owner. For the purposes of this definition,  
>>> "submitted"
>>> +      means any form of electronic, verbal, or written  
>>> communication sent
>>> +      to the Licensor or its representatives, including but not  
>>> limited to
>>> +      communication on electronic mailing lists, source code  
>>> control systems,
>>> +      and issue tracking systems that are managed by, or on  
>>> behalf of, the
>>> +      Licensor for the purpose of discussing and improving the  
>>> Work, but
>>> +      excluding communication that is conspicuously marked or  
>>> otherwise
>>> +      designated in writing by the copyright owner as "Not a  
>>> Contribution."
>>> +
>>> +      "Contributor" shall mean Licensor and any individual or  
>>> Legal Entity
>>> +      on behalf of whom a Contribution has been received by  
>>> Licensor and
>>> +      subsequently incorporated within the Work.
>>> +
>>> +   2. Grant of Copyright License. Subject to the terms and  
>>> conditions of
>>> +      this License, each Contributor hereby grants to You a  
>>> perpetual,
>>> +      worldwide, non-exclusive, no-charge, royalty-free,  
>>> irrevocable
>>> +      copyright license to reproduce, prepare Derivative Works of,
>>> +      publicly display, publicly perform, sublicense, and  
>>> distribute the
>>> +      Work and such Derivative Works in Source or Object form.
>>> +
>>> +   3. Grant of Patent License. Subject to the terms and  
>>> conditions of
>>> +      this License, each Contributor hereby grants to You a  
>>> perpetual,
>>> +      worldwide, non-exclusive, no-charge, royalty-free,  
>>> irrevocable
>>> +      (except as stated in this section) patent license to make,  
>>> have made,
>>> +      use, offer to sell, sell, import, and otherwise transfer  
>>> the Work,
>>> +      where such license applies only to those patent claims  
>>> licensable
>>> +      by such Contributor that are necessarily infringed by their
>>> +      Contribution(s) alone or by combination of their  
>>> Contribution(s)
>>> +      with the Work to which such Contribution(s) was submitted.  
>>> If You
>>> +      institute patent litigation against any entity (including a
>>> +      cross-claim or counterclaim in a lawsuit) alleging that  
>>> the Work
>>> +      or a Contribution incorporated within the Work constitutes  
>>> direct
>>> +      or contributory patent infringement, then any patent licenses
>>> +      granted to You under this License for that Work shall  
>>> terminate
>>> +      as of the date such litigation is filed.
>>> +
>>> +   4. Redistribution. You may reproduce and distribute copies of  
>>> the
>>> +      Work or Derivative Works thereof in any medium, with or  
>>> without
>>> +      modifications, and in Source or Object form, provided that  
>>> You
>>> +      meet the following conditions:
>>> +
>>> +      (a) You must give any other recipients of the Work or
>>> +          Derivative Works a copy of this License; and
>>> +
>>> +      (b) You must cause any modified files to carry prominent  
>>> notices
>>> +          stating that You changed the files; and
>>> +
>>> +      (c) You must retain, in the Source form of any Derivative  
>>> Works
>>> +          that You distribute, all copyright, patent, trademark,  
>>> and
>>> +          attribution notices from the Source form of the Work,
>>> +          excluding those notices that do not pertain to any  
>>> part of
>>> +          the Derivative Works; and
>>> +
>>> +      (d) If the Work includes a "NOTICE" text file as part of its
>>> +          distribution, then any Derivative Works that You  
>>> distribute must
>>> +          include a readable copy of the attribution notices  
>>> contained
>>> +          within such NOTICE file, excluding those notices that  
>>> do not
>>> +          pertain to any part of the Derivative Works, in at  
>>> least one
>>> +          of the following places: within a NOTICE text file  
>>> distributed
>>> +          as part of the Derivative Works; within the Source  
>>> form or
>>> +          documentation, if provided along with the Derivative  
>>> Works; or,
>>> +          within a display generated by the Derivative Works, if  
>>> and
>>> +          wherever such third-party notices normally appear. The  
>>> contents
>>> +          of the NOTICE file are for informational purposes only  
>>> and
>>> +          do not modify the License. You may add Your own  
>>> attribution
>>> +          notices within Derivative Works that You distribute,  
>>> alongside
>>> +          or as an addendum to the NOTICE text from the Work,  
>>> provided
>>> +          that such additional attribution notices cannot be  
>>> construed
>>> +          as modifying the License.
>>> +
>>> +      You may add Your own copyright statement to Your  
>>> modifications and
>>> +      may provide additional or different license terms and  
>>> conditions
>>> +      for use, reproduction, or distribution of Your  
>>> modifications, or
>>> +      for any such Derivative Works as a whole, provided Your use,
>>> +      reproduction, and distribution of the Work otherwise  
>>> complies with
>>> +      the conditions stated in this License.
>>> +
>>> +   5. Submission of Contributions. Unless You explicitly state  
>>> otherwise,
>>> +      any Contribution intentionally submitted for inclusion in  
>>> the Work
>>> +      by You to the Licensor shall be under the terms and  
>>> conditions of
>>> +      this License, without any additional terms or conditions.
>>> +      Notwithstanding the above, nothing herein shall supersede  
>>> or modify
>>> +      the terms of any separate license agreement you may have  
>>> executed
>>> +      with Licensor regarding such Contributions.
>>> +
>>> +   6. Trademarks. This License does not grant permission to use  
>>> the trade
>>> +      names, trademarks, service marks, or product names of the  
>>> Licensor,
>>> +      except as required for reasonable and customary use in  
>>> describing the
>>> +      origin of the Work and reproducing the content of the  
>>> NOTICE file.
>>> +
>>> +   7. Disclaimer of Warranty. Unless required by applicable law or
>>> +      agreed to in writing, Licensor provides the Work (and each
>>> +      Contributor provides its Contributions) on an "AS IS" BASIS,
>>> +      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either  
>>> express or
>>> +      implied, including, without limitation, any warranties or  
>>> conditions
>>> +      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
>>> +      PARTICULAR PURPOSE. You are solely responsible for  
>>> determining the
>>> +      appropriateness of using or redistributing the Work and  
>>> assume any
>>> +      risks associated with Your exercise of permissions under  
>>> this License.
>>> +
>>> +   8. Limitation of Liability. In no event and under no legal  
>>> theory,
>>> +      whether in tort (including negligence), contract, or  
>>> otherwise,
>>> +      unless required by applicable law (such as deliberate and  
>>> grossly
>>> +      negligent acts) or agreed to in writing, shall any  
>>> Contributor be
>>> +      liable to You for damages, including any direct, indirect,  
>>> special,
>>> +      incidental, or consequential damages of any character  
>>> arising as a
>>> +      result of this License or out of the use or inability to  
>>> use the
>>> +      Work (including but not limited to damages for loss of  
>>> goodwill,
>>> +      work stoppage, computer failure or malfunction, or any and  
>>> all
>>> +      other commercial damages or losses), even if such Contributor
>>> +      has been advised of the possibility of such damages.
>>> +
>>> +   9. Accepting Warranty or Additional Liability. While  
>>> redistributing
>>> +      the Work or Derivative Works thereof, You may choose to  
>>> offer,
>>> +      and charge a fee for, acceptance of support, warranty,  
>>> indemnity,
>>> +      or other liability obligations and/or rights consistent  
>>> with this
>>> +      License. However, in accepting such obligations, You may  
>>> act only
>>> +      on Your own behalf and on Your sole responsibility, not on  
>>> behalf
>>> +      of any other Contributor, and only if You agree to indemnify,
>>> +      defend, and hold each Contributor harmless for any liability
>>> +      incurred by, or claims asserted against, such Contributor  
>>> by reason
>>> +      of your accepting any such warranty or additional liability.
>>> +
>>> +   END OF TERMS AND CONDITIONS
>>> +
>>> +   APPENDIX: How to apply the Apache License to your work.
>>> +
>>> +      To apply the Apache License to your work, attach the  
>>> following
>>> +      boilerplate notice, with the fields enclosed by brackets "[]"
>>> +      replaced with your own identifying information. (Don't  
>>> include
>>> +      the brackets!)  The text should be enclosed in the  
>>> appropriate
>>> +      comment syntax for the file format. We also recommend that a
>>> +      file or class name and description of purpose be included  
>>> on the
>>> +      same "printed page" as the copyright notice for easier
>>> +      identification within third-party archives.
>>> +
>>> +   Copyright [yyyy] [name of copyright owner]
>>> +
>>> +   Licensed under the Apache License, Version 2.0 (the "License");
>>> +   you may not use this file except in compliance with the License.
>>> +   You may obtain a copy of the License at
>>> +
>>> +       http://www.apache.org/licenses/LICENSE-2.0
>>> +
>>> +   Unless required by applicable law or agreed to in writing,  
>>> software
>>> +   distributed under the License is distributed on an "AS IS"  
>>> BASIS,
>>> +   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express  
>>> or implied.
>>> +   See the License for the specific language governing  
>>> permissions and
>>> +   limitations under the License.
>>> +
>>>
>>> Propchange: geronimo/server/trunk/plugins/derby/LICENSE.txt
>>> -------------------------------------------------------------------- 
>>> ----------
>>>     svn:eol-style = native
>>>
>>> Added: geronimo/server/trunk/plugins/derby/NOTICE.txt
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/ 
>>> derby/NOTICE.txt?rev=638053&view=auto
>>> ==================================================================== 
>>> ==========
>>> --- geronimo/server/trunk/plugins/derby/NOTICE.txt (added)
>>> +++ geronimo/server/trunk/plugins/derby/NOTICE.txt Mon Mar 17  
>>> 13:13:46 2008
>>> @@ -0,0 +1,6 @@
>>> +Apache Geronimo
>>> +Copyright 2003-2008 The Apache Software Foundation
>>> +
>>> +This product includes software developed by
>>> +The Apache Software Foundation (http://www.apache.org/).
>>> +
>>>
>>> Propchange: geronimo/server/trunk/plugins/derby/NOTICE.txt
>>> -------------------------------------------------------------------- 
>>> ----------
>>>     svn:eol-style = native
>>>
>>> Added: geronimo/server/trunk/plugins/derby/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/ 
>>> derby/pom.xml?rev=638053&view=auto
>>> ==================================================================== 
>>> ==========
>>> --- geronimo/server/trunk/plugins/derby/pom.xml (added)
>>> +++ geronimo/server/trunk/plugins/derby/pom.xml Mon Mar 17  
>>> 13:13:46 2008
>>> @@ -0,0 +1,86 @@
>>> +<?xml version="1.0" encoding="ISO-8859-1"?>
>>> +<!--
>>> +    Licensed to the Apache Software Foundation (ASF) under one  
>>> or more
>>> +    contributor license agreements.  See the NOTICE file  
>>> distributed with
>>> +    this work for additional information regarding copyright  
>>> ownership.
>>> +    The ASF licenses this file to You under the Apache License,  
>>> Version 2.0
>>> +    (the "License"); you may not use this file except in  
>>> compliance with
>>> +    the License.  You may obtain a copy of the License at
>>> +
>>> +       http://www.apache.org/licenses/LICENSE-2.0
>>> +
>>> +    Unless required by applicable law or agreed to in writing,  
>>> software
>>> +    distributed under the License is distributed on an "AS IS"  
>>> BASIS,
>>> +    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express  
>>> or implied.
>>> +    See the License for the specific language governing  
>>> permissions and
>>> +    limitations under the License.
>>> +-->
>>> +
>>> +<!-- $Rev: 580112 $ $Date: 2007-09-27 13:35:15 -0400 (Thu, 27  
>>> Sep 2007) $ -->
>>> +
>>> +<project xmlns="http://maven.apache.org/POM/4.0.0"  
>>> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
>>> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http:// 
>>> maven.apache.org/maven-v4_0_0.xsd">
>>> +
>>> +    <modelVersion>4.0.0</modelVersion>
>>> +
>>> +    <parent>
>>> +        <groupId>org.apache.geronimo.plugins</groupId>
>>> +        <artifactId>plugins</artifactId>
>>> +        <version>2.2-SNAPSHOT</version>
>>> +    </parent>
>>> +
>>> +    <groupId>org.apache.geronimo.configs</groupId>
>>> +    <artifactId>derby</artifactId>
>>> +    <name>Geronimo Plugins, Derby</name>
>>> +    <packaging>car</packaging>
>>> +
>>> +    <description>
>>> +        Geronimo module that supplies the Derby runtime in a  
>>> single classloader.
>>> +    </description>
>>> +
>>> +    <dependencies>
>>> +        <dependency>
>>> +            <groupId>org.apache.geronimo.framework</groupId>
>>> +            <artifactId>geronimo-gbean-deployer</artifactId>
>>> +            <version>${version}</version>
>>> +            <type>car</type>
>>> +            <scope>provided</scope>
>>> +        </dependency>
>>> +
>>> +        <dependency>
>>> +            <groupId>org.apache.derby</groupId>
>>> +            <artifactId>derby</artifactId>
>>> +        </dependency>
>>> +
>>> +        <dependency>
>>> +            <groupId>org.apache.derby</groupId>
>>> +            <artifactId>derbyclient</artifactId>
>>> +        </dependency>
>>> +
>>> +        <dependency>
>>> +            <groupId>org.apache.derby</groupId>
>>> +            <artifactId>derbynet</artifactId>
>>> +        </dependency>
>>> +
>>> +        <dependency>
>>> +            <groupId>org.apache.derby</groupId>
>>> +            <artifactId>derbytools</artifactId>
>>> +        </dependency>
>>> +    </dependencies>
>>> +
>>> +    <build>
>>> +        <plugins>
>>> +            <plugin>
>>> +                <groupId>org.apache.geronimo.buildsupport</groupId>
>>> +                <artifactId>car-maven-plugin</artifactId>
>>> +                <configuration>
>>> +                    <useMavenDependencies>
>>> +                        <value>true</value>
>>> +                        <includeVersion>true</includeVersion>
>>> +                    </useMavenDependencies>
>>> +                    <category>Geronimo Core</category>
>>> +                </configuration>
>>> +            </plugin>
>>> +        </plugins>
>>> +    </build>
>>> +
>>> +</project>
>>>
>>> Propchange: geronimo/server/trunk/plugins/derby/pom.xml
>>> -------------------------------------------------------------------- 
>>> ----------
>>>     svn:eol-style = native
>>>
>>> Added: geronimo/server/trunk/plugins/derby/src/main/plan/plan.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/ 
>>> derby/src/main/plan/plan.xml?rev=638053&view=auto
>>> ==================================================================== 
>>> ==========
>>> --- geronimo/server/trunk/plugins/derby/src/main/plan/plan.xml  
>>> (added)
>>> +++ geronimo/server/trunk/plugins/derby/src/main/plan/plan.xml  
>>> Mon Mar 17 13:13:46 2008
>>> @@ -0,0 +1,23 @@
>>> +<?xml version="1.0" encoding="UTF-8"?>
>>> +<!--
>>> +    Licensed to the Apache Software Foundation (ASF) under one  
>>> or more
>>> +    contributor license agreements.  See the NOTICE file  
>>> distributed with
>>> +    this work for additional information regarding copyright  
>>> ownership.
>>> +    The ASF licenses this file to You under the Apache License,  
>>> Version 2.0
>>> +    (the "License"); you may not use this file except in  
>>> compliance with
>>> +    the License.  You may obtain a copy of the License at
>>> +
>>> +       http://www.apache.org/licenses/LICENSE-2.0
>>> +
>>> +    Unless required by applicable law or agreed to in writing,  
>>> software
>>> +    distributed under the License is distributed on an "AS IS"  
>>> BASIS,
>>> +    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express  
>>> or implied.
>>> +    See the License for the specific language governing  
>>> permissions and
>>> +    limitations under the License.
>>> +-->
>>> +
>>> +<!-- $Rev: 589946 $ $Date: 2007-10-29 22:53:25 -0400 (Mon, 29  
>>> Oct 2007) $ -->
>>> +
>>> +<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
>>> +
>>> +</module>
>>>
>>> Propchange: geronimo/server/trunk/plugins/derby/src/main/plan/ 
>>> plan.xml
>>> -------------------------------------------------------------------- 
>>> ----------
>>>     svn:eol-style = native
>>>
>>> Modified: geronimo/server/trunk/plugins/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/ 
>>> pom.xml?rev=638053&r1=638052&r2=638053&view=diff
>>> ==================================================================== 
>>> ==========
>>> --- geronimo/server/trunk/plugins/pom.xml (original)
>>> +++ geronimo/server/trunk/plugins/pom.xml Mon Mar 17 13:13:46 2008
>>> @@ -53,6 +53,7 @@
>>>          <module>console</module>
>>>          <module>corba</module>
>>>          <module>cxf</module>
>>> +        <module>derby</module>
>>>          <module>dojo</module>
>>>          <module>dojo-legacy</module>
>>>          <module>debugviews</module>
>>>
>>> Modified: geronimo/server/trunk/plugins/system-database/geronimo- 
>>> derby/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/ 
>>> system-database/geronimo-derby/pom.xml? 
>>> rev=638053&r1=638052&r2=638053&view=diff
>>> ==================================================================== 
>>> ==========
>>> --- geronimo/server/trunk/plugins/system-database/geronimo-derby/ 
>>> pom.xml (original)
>>> +++ geronimo/server/trunk/plugins/system-database/geronimo-derby/ 
>>> pom.xml Mon Mar 17 13:13:46 2008
>>> @@ -36,25 +36,22 @@
>>>
>>>      <dependencies>
>>>          <dependency>
>>> -            <groupId>org.apache.geronimo.framework</groupId>
>>> -            <artifactId>geronimo-system</artifactId>
>>> +            <groupId>org.apache.geronimo.configs</groupId>
>>> +            <artifactId>derby</artifactId>
>>>              <version>${version}</version>
>>> +            <type>car</type>
>>>          </dependency>
>>>
>>>          <dependency>
>>>              <groupId>org.apache.geronimo.framework</groupId>
>>> -            <artifactId>geronimo-management</artifactId>
>>> +            <artifactId>geronimo-system</artifactId>
>>>              <version>${version}</version>
>>>          </dependency>
>>>
>>>          <dependency>
>>> -            <groupId>org.apache.derby</groupId>
>>> -            <artifactId>derby</artifactId>
>>> -        </dependency>
>>> -
>>> -        <dependency>
>>> -            <groupId>org.apache.derby</groupId>
>>> -            <artifactId>derbynet</artifactId>
>>> +            <groupId>org.apache.geronimo.framework</groupId>
>>> +            <artifactId>geronimo-management</artifactId>
>>> +            <version>${version}</version>
>>>          </dependency>
>>>      </dependencies>
>>>
>>>
>>> Modified: geronimo/server/trunk/plugins/system-database/geronimo- 
>>> timer/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/ 
>>> system-database/geronimo-timer/pom.xml? 
>>> rev=638053&r1=638052&r2=638053&view=diff
>>> ==================================================================== 
>>> ==========
>>> --- geronimo/server/trunk/plugins/system-database/geronimo-timer/ 
>>> pom.xml (original)
>>> +++ geronimo/server/trunk/plugins/system-database/geronimo-timer/ 
>>> pom.xml Mon Mar 17 13:13:46 2008
>>> @@ -47,14 +47,16 @@
>>>
>>>      <dependencies>
>>>          <dependency>
>>> -            <groupId>org.apache.geronimo.modules</groupId>
>>> -            <artifactId>geronimo-connector</artifactId>
>>> +            <groupId>org.apache.geronimo.configs</groupId>
>>> +            <artifactId>derby</artifactId>
>>>              <version>${version}</version>
>>> +            <type>car</type>
>>>          </dependency>
>>>
>>>          <dependency>
>>> -            <groupId>org.apache.derby</groupId>
>>> -            <artifactId>derby</artifactId>
>>> +            <groupId>org.apache.geronimo.modules</groupId>
>>> +            <artifactId>geronimo-connector</artifactId>
>>> +            <version>${version}</version>
>>>          </dependency>
>>>      </dependencies>
>>>
>>>
>>> Modified: geronimo/server/trunk/plugins/system-database/system- 
>>> database/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/ 
>>> system-database/system-database/pom.xml? 
>>> rev=638053&r1=638052&r2=638053&view=diff
>>> ==================================================================== 
>>> ==========
>>> --- geronimo/server/trunk/plugins/system-database/system-database/ 
>>> pom.xml (original)
>>> +++ geronimo/server/trunk/plugins/system-database/system-database/ 
>>> pom.xml Mon Mar 17 13:13:46 2008
>>> @@ -40,6 +40,13 @@
>>>      <dependencies>
>>>          <dependency>
>>>              <groupId>org.apache.geronimo.configs</groupId>
>>> +            <artifactId>derby</artifactId>
>>> +            <version>${version}</version>
>>> +            <type>car</type>
>>> +        </dependency>
>>> +
>>> +        <dependency>
>>> +            <groupId>org.apache.geronimo.configs</groupId>
>>>              <artifactId>connector-deployer</artifactId>
>>>              <version>${version}</version>
>>>              <type>car</type>
>>> @@ -63,21 +70,6 @@
>>>              <groupId>org.apache.geronimo.modules</groupId>
>>>              <artifactId>geronimo-timer</artifactId>
>>>              <version>${version}</version>
>>> -        </dependency>
>>> -
>>> -        <dependency>
>>> -            <groupId>org.apache.derby</groupId>
>>> -            <artifactId>derby</artifactId>
>>> -        </dependency>
>>> -
>>> -        <dependency>
>>> -            <groupId>org.apache.derby</groupId>
>>> -            <artifactId>derbynet</artifactId>
>>> -        </dependency>
>>> -
>>> -        <dependency>
>>> -            <groupId>org.apache.derby</groupId>
>>> -            <artifactId>derbyclient</artifactId>
>>>          </dependency>
>>>
>>>          <dependency>
>>>
>>>


Mime
View raw message