geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r620430 - in /geronimo/plugins/roller/trunk: README pom.xml roller-mysql-database/pom.xml
Date Mon, 11 Feb 2008 07:21:19 GMT
Author: djencks
Date: Sun Feb 10 23:21:18 2008
New Revision: 620430

URL: http://svn.apache.org/viewvc?rev=620430&view=rev
Log:
GERONIMO-3816 make the mysq jar a prerequisite of the roller-mysql-database plugin, which
should satisfy the asf requirements about notice for license-incompatible dependendences.
 Patch by Peter Petersson with some explanatory text changes

Modified:
    geronimo/plugins/roller/trunk/README
    geronimo/plugins/roller/trunk/pom.xml
    geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml

Modified: geronimo/plugins/roller/trunk/README
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/README?rev=620430&r1=620429&r2=620430&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/README (original)
+++ geronimo/plugins/roller/trunk/README Sun Feb 10 23:21:18 2008
@@ -18,18 +18,19 @@
 installation function that will set up the roller derby database and you will be up and running
using the derby database.  
 
 Roller with MySql Licensing:
-MySQL cannot be included with roller. MySQL is Licensed under the GPL license: http://www.mysql.com/company/legal/licensing/
-and also under a FLOSS exception: http://www.mysql.com/company/legal/licensing/foss-exception.html.
 
-Neither of these license terms are compatible with the goals of the ASF. Thus, we are not
able to provide a MySQL roller plugin.
-However, this does not mean you cannot use MySQL with the roller plugin. You'll just need
to build it yourself. 
+MySQL is Licensed under the GPL license: http://www.mysql.com/company/legal/licensing/
+and also under a FLOSS exception: http://www.mysql.com/company/legal/licensing/foss-exception.html.
 
-To build the roller-mysql-database plugin:
+Neither of these license terms are compatible with the goals of the ASF. 
 
-   * edit roller-mysql-database/pom.xml, and uncomment the dependency for mysql-connector-java
-   * cd to the roller-mysql-database directory and run 'mvn'
+The mysql-connector-java jar should not be needed to build the roller-mysql-database plugin
(it is marked as an optional dependency) but
+for unknown reasons it is currently downloaded during the build.  The only purpose of including
the dependency in the pom is to get it 
+into the geronimo plugin dependency list.
 
-This will build the roller-mysql-database plugin.
+The mysql-connector-java jar is listed as a prerequisite of the roller-mysql-database plugin.
 This has the effect of requiring the user
+to install the mysql jar themselves into their geronimo server before installing the roller-mysql-database
plugin.  The licensing issues
+are explained in text in the prerequisite specification.
 
 Roller with MySql Setup:
 At any time you can start using mysql as database back-end by installing the roller-mysql
plugin module.

Modified: geronimo/plugins/roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/pom.xml?rev=620430&r1=620429&r2=620430&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/pom.xml (original)
+++ geronimo/plugins/roller/trunk/pom.xml Sun Feb 10 23:21:18 2008
@@ -161,18 +161,15 @@
                 <version>1.2.3</version>
             </dependency>
 
-            <!--
-                Don't include the following MySQL dependency due to licensing issues.
-                See the README
-              -->
-<!--
+<!-- this is required only to include in the roller-mysql-database plugin.  See comments
in README and plugin pom -->
             <dependency>
                 <groupId>mysql</groupId>
                 <artifactId>mysql-connector-java</artifactId>
                 <version>3.1.12</version>
                 <type>jar</type>
+                <optional>true</optional>
             </dependency>
--->
+
         </dependencies>
     </dependencyManagement>
 
@@ -266,15 +263,16 @@
         <module>roller-resources</module>
         <module>roller-derby-database</module>
         <!--
-            Don't build the roller-mysql-database plugin because of 
-            licensing issues. See the README for more info.
+            The mysql connector jar dependency should not be needed to be downloaded by maven
(see optional flag)
+            but apparently it is downloaded anyway.  It is not included in any plugin.  A
user must install
+            this mysql jar in their geronimo server by hand before installing the roller-mysql-database
plugin.
           -->
-<!--         <module>roller-mysql-database</module> -->
+        <module>roller-mysql-database</module> 
         <module>roller-themes</module>
         <module>roller-jetty</module>
         <module>roller-tomcat</module>
         <module>geronimo-jetty-roller</module>
-        <module>geronimo-tomcat-roller</module>
+        <module>geronimo-tomcat-roller</module>             
     </modules>
 
 </project>

Modified: geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml?rev=620430&r1=620429&r2=620430&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml Sun Feb 10 23:21:18 2008
@@ -69,13 +69,14 @@
              you, uncomment the following dependency and run mvn to
              build the roller-mysql-database plugin.
           -->
-<!--
+<!-- optional is intended to make this build without the mysql jar being present (its
only needed to get into the plugin depenedency list).
+Currently this doesn't seem to work -->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <type>jar</type>
+            <optional>true</optional>
         </dependency>
--->
 
     </dependencies>
 
@@ -98,9 +99,30 @@
                     <useMavenDependencies>
                         <value>true</value>
                         <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
+                    </useMavenDependencies>                     
                     <instance>
                         <plugin-artifact>
+                            <prerequisite>
+                                <id>
+                                    <groupId>mysql</groupId>
+                                    <artifactId>mysql-connector-java</artifactId>
+                                    <version>3.1.12</version>
+                                    <type>jar</type>
+                                </id>
+                                <resource-type>Database Connector</resource-type>
+                                <description>
+                                    This module requires the mysql connector to be present
in the Geronimo repository. 
+                                    MySQL is Licensed under the GPL license: http://www.mysql.com/company/legal/licensing/
+                                    MySQL is also available under a FLOSS exception: http://www.mysql.com/company/legal/licensing/foss-exception.html.
+                                    The FLOSS exception only be applied to MySQL when it
is used under an OSI-approved license.
+
+                                    Neither of these licenses are compatible with the goals
of the Apache Software Foundation. 
+                                    Thus, we cannot let the MySQL roller plugin automaticaly
download the connector for you. 
+                                    How ever if either of the above license terms are acceptable
to you, you may download the 
+                                    connector into the Geronimo repository yourself and re-select/install
this module to  
+                                    enable roller with a mysql connector. 
+                                </description>
+                            </prerequisite>
                             <artifact-alias key="org.apache.geronimo.plugins/roller-derby-database/${version}/car">org.apache.geronimo.plugins/roller-mysql-database/${version}/car</artifact-alias>
                         </plugin-artifact>
                     </instance>



Mime
View raw message