Attachment #131676 for bug #224260

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 224260
Collapse All | Expand All

Lines 1-3 Link Here

(-)a/db.drivers/external/binaries-list (-2 / +2 lines)
1	85DFEDAD243DC0303AD7AE3A323C39421D220690 mysql-connector-java-5.1.18-bin.jar	1	C264E2114579474D13DD808A510FC74E762DDA8C mysql-connector-java-5.1.23-bin.jar
2	9BFABE48876EC38F6CBAA6931BAD05C64A9EA942 postgresql-9.1-901.jdbc4.jar	2	65B528162F7CF20B4D44BC31A446724E217BA35B postgresql-9.2-1002.jdbc4.jar
3		3

Lines 1-10 Link Here

(-)a/db.drivers/external/mysql-connector-java-5.1.18-bin-license.txt (-2 / +2 lines)
1	Name: MySQL Connector/J	1	Name: MySQL Connector/J
2	Version: 5.1.18	2	Version: 5.1.23
3	Description: Allows Java programs to interact with a MySQL database	3	Description: Allows Java programs to interact with a MySQL database
4	License: GPL	4	License: GPL
5	OSR: 7015	5	OSR: 7015
6	Origin: http://dev.mysql.com/downloads/connector/j/	6	Origin: http://dev.mysql.com/downloads/connector/j/
7	Files: mysql-connector-java-5.1.18-bin.jar	7	Files: mysql-connector-java-5.1.23-bin.jar
8	Source: http://dev.mysql.com/downloads/connector/j/	8	Source: http://dev.mysql.com/downloads/connector/j/
9	Comment: Out-of-the-box support for MySQL Java database applications	9	Comment: Out-of-the-box support for MySQL Java database applications
10		10




Name: PostgreSQL JDBC Driver
Version: 9.2-1002
Description: Allows Java programs to interact with a PostgreSQL database
License: BSD
OSR: 7016
Origin: http://jdbc.postgresql.org/license.html
Files: postgresql-9.2-1002.jdbc4.jar
Comment: Out-of-the-box support for Postgres Java database applications

Copyright (c) 1997-2011, PostgreSQL Global Development Group
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. Neither the name of the PostgreSQL Global Development Group nor the names
   of its contributors may be used to endorse or promote products derived
   from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS 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 COPYRIGHT OWNER OR 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.

Lines 42-49 Link Here

(-)a/db.drivers/nbproject/project.properties (-4 / +4 lines)
42		42
43	javac.compilerargs=-Xlint -Xlint:-serial	43	javac.compilerargs=-Xlint -Xlint:-serial
44	javac.source=1.6	44	javac.source=1.6
45	release.external/mysql-connector-java-5.1.18-bin.jar=modules/ext/mysql-connector-java-5.1.18-bin.jar	45	release.external/mysql-connector-java-5.1.23-bin.jar=modules/ext/mysql-connector-java-5.1.23-bin.jar
46	release.external/postgresql-9.1-901.jdbc4.jar=modules/ext/postgresql-9.1-901.jdbc4.jar	46	release.external/postgresql-9.2-1002.jdbc4.jar=modules/ext/postgresql-9.2-1002.jdbc4.jar
47	jnlp.indirect.jars=\	47	jnlp.indirect.jars=\
48	modules/ext/mysql-connector-java-5.1.18-bin.jar,\	48	modules/ext/mysql-connector-java-5.1.23-bin.jar,\
49	modules/ext/postgresql-9.1-901.jdbc4.jar	49	modules/ext/postgresql-9.2-1002.jdbc4.jar

Lines 46-50 Link Here

(-)a/db.drivers/src/org/netbeans/modules/db/drivers/Bundle.properties (-1 / +1 lines)
46	OpenIDE-Module-Short-Description=JDBC database drivers	46	OpenIDE-Module-Short-Description=JDBC database drivers
47	OpenIDE-Module-Long-Description=\	47	OpenIDE-Module-Long-Description=\
48	<html>This plugin provides JDBC database drivers for an improved out-of-the-box experience when developing database applications. \	48	<html>This plugin provides JDBC database drivers for an improved out-of-the-box experience when developing database applications. \
49	<p>The following drivers are included in this plugin: <ul> <li>MySQL Connector/J Version: 5.1.18</li> <li>PostgreSQL JDBC 4 Driver Version: 9.1-901</li> </ul> </p></html>	49	<p>The following drivers are included in this plugin: <ul> <li>MySQL Connector/J Version: 5.1.23</li> <li>PostgreSQL JDBC 4 Driver Version: 9.2-1002</li> </ul> </p></html>
50	PostgreSQLDriver=PostgreSQL JDBC Driver	50	PostgreSQLDriver=PostgreSQL JDBC Driver

Lines 5-11 Link Here

(-)a/db.drivers/src/org/netbeans/modules/db/drivers/MySQLDriver.xml (-2 / +2 lines)
5	<localizing-bundle>org.netbeans.modules.db.drivers.Bundle</localizing-bundle>	5	<localizing-bundle>org.netbeans.modules.db.drivers.Bundle</localizing-bundle>
6	<volume>	6	<volume>
7	<type>classpath</type>	7	<type>classpath</type>
8	<resource>jar:nbinst://org.netbeans.modules.db.drivers/modules/ext/mysql-connector-java-5.1.18-bin.jar!/</resource>	8	<resource>jar:nbinst://org.netbeans.modules.db.drivers/modules/ext/mysql-connector-java-5.1.23-bin.jar!/</resource>
9	</volume>	9	</volume>
10	<volume>	10	<volume>
11	<type>src</type>	11	<type>src</type>
Lines 19-25 Link Here
19	<!-- please check with mkleint@netbeans.org before/after updating this or "classpath" section -->	19	<!-- please check with mkleint@netbeans.org before/after updating this or "classpath" section -->
20	<property>	20	<property>
21	<name>maven-dependencies</name>	21	<name>maven-dependencies</name>
22	<value>mysql:mysql-connector-java:5.1.18:jar</value>	22	<value>mysql:mysql-connector-java:5.1.23:jar</value>
23	</property>	23	</property>
24	</properties>	24	</properties>
25	</library>	25	</library>

Lines 5-11 Link Here

(-)a/db.drivers/src/org/netbeans/modules/db/drivers/PostgreSQLDriver.xml (-2 / +2 lines)
5	<localizing-bundle>org.netbeans.modules.db.drivers.Bundle</localizing-bundle>	5	<localizing-bundle>org.netbeans.modules.db.drivers.Bundle</localizing-bundle>
6	<volume>	6	<volume>
7	<type>classpath</type>	7	<type>classpath</type>
8	<resource>jar:nbinst://org.netbeans.modules.db.drivers/modules/ext/postgresql-9.1-901.jdbc4.jar!/</resource>	8	<resource>jar:nbinst://org.netbeans.modules.db.drivers/modules/ext/postgresql-9.2-1002.jdbc4.jar!/</resource>
9	</volume>	9	</volume>
10	<volume>	10	<volume>
11	<type>src</type>	11	<type>src</type>
Lines 19-25 Link Here
19	<!-- please check with mkleint@netbeans.org before/after updating this or "classpath" section -->	19	<!-- please check with mkleint@netbeans.org before/after updating this or "classpath" section -->
20	<property>	20	<property>
21	<name>maven-dependencies</name>	21	<name>maven-dependencies</name>
22	<value>postgresql:postgresql:9.1-901.jdbc4:jar</value>	22	<value>postgresql:postgresql:9.2-1002.jdbc4:jar</value>
23	</property>	23	</property>
24	</properties>	24	</properties>
25	</library>	25	</library>

Lines 49-54 Link Here

(-)a/db.drivers/src/org/netbeans/modules/db/drivers/mysql.xml (-1 / +1 lines)
49	<display-name value='MySQL (Connector/J driver)'/>	49	<display-name value='MySQL (Connector/J driver)'/>
50	<class value='com.mysql.jdbc.Driver'/>	50	<class value='com.mysql.jdbc.Driver'/>
51	<urls>	51	<urls>
52	<url value="nbinst://org.netbeans.modules.db.drivers/modules/ext/mysql-connector-java-5.1.18-bin.jar"/>	52	<url value="nbinst://org.netbeans.modules.db.drivers/modules/ext/mysql-connector-java-5.1.23-bin.jar"/>
53	</urls>	53	</urls>
54	</driver>	54	</driver>

Lines 49-54 Link Here

(-)a/db.drivers/src/org/netbeans/modules/db/drivers/postgresql.xml (-1 / +1 lines)
49	<display-name value='PostgreSQL'/>	49	<display-name value='PostgreSQL'/>
50	<class value='org.postgresql.Driver'/>	50	<class value='org.postgresql.Driver'/>
51	<urls>	51	<urls>
52	<url value="nbinst://org.netbeans.modules.db.drivers/modules/ext/postgresql-9.1-901.jdbc4.jar"/>	52	<url value="nbinst://org.netbeans.modules.db.drivers/modules/ext/postgresql-9.2-1002.jdbc4.jar"/>
53	</urls>	53	</urls>
54	</driver>	54	</driver>

Return to bug 224260

Lines 1-10 Link Here

(-)a/db.drivers/external/postgresql-9.1-901-license.txt (-3 / +28 lines)
1	Name: PostgreSQL JDBC Driver	1	Name: PostgreSQL JDBC Driver
2	Version: 9.1-901	2	Version: 9.2-1002
3	Description: Allows Java programs to interact with a PostgreSQL database	3	Description: Allows Java programs to interact with a PostgreSQL database
4	License: BSD	4	License: BSD
5	OSR: 7016	5	OSR: 7016
6	Origin: http://jdbc.postgresql.org/license.html	6	Origin: http://jdbc.postgresql.org/license.html
7	Files: postgresql-9.1-901.jdbc4.jar	7	Files: postgresql-9.2-1002.jdbc4.jar
8	Comment: Out-of-the-box support for Postgres Java database applications	8	Comment: Out-of-the-box support for Postgres Java database applications
9		9
10	Copyright (c) 1997-2010, PostgreSQL Global Development Group 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. Neither the name of the PostgreSQL Global Development Group nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR 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.	10	Copyright (c) 1997-2011, PostgreSQL Global Development Group
		11	All rights reserved.
		12
		13	Redistribution and use in source and binary forms, with or without
		14	modification, are permitted provided that the following conditions are met:
		15
		16	1. Redistributions of source code must retain the above copyright notice,
		17	this list of conditions and the following disclaimer.
		18	2. Redistributions in binary form must reproduce the above copyright notice,
		19	this list of conditions and the following disclaimer in the documentation
		20	and/or other materials provided with the distribution.
		21	3. Neither the name of the PostgreSQL Global Development Group nor the names
		22	of its contributors may be used to endorse or promote products derived
		23	from this software without specific prior written permission.
		24
		25	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
		26	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
		27	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
		28	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
		29	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
		30	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		31	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
		32	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
		33	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
		34	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
		35	POSSIBILITY OF SUCH DAMAGE.