Thread: [Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5918] trunk/sql12 (Page 2)
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: <ger...@us...> - 2010-10-13 02:17:14
|
Revision: 5918 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5918&view=rev Author: gerdwagner Date: 2010-10-13 02:17:07 +0000 (Wed, 13 Oct 2010) Log Message: ----------- New SQL Script preference that allows to choose the escape string for new lines. Modified Paths: -------------- trunk/sql12/doc/src/main/resources/changes.txt trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/prefs/SQLScriptPreferenceBean.java trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/prefs/SQLScriptPreferencesPanel.java trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptCommand.java trunk/sql12/plugins/sqlscript/src/main/resources/net/sourceforge/squirrel_sql/plugins/sqlscript/prefs/I18NStrings.properties trunk/sql12/web-site/home.html Modified: trunk/sql12/doc/src/main/resources/changes.txt =================================================================== --- trunk/sql12/doc/src/main/resources/changes.txt 2010-10-12 11:42:00 UTC (rev 5917) +++ trunk/sql12/doc/src/main/resources/changes.txt 2010-10-13 02:17:07 UTC (rev 5918) @@ -6,6 +6,9 @@ Enhancements: +SQL Scripts Plugin: + New preference that allows to choose the escape string for new lines. See Global Preferences --> Tab SQL Scripts + Hibernate Plugin: - New handling of limiting object count for HQL queries. This may prevent severe performance problems. Formerly the limit was set more or less under the hood (SQL limit was used). Modified: trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/prefs/SQLScriptPreferenceBean.java =================================================================== --- trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/prefs/SQLScriptPreferenceBean.java 2010-10-12 11:42:00 UTC (rev 5917) +++ trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/prefs/SQLScriptPreferenceBean.java 2010-10-13 02:17:07 UTC (rev 5918) @@ -37,6 +37,8 @@ private boolean qualifyTableNames = true; private boolean useDoubleQuotes = true; + private boolean escapeNewLine = true; + private String escapeNewLineString = ESCAPE_NEW_LINE_STRING_DEFAULT; public static final int NO_ACTION = 0; @@ -60,8 +62,9 @@ * whether or not to override the update referential action for FK defs. */ private boolean updateRefAction = false; + public static final String ESCAPE_NEW_LINE_STRING_DEFAULT = "\\n"; - public SQLScriptPreferenceBean() { + public SQLScriptPreferenceBean() { super(); } @@ -191,6 +194,31 @@ useDoubleQuotes = b; } + public boolean isEscapeNewLine() + { + return escapeNewLine; + } + public void setEscapeNewLine(boolean escapeNewLine) + { + this.escapeNewLine = escapeNewLine; + } + + public void setEscapeNewLineString(String escapeNewLineString) + { + if(null == escapeNewLineString) + { + this.escapeNewLineString = ESCAPE_NEW_LINE_STRING_DEFAULT; + } + else + { + this.escapeNewLineString = escapeNewLineString; + } + } + + public String getEscapeNewLineString() + { + return escapeNewLineString; + } } Modified: trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/prefs/SQLScriptPreferencesPanel.java =================================================================== --- trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/prefs/SQLScriptPreferencesPanel.java 2010-10-12 11:42:00 UTC (rev 5917) +++ trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/prefs/SQLScriptPreferencesPanel.java 2010-10-13 02:17:07 UTC (rev 5918) @@ -18,18 +18,11 @@ */ package net.sourceforge.squirrel_sql.plugins.sqlscript.prefs; -import java.awt.Component; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Insets; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import javax.swing.DefaultComboBoxModel; -import javax.swing.JCheckBox; -import javax.swing.JComboBox; -import javax.swing.JLabel; -import javax.swing.JPanel; +import javax.swing.*; import javax.swing.border.Border; import javax.swing.border.CompoundBorder; import javax.swing.border.EmptyBorder; @@ -67,6 +60,12 @@ JLabel deleteActionLabel = null; JLabel updateActionLabel = null; + + + JCheckBox escapeNewLineCheckBox; + JLabel escapeNewLineLabel; + JTextField escapeNewLineTextfield; + public SQLScriptPreferencesPanel(SQLScriptPreferenceBean prefs) { super(); @@ -91,12 +90,19 @@ //i18n[SQLScriptPreferencesPanel.borderTitle=SQL Script Preferences] String borderTitle = s_stringMgr.getString("SQLScriptPreferencesPanel.borderTitle"); result.setBorder(getTitledBorder(borderTitle)); - addQualifyTableNamesCheckBox(result, 0, 0); + + addQualifyTableNamesCheckBox(result, 0, 0); addUseDoubleQuotesCheckBox(result, 0, 1); + addDeleteRefActionCheckBox(result, 0, 2); addDeleteActionComboBox(result, 0, 3); + addUpdateRefActionCheckBox(result, 0, 4); addUpdateActionComboBox(result, 0, 5); + + addEscapeNewLineCheckBox(result, 0, 6); + addEscapeNewLineTextField(result, 0, 7); + return result; } @@ -190,6 +196,28 @@ panel.add(updateReferentialActionCheckbox, c); } + private void addEscapeNewLineCheckBox(JPanel panel, int col, int row) { + GridBagConstraints c = new GridBagConstraints(); + c.gridx = col; + c.gridy = row; + c.anchor = GridBagConstraints.WEST; + + String cbLabelStr = + s_stringMgr.getString("SQLScriptPreferencesPanel.escapeNewLine"); + + escapeNewLineCheckBox = new JCheckBox(cbLabelStr); + + escapeNewLineCheckBox.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + boolean enabled = escapeNewLineCheckBox.isSelected(); + escapeNewLineLabel.setEnabled(enabled); + escapeNewLineTextfield.setEnabled(enabled); + } + }); + + panel.add(escapeNewLineCheckBox, c); + } + private void addDeleteActionComboBox(JPanel panel, int col, int row) { GridBagConstraints c = new GridBagConstraints(); c.gridx = col; @@ -256,8 +284,29 @@ panel.add(subpanel, c); } + private void addEscapeNewLineTextField(JPanel panel, int col, int row) { + GridBagConstraints c = new GridBagConstraints(); + c.gridx = col; + c.gridy = row; + c.insets = new Insets(5,25,0,0); + c.anchor = GridBagConstraints.WEST; + + JPanel subpanel = new JPanel(); + + String cbLabelStr = + s_stringMgr.getString("SQLScriptPreferencesPanel.escapeNewLineTextfieldLabel"); + escapeNewLineLabel = new JLabel(cbLabelStr); + escapeNewLineLabel.setHorizontalAlignment(JLabel.LEFT); + + escapeNewLineTextfield = new JTextField(); + escapeNewLineTextfield.setPreferredSize(new Dimension(50, escapeNewLineCheckBox.getPreferredSize().height)); + subpanel.add(escapeNewLineLabel); + subpanel.add(escapeNewLineTextfield); + panel.add(subpanel, c); + } + + - private Border getTitledBorder(String title) { CompoundBorder border = new CompoundBorder(new EmptyBorder(10,10,10,10), @@ -275,6 +324,13 @@ updateReferentialActionCheckbox.setSelected(_prefs.isUpdateRefAction()); updateActionComboBox.setEnabled(updateReferentialActionCheckbox.isSelected()); updateActionComboBox.setSelectedIndex(_prefs.getUpdateAction()); + + escapeNewLineCheckBox.setSelected(_prefs.isEscapeNewLine()); + escapeNewLineTextfield.setText(_prefs.getEscapeNewLineString()); + escapeNewLineTextfield.setEnabled(_prefs.isEscapeNewLine()); + escapeNewLineLabel.setEnabled(_prefs.isEscapeNewLine()); + + } @@ -287,6 +343,16 @@ _prefs.setDeleteAction(action); action = updateActionComboBox.getSelectedIndex(); _prefs.setUpdateAction(action); + + _prefs.setEscapeNewLine(escapeNewLineCheckBox.isSelected()); + + String escapeString = SQLScriptPreferenceBean.ESCAPE_NEW_LINE_STRING_DEFAULT; + if(null != escapeNewLineTextfield.getText()) + { + escapeString = escapeNewLineTextfield.getText(); + } + _prefs.setEscapeNewLineString(escapeString); + SQLScriptPreferencesManager.savePrefs(); } Modified: trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptCommand.java =================================================================== --- trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptCommand.java 2010-10-12 11:42:00 UTC (rev 5917) +++ trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptCommand.java 2010-10-13 02:17:07 UTC (rev 5918) @@ -389,25 +389,11 @@ sResult = sb.toString(); } - iIndex = sResult.indexOf('\n'); - if (iIndex != -1) + if (SQLScriptPreferencesManager.getPreferences().isEscapeNewLine()) { - int iPrev = 0; - StringBuffer sb = new StringBuffer(); - sb.append(sResult.substring(iPrev, iIndex)); - sb.append("\\n"); - iPrev = iIndex + 1; - iIndex = sResult.indexOf('\n', iPrev + 1); - while (iIndex != -1) - { - sb.append(sResult.substring(iPrev, iIndex)); - sb.append("\\n"); - iPrev = iIndex + 1; - iIndex = sResult.indexOf('\n', iPrev + 1); - } - sb.append(sResult.substring(iPrev)); - sResult = sb.toString(); + sResult = escapeNewlines(sResult); } + sbValues.append("\'"); sbValues.append(sResult); sbValues.append("\'"); @@ -442,7 +428,34 @@ srcResult.close(); } - /** + private String escapeNewlines(String sResult) + { + String escape = SQLScriptPreferencesManager.getPreferences().getEscapeNewLineString(); + + int iIndex; + iIndex = sResult.indexOf('\n'); + if (iIndex != -1) + { + int iPrev = 0; + StringBuffer sb = new StringBuffer(); + sb.append(sResult.substring(iPrev, iIndex)); + sb.append(escape); + iPrev = iIndex + escape.length(); + iIndex = sResult.indexOf('\n', iPrev-1); + while (iIndex != -1) + { + sb.append(sResult.substring(iPrev-1, iIndex)); + sb.append(escape); + iPrev = iIndex + escape.length(); + iIndex = sResult.indexOf('\n', iPrev-1); + } + sb.append(sResult.substring(iPrev-1)); + sResult = sb.toString(); + } + return sResult; + } + + /** * Returns the sub-second precision value from the specified timestamp if supported by the session's * dialect. * Modified: trunk/sql12/plugins/sqlscript/src/main/resources/net/sourceforge/squirrel_sql/plugins/sqlscript/prefs/I18NStrings.properties =================================================================== --- trunk/sql12/plugins/sqlscript/src/main/resources/net/sourceforge/squirrel_sql/plugins/sqlscript/prefs/I18NStrings.properties 2010-10-12 11:42:00 UTC (rev 5917) +++ trunk/sql12/plugins/sqlscript/src/main/resources/net/sourceforge/squirrel_sql/plugins/sqlscript/prefs/I18NStrings.properties 2010-10-13 02:17:07 UTC (rev 5918) @@ -15,3 +15,5 @@ SQLScriptPreferencesPanel.useDoubleQuotesForQualifying=Use double quotes (") for qualifying +SQLScriptPreferencesPanel.escapeNewLine=New lines in literals should be escaped by +SQLScriptPreferencesPanel.escapeNewLineTextfieldLabel=Escape character/string: Modified: trunk/sql12/web-site/home.html =================================================================== --- trunk/sql12/web-site/home.html 2010-10-12 11:42:00 UTC (rev 5917) +++ trunk/sql12/web-site/home.html 2010-10-13 02:17:07 UTC (rev 5918) @@ -77,7 +77,7 @@ <P><B> For all changes see <a - href="http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/doc/changes.txt">Changelog</a>. + href="http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/doc/src/main/resources/changes.txt">Changelog</a>. Likewise, please refer SQuirreL's help section for an overview of all features. <p><a href="#installation">Download</A></p> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ger...@us...> - 2010-10-13 17:12:37
|
Revision: 5919 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5919&view=rev Author: gerdwagner Date: 2010-10-13 17:12:31 +0000 (Wed, 13 Oct 2010) Log Message: ----------- Popup-Menu for adding or removing driver specific properties didn't appear in driver properties tab of alias properties on Win XP. (See patch 3083166) Modified Paths: -------------- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/DriverPropertiesTable.java trunk/sql12/doc/src/main/resources/changes.txt Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/DriverPropertiesTable.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/DriverPropertiesTable.java 2010-10-13 02:17:07 UTC (rev 5918) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/DriverPropertiesTable.java 2010-10-13 17:12:31 UTC (rev 5919) @@ -225,6 +225,10 @@ @Override public void mouseReleased(MouseEvent e) { - /* Do Nothing */ + // According to the JavaDoc isPopupTrigger should be checked at mousePressed and mouseReleased + if (e.isPopupTrigger()) + { + popupMenu.show(e.getComponent(), e.getX(), e.getY()); + } } } Modified: trunk/sql12/doc/src/main/resources/changes.txt =================================================================== --- trunk/sql12/doc/src/main/resources/changes.txt 2010-10-13 02:17:07 UTC (rev 5918) +++ trunk/sql12/doc/src/main/resources/changes.txt 2010-10-13 17:12:31 UTC (rev 5919) @@ -8,6 +8,7 @@ SQL Scripts Plugin: New preference that allows to choose the escape string for new lines. See Global Preferences --> Tab SQL Scripts + (See patch #3079664 by Paul Wagland) Hibernate Plugin: - New handling of limiting object count for HQL queries. This may prevent severe performance problems. @@ -37,6 +38,10 @@ Bug-fixes: +Popup-Menu for adding or removing driver specific properties didn't appear in driver properties + tab of alias properties on Win XP. (See patch 3083166) + + Double click in Alias tree always opened the selected Alias even if the mouse pointer wasn't placed on the Alias. This way Aliases where opened when tree nodes where quickly closed or opened. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ger...@us...> - 2010-10-16 16:56:29
|
Revision: 5921 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5921&view=rev Author: gerdwagner Date: 2010-10-16 16:56:19 +0000 (Sat, 16 Oct 2010) Log Message: ----------- 3086444: Date/Time/Timestamp types did not display right after application restart when others than standard formats were chosen in Global Prefs. (See patch 3087989) Modified Paths: -------------- trunk/sql12/doc/src/main/resources/changes.txt trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeDate.java trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeTime.java trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeTimestamp.java trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/ThreadSafeDateFormat.java trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeDateTest.java Added Paths: ----------- trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeDateWithCustomDateFormatTest.java Modified: trunk/sql12/doc/src/main/resources/changes.txt =================================================================== --- trunk/sql12/doc/src/main/resources/changes.txt 2010-10-15 16:22:00 UTC (rev 5920) +++ trunk/sql12/doc/src/main/resources/changes.txt 2010-10-16 16:56:19 UTC (rev 5921) @@ -38,6 +38,10 @@ Bug-fixes: +3086444: Date/Time/Timestamp types did not display right after application restart when others than standard + formats were chosen in Global Prefs. (See patch 3087989) + + Popup-Menu for adding or removing driver specific properties didn't appear in driver properties tab of alias properties on Win XP. (See patch 3083166) Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeDate.java =================================================================== --- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeDate.java 2010-10-15 16:22:00 UTC (rev 5920) +++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeDate.java 2010-10-16 16:56:19 UTC (rev 5921) @@ -205,8 +205,22 @@ { readDateAsTimestamp = true; } + + /* + * After loading the properties, we must initialize the dateFormat. + * See Bug 3086444 + */ + initDateFormat(localeFormat, lenient); } } + + /** + * Defines the dateFormat with the specific format and lenient options + */ + private static void initDateFormat(int format, boolean lenient) { + dateFormat = new ThreadSafeDateFormat(format); // lenient is set next + dateFormat.setLenient(lenient); + } public static boolean getReadDateAsTimestamp() { propertiesAlreadyLoaded = false; @@ -909,6 +923,9 @@ DTProperties.put(thisClassName, "readDateAsTimestamp", Boolean.valueOf(readDateAsTimestamp).toString()); + + initDateFormat(localeFormat, lenient); + } } // end of inner class Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeTime.java =================================================================== --- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeTime.java 2010-10-15 16:22:00 UTC (rev 5920) +++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeTime.java 2010-10-16 16:56:19 UTC (rev 5921) @@ -190,10 +190,26 @@ thisClassName, "lenient"); if (lenientString != null && lenientString.equals("false")) lenient =false; + + /* + * After loading the properties, we must initialize the dateFormat. + * See Bug 3086444 + */ + initDateFormat(localeFormat, lenient); + } } /** + * Defines the dateFormat with the specific format and lenient options + */ + private static void initDateFormat(int format, boolean lenient) { + dateFormat = new ThreadSafeDateFormat(format, true); // lenient is set next + dateFormat.setLenient(lenient); + } + + + /** * Return the name of the java class used to hold this data type. */ public String getClassName() { @@ -841,6 +857,9 @@ DTProperties.put(thisClassName, "lenient", Boolean.valueOf(lenient).toString()); + + initDateFormat(localeFormat, lenient); + } } // end of inner class Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeTimestamp.java =================================================================== --- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeTimestamp.java 2010-10-15 16:22:00 UTC (rev 5920) +++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeTimestamp.java 2010-10-16 16:56:19 UTC (rev 5921) @@ -216,10 +216,22 @@ thisClassName, "whereClauseUsage"); if (whereClauseUsageString != null) whereClauseUsage = Integer.parseInt(whereClauseUsageString); + + initDateFormat(localeFormat, lenient); + } } /** + * Defines the dateFormat with the specific format and lenient options + */ + private static void initDateFormat(int format, boolean lenient) { + dateFormat = new ThreadSafeDateFormat(localeFormat, localeFormat); // lenient is set next + dateFormat.setLenient(lenient); + } + + + /** * Return the name of the java class used to hold this data type. */ public String getClassName() { @@ -925,6 +937,10 @@ DTProperties.put(thisClassName, "whereClauseUsage", Integer.toString(whereClauseUsage)); + + + initDateFormat(localeFormat, lenient); + } } // end of inner class Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/ThreadSafeDateFormat.java =================================================================== --- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/ThreadSafeDateFormat.java 2010-10-15 16:22:00 UTC (rev 5920) +++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/ThreadSafeDateFormat.java 2010-10-16 16:56:19 UTC (rev 5921) @@ -32,17 +32,9 @@ /** internal protected instance of DateFormat */ private DateFormat dateFormat; - - /** + + /** * Constructor - * @param dateFormat the DateFormat instance to protect. - */ - public ThreadSafeDateFormat(DateFormat dateFormat) { - this.dateFormat = dateFormat; - } - - /** - * Constructor * @param style the given formatting style. For example, * SHORT for "M/d/yy" in the US locale. */ Modified: trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeDateTest.java =================================================================== --- trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeDateTest.java 2010-10-15 16:22:00 UTC (rev 5920) +++ trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeDateTest.java 2010-10-16 16:56:19 UTC (rev 5921) @@ -1,9 +1,12 @@ package net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent; -import static org.junit.Assert.assertFalse; +import static org.junit.Assert.*; import java.sql.Date; +import javax.swing.JTextArea; +import javax.swing.JTextField; + import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition; import org.junit.Before; @@ -54,6 +57,23 @@ assertFalse("Expected default value to be false for read date as timestamp", DataTypeDate.getReadDateAsTimestamp()); } + + + /** + * Ensure, that the Bug 3086444 is solved. + * If the user didn't choose a custom DateFormat, then we must use the default. + */ + @Test + public void testUseCustomDateFormatAfterLoadingProperties() + { + + Date currentDate = Date.valueOf("2010-10-15"); + + + String renderedDate = classUnderTest.renderObject(currentDate); + assertEquals("Must use the default format", "2010-10-15", renderedDate); + + } @Override protected Object getEqualsTestObject() Added: trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeDateWithCustomDateFormatTest.java =================================================================== --- trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeDateWithCustomDateFormatTest.java (rev 0) +++ trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeDateWithCustomDateFormatTest.java 2010-10-16 16:56:19 UTC (rev 5921) @@ -0,0 +1,99 @@ +package net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent; + +import static org.junit.Assert.*; + +import java.sql.Date; +import java.text.DateFormat; + +import javax.swing.JTextArea; +import javax.swing.JTextField; + +import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition; + +import org.junit.Before; +import org.junit.Test; + +/* + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/** + * JUnit test for DataTypeDate class when using custom properties. + * + * @author Stefan Willinger + */ +public class DataTypeDateWithCustomDateFormatTest extends AbstractDataTypeComponentTest +{ + + private static int userDefinedDateFormat = DateFormat.MEDIUM; + + /** + * Setup the test case with user defined properties + * @see net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.AbstractDataTypeComponentTest#setUp() + */ + @Before + public void setUp() throws Exception + { + DTProperties.put(DataTypeDate.class.getName(), "useJavaDefaultFormat", "false"); + DTProperties.put(DataTypeDate.class.getName(), "localeFormat", ""+DateFormat.MEDIUM); + DTProperties.put(DataTypeDate.class.getName(), "lenient", "false"); + DTProperties.put(DataTypeDate.class.getName(), "readDateAsTimestamp", "true"); + + + ColumnDisplayDefinition columnDisplayDefinition = getMockColumnDisplayDefinition(); + mockHelper.replayAll(); + classUnderTest = new DataTypeDate(null, columnDisplayDefinition); + mockHelper.resetAll(); + super.setUp(); + } + + /** + *1757076 (DATE column seen as TIMESTAMP, update in editable mode fails) + * Ensure that we use the user specified value + * */ + @Test + public void testGetReadDateAsTimestamp() + { + assertTrue("Expected the user specified value", + DataTypeDate.getReadDateAsTimestamp()); + } + + + /** + * Ensure, that the Bug 3086444 is solved. + * If the user defines a custom DateFormat, then we must use this after reading the + * properties at startup. + */ + @Test + public void testUseCustomDateFormatAfterLoadingProperties() + { + + Date currentDate = Date.valueOf("2010-10-15"); + + String expectedDate = DateFormat.getDateInstance(userDefinedDateFormat).format(currentDate); + + String renderedDate = classUnderTest.renderObject(currentDate); + assertEquals("Must use the user defined format", expectedDate, renderedDate); + + } + + @Override + protected Object getEqualsTestObject() + { + return new Date(System.currentTimeMillis()); + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ger...@us...> - 2010-10-25 20:10:24
|
Revision: 5930 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5930&view=rev Author: gerdwagner Date: 2010-10-25 20:10:17 +0000 (Mon, 25 Oct 2010) Log Message: ----------- 3085119: NullPointerException when adding tables to graph. Modified Paths: -------------- trunk/sql12/doc/src/main/resources/changes.txt trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/TableFrameController.java Modified: trunk/sql12/doc/src/main/resources/changes.txt =================================================================== --- trunk/sql12/doc/src/main/resources/changes.txt 2010-10-25 19:43:39 UTC (rev 5929) +++ trunk/sql12/doc/src/main/resources/changes.txt 2010-10-25 20:10:17 UTC (rev 5930) @@ -40,6 +40,8 @@ Bug-fixes: +3085119: NullPointerException when adding tables to graph. + 3088284: CSV export doesn't escape quotes. Thanks to wolfgang22 for the patch. 3086444: Date/Time/Timestamp types did not display right after application restart when others than standard formats were chosen in Global Prefs. (See patch 3087989) Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/TableFrameController.java =================================================================== --- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/TableFrameController.java 2010-10-25 19:43:39 UTC (rev 5929) +++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/TableFrameController.java 2010-10-25 20:10:17 UTC (rev 5930) @@ -59,7 +59,7 @@ private TableFrame _frame; private ColumnInfo[] _colInfos; - private ConstraintView[] _constraintViews; + private ConstraintView[] _constraintViews =new ConstraintView[0]; private String[] _tablesExportedTo; // /////////////////////////////////////////// This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ger...@us...> - 2010-10-25 20:24:14
|
Revision: 5931 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5931&view=rev Author: gerdwagner Date: 2010-10-25 20:24:08 +0000 (Mon, 25 Oct 2010) Log Message: ----------- 2693968: The "Load columns in background" setting (session properties -> SQL tab) is lost through restarts. Modified Paths: -------------- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SessionPropertiesBeanInfo.java trunk/sql12/doc/src/main/resources/changes.txt Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SessionPropertiesBeanInfo.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SessionPropertiesBeanInfo.java 2010-10-25 20:10:17 UTC (rev 5930) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SessionPropertiesBeanInfo.java 2010-10-25 20:24:08 UTC (rev 5931) @@ -119,8 +119,12 @@ new PropertyDescriptor(IPropNames.SCHEMA_FILTER_EXCLUDE, SessionProperties.class, "getSchemaFilterExclude", "setSchemaFilterExclude"), new PropertyDescriptor(IPropNames.OBJECT_FILTER_EXCLUDE, SessionProperties.class, - "getObjectFilterExclude", "setObjectFilterExclude") }; + "getObjectFilterExclude", "setObjectFilterExclude"), + new PropertyDescriptor(IPropNames.LOAD_COLUMNS_IN_BACKGROUND, SessionProperties.class, + "getLoadColumnsInBackground", "setLoadColumnsInBackground") + }; + return result; } catch (IntrospectionException e) Modified: trunk/sql12/doc/src/main/resources/changes.txt =================================================================== --- trunk/sql12/doc/src/main/resources/changes.txt 2010-10-25 20:10:17 UTC (rev 5930) +++ trunk/sql12/doc/src/main/resources/changes.txt 2010-10-25 20:24:08 UTC (rev 5931) @@ -40,6 +40,8 @@ Bug-fixes: +2693968: The "Load columns in background" setting (session properties -> SQL tab) is lost through restarts. + 3085119: NullPointerException when adding tables to graph. 3088284: CSV export doesn't escape quotes. Thanks to wolfgang22 for the patch. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-10-30 18:14:50
|
Revision: 5946 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5946&view=rev Author: manningr Date: 2010-10-30 18:14:42 +0000 (Sat, 30 Oct 2010) Log Message: ----------- Use ProgressCallBackFactory (instead of directly instantiating ProgressCallBackDialog) as this safely creates a ProgressCallBackDialog using the EDT (satisfying Substance's strict requirements for initializing Swing components) and removing the need for ugly GUIUtilities.processOnSwingEventThread(...) code everywhere. This also has the nice benefit of allowing code to be test-able in a headless environment by injecting a mock implementation of ProgressCallBackFactory, which creates mock ProgressCallBack implementations. ProgressCallBackAdaptor is provided as a convenience no-op implementation of ProgressCallBack for methods that require ProgressCallBack, but the caller just wants progress feedback and isn't interested in constructing a dialog (SchemaInfo). Modified Paths: -------------- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/ColumnDetailDialog.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/UpdateCommand.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/DeleteTablesCommand.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfo.java trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/ProgressCallBack.java trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/sql/SQLUtilitiesTest.java trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/commands/CopyTableCommand.java trunk/sql12/plugins/postgres/src/main/java/net/sourceforge/squirrel_sql/plugins/postgres/commands/handler/ProgressSQLExecuterHandler.java trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropTablesCommand.java Added Paths: ----------- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/IProgressCallBackFactory.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgressCallBackDialog.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgressCallBackFactory.java trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/gui/ProgressCallBackDialogTestUI.java trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/ProgressCallBackAdaptor.java Removed Paths: ------------- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgessCallBackDialog.java Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/IProgressCallBackFactory.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/IProgressCallBackFactory.java (rev 0) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/IProgressCallBackFactory.java 2010-10-30 18:14:42 UTC (rev 5946) @@ -0,0 +1,47 @@ +package net.sourceforge.squirrel_sql.client.gui; + +import java.awt.Frame; + +import javax.swing.JDialog; + +import net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack; + +/* + * Copyright (C) 2010 Rob Manning + * man...@us... + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +public interface IProgressCallBackFactory +{ + + /** + * @param owner + * @param title + * @param totalItems + * @return + */ + public abstract ProgressCallBack create(Frame owner, String title, int totalItems); + + /** + * @param owner + * @param title + * @param totalItems + * @return + */ + public abstract ProgressCallBack create(JDialog owner, String title, int totalItems); + +} \ No newline at end of file Deleted: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgessCallBackDialog.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgessCallBackDialog.java 2010-10-30 18:06:17 UTC (rev 5945) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgessCallBackDialog.java 2010-10-30 18:14:42 UTC (rev 5946) @@ -1,210 +0,0 @@ -package net.sourceforge.squirrel_sql.client.gui; -/* - * Copyright (C) 2007 Rob Manning - * man...@us... - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -import java.awt.Dialog; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Insets; -import java.awt.Window; - -import javax.swing.BorderFactory; -import javax.swing.JDialog; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JProgressBar; - -import net.sourceforge.squirrel_sql.client.ApplicationArguments; -import net.sourceforge.squirrel_sql.fw.gui.GUIUtils; -import net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack; -import net.sourceforge.squirrel_sql.fw.util.StringManager; -import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; -import net.sourceforge.squirrel_sql.fw.util.log.ILogger; -import net.sourceforge.squirrel_sql.fw.util.log.LoggerController; - -/** - * A simple class that can be used to show the user a dialog to indicate the - * progress of some task using the ProgressCallBack interface. Since certain - * classes in fw module interact with the database and certain operations can - * take quite a long time, letting the user know how it's going is nice. - * However, fw module classes don't (and shouldn't) know anything about the UI - * as this is the responsibility of the app module classes. So, this class - * can be passed in by app classes to certain fw long-running methods to - * bridge the gap and provide feedback to the user. - * - * @author manningr - */ -public class ProgessCallBackDialog extends JDialog - implements ProgressCallBack { - - /** Logger for this class. */ - private final static ILogger s_log = - LoggerController.createLogger(ProgessCallBackDialog.class); - - /** Internationalized strings for this class */ - private static final StringManager s_stringMgr = - StringManagerFactory.getStringManager(ProgessCallBackDialog.class); - - static interface i18n { - //i18n[ProgressCallBackDialog.defaultLoadingPrefix=Loading:] - String DEFAULT_LOADING_PREFIX = - s_stringMgr.getString("ProgressCallBackDialog.defaultLoadingPrefix"); - - //i18n[ProgressCallBackDialog.initialLoadingPrefix=Loading...] - String INITIAL_LOADING_PREFIX = - s_stringMgr.getString("ProgressCallBackDialog.initialLoadingPrefix"); - } - - private int itemCount = 0; - - private JProgressBar progressBar = null; - - private JLabel statusLabel = null; - - private String _loadingPrefix = i18n.DEFAULT_LOADING_PREFIX; - - public ProgessCallBackDialog(Dialog owner, String title, int totalItems) { - super(owner, title); - init(totalItems); - } - - public ProgessCallBackDialog(Frame owner, String title, int totalItems) { - super(owner, title); - setLocationRelativeTo(owner); - init(totalItems); - } - - private void init(int totalItems) { - itemCount = totalItems; - final Window owner = super.getOwner(); - final ProgessCallBackDialog dialog = this; - - GUIUtils.processOnSwingEventThread(new Runnable() { - public void run() { - createGUI(); - setLocationRelativeTo(owner); - dialog.setVisible(true); - } - }, true); - - } - - public void setTotalItems(int totalItems) { - itemCount = totalItems; - progressBar.setMaximum(totalItems); - } - - /** - * Sets the text that is displayed before each thing being loaded. By - * default this is the string "Loading:". - * @param loadingPrefix - */ - public void setLoadingPrefix(String loadingPrefix) { - if (loadingPrefix != null) { - _loadingPrefix = loadingPrefix; - } - } - - /* (non-Javadoc) - * @see net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack#currentlyLoading(java.lang.String) - */ - public void currentlyLoading(final String simpleName) { - final StringBuilder statusText = new StringBuilder(); - statusText.append(_loadingPrefix); - statusText.append(" "); - statusText.append(simpleName); - try { - GUIUtils.processOnSwingEventThread(new Runnable() { - public void run() { - statusLabel.setText(statusText.toString()); - progressBar.setValue(progressBar.getValue() + 1); - if (finishedLoading()) { - ProgessCallBackDialog.this.setVisible(false); - return; - } - } - }); - } catch (Exception e) { - s_log.error("Unexpected exception: "+e.getMessage(), e); - } - } - - public boolean finishedLoading() { - return progressBar.getValue() >= itemCount - 1; - } - - private void createGUI() { - JPanel dialogPanel = new JPanel(new GridBagLayout()); - dialogPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10)); - GridBagConstraints c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 0; - c.fill = GridBagConstraints.HORIZONTAL; - c.anchor = GridBagConstraints.WEST; - - statusLabel = new JLabel(i18n.INITIAL_LOADING_PREFIX); - dialogPanel.add(statusLabel, c); - - progressBar = new JProgressBar(0, itemCount); - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 1; - c.anchor = GridBagConstraints.WEST; - c.fill = GridBagConstraints.HORIZONTAL; - c.insets = new Insets(0,0,10,0); - c.weightx = 1.0; - - dialogPanel.add(progressBar, c); - super.getContentPane().add(dialogPanel); - super.pack(); - super.setSize(new Dimension(400, 100)); - } - - /** - * @param args - */ - public static void main(String[] args) throws Exception { - ApplicationArguments.initialize(new String[] {}); - String[] tables = new String[] { - "table_a", - "table_b", - "table_c", - "table_d", - "table_e", - }; - JFrame parent = new JFrame(); - GUIUtils.centerWithinScreen(parent); - parent.setSize(new Dimension(200, 200)); - parent.setVisible(true); - ProgessCallBackDialog dialog = - new ProgessCallBackDialog(parent, "test", 5); - - dialog.setVisible(true); - for (int i = 0; i < 5; i++) { - dialog.currentlyLoading(tables[i]); - Thread.sleep(1000); - } - System.exit(0); - } - -} Copied: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgressCallBackDialog.java (from rev 5908, trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgessCallBackDialog.java) =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgressCallBackDialog.java (rev 0) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgressCallBackDialog.java 2010-10-30 18:14:42 UTC (rev 5946) @@ -0,0 +1,257 @@ +package net.sourceforge.squirrel_sql.client.gui; + +/* + * Copyright (C) 2007 Rob Manning + * man...@us... + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +import java.awt.Dialog; +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.Window; + +import javax.swing.BorderFactory; +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JProgressBar; + +import net.sourceforge.squirrel_sql.fw.gui.GUIUtils; +import net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack; +import net.sourceforge.squirrel_sql.fw.util.StringManager; +import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; +import net.sourceforge.squirrel_sql.fw.util.log.ILogger; +import net.sourceforge.squirrel_sql.fw.util.log.LoggerController; + +/** + * A simple class that can be used to show the user a dialog to indicate the progress of some task using the + * ProgressCallBack interface. Since certain classes in fw module interact with the database and certain + * operations can take quite a long time, letting the user know how it's going is nice. However, fw module + * classes don't (and shouldn't) know anything about the UI as this is the responsibility of the app module + * classes. So, this class can be passed in by app classes to certain fw long-running methods to bridge the + * gap and provide feedback to the user. + * + * @author manningr + */ +public class ProgressCallBackDialog extends JDialog implements ProgressCallBack +{ + + /** + * serialVersionUID + */ + private static final long serialVersionUID = 1L; + + /** Logger for this class. */ + public final static ILogger s_log = LoggerController.createLogger(ProgressCallBackDialog.class); + + /** Internationalized strings for this class */ + private static final StringManager s_stringMgr = + StringManagerFactory.getStringManager(ProgressCallBackDialog.class); + + static interface i18n + { + // i18n[ProgressCallBackDialog.defaultLoadingPrefix=Loading:] + String DEFAULT_LOADING_PREFIX = s_stringMgr.getString("ProgressCallBackDialog.defaultLoadingPrefix"); + + // i18n[ProgressCallBackDialog.initialLoadingPrefix=Loading...] + String INITIAL_LOADING_PREFIX = s_stringMgr.getString("ProgressCallBackDialog.initialLoadingPrefix"); + } + + private int itemCount = 0; + + private JProgressBar progressBar = null; + + private JLabel statusLabel = null; + + private String _loadingPrefix = i18n.DEFAULT_LOADING_PREFIX; + + /** + * Constructor which accepts a Dialog owner + * + * @param owner + * the owner Dialog from which the dialog is displayed or null if this dialog has no owner + * @param title + * the String to display in the dialog's title bar + * @param totalItems + * the total number of items at which point progress will indicate complete + */ + public ProgressCallBackDialog(Dialog owner, String title, int totalItems) + { + super(owner, title); + init(totalItems); + } + + /** + * Constructor which accepts a Frame owner + * + * @param owner + * the owner Frame from which the dialog is displayed or null if this dialog has no owner + * @param title + * the String to display in the dialog's title bar + * @param totalItems + * the total number of items at which point progress will indicate complete + */ + public ProgressCallBackDialog(Frame owner, String title, int totalItems) + { + super(owner, title); + setLocationRelativeTo(owner); + init(totalItems); + } + + /** + * @see net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack#setTotalItems(int) + */ + @Override + public void setTotalItems(int totalItems) + { + itemCount = totalItems; + progressBar.setMaximum(totalItems); + } + + /** + * Sets the text that is displayed before each thing being loaded. By default this is the string + * "Loading:". + * + * @param loadingPrefix + */ + @Override + public void setLoadingPrefix(String loadingPrefix) + { + if (loadingPrefix != null) + { + _loadingPrefix = loadingPrefix; + } + } + + /** + * @see net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack#currentlyLoading(java.lang.String) + */ + @Override + public void currentlyLoading(final String simpleName) + { + final StringBuilder statusText = new StringBuilder(); + statusText.append(_loadingPrefix); + statusText.append(" "); + statusText.append(simpleName); + try + { + GUIUtils.processOnSwingEventThread(new Runnable() + { + public void run() + { + statusLabel.setText(statusText.toString()); + progressBar.setValue(progressBar.getValue() + 1); + + if (finishedLoading()) + { + ProgressCallBackDialog.this.setVisible(false); + return; + } + } + }); + } + catch (Exception e) + { + s_log.error("Unexpected exception: " + e.getMessage(), e); + } + } + + /** + * @see net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack#finishedLoading() + */ + @Override + public boolean finishedLoading() + { + return progressBar.getValue() == itemCount; + } + + /** + * @see java.awt.Window#dispose() + */ + @Override + public void dispose() + { + GUIUtils.processOnSwingEventThread(new Runnable() + { + @Override + public void run() + { + ProgressCallBackDialog.this.dispose(); + } + }); + } + + /** + * @see java.awt.Dialog#setVisible(boolean) + */ + @Override + public void setVisible(final boolean b) + { + GUIUtils.processOnSwingEventThread(new Runnable() + { + @Override + public void run() + { + ProgressCallBackDialog.this.setVisible(b); + } + }); + } + + private void init(int totalItems) + { + itemCount = totalItems; + final Window owner = super.getOwner(); + final ProgressCallBackDialog dialog = this; + createGUI(); + setLocationRelativeTo(owner); + dialog.setVisible(true); + } + + private void createGUI() + { + JPanel dialogPanel = new JPanel(new GridBagLayout()); + dialogPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10)); + GridBagConstraints c; + + c = new GridBagConstraints(); + c.gridx = 0; + c.gridy = 0; + c.fill = GridBagConstraints.HORIZONTAL; + c.anchor = GridBagConstraints.WEST; + + statusLabel = new JLabel(i18n.INITIAL_LOADING_PREFIX); + dialogPanel.add(statusLabel, c); + + progressBar = new JProgressBar(0, itemCount); + c = new GridBagConstraints(); + c.gridx = 0; + c.gridy = 1; + c.anchor = GridBagConstraints.WEST; + c.fill = GridBagConstraints.HORIZONTAL; + c.insets = new Insets(0, 0, 10, 0); + c.weightx = 1.0; + + dialogPanel.add(progressBar, c); + super.getContentPane().add(dialogPanel); + super.pack(); + super.setSize(new Dimension(400, 100)); + } + + +} Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgressCallBackFactory.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgressCallBackFactory.java (rev 0) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgressCallBackFactory.java 2010-10-30 18:14:42 UTC (rev 5946) @@ -0,0 +1,110 @@ +package net.sourceforge.squirrel_sql.client.gui; + +import java.awt.Frame; + +import javax.swing.JDialog; + +import net.sourceforge.squirrel_sql.fw.gui.GUIUtils; +import net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack; + +/* + * Copyright (C) 2010 Rob Manning + * man...@us... + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/** + * A factory that creates a ProgressCallBack on the Swing Event Dispatch Thread. + */ +public class ProgressCallBackFactory implements IProgressCallBackFactory +{ + /** + * @see net.sourceforge.squirrel_sql.client.gui.IProgressCallBackFactory#create(java.awt.Frame, + * java.lang.String, int) + */ + @Override + public ProgressCallBack create(Frame owner, String title, int totalItems) + { + ProgressCallBackCreationTask task = new ProgressCallBackCreationTask(owner, title, totalItems); + GUIUtils.processOnSwingEventThread(task, true); + return task.getResult(); + } + + /** + * @see net.sourceforge.squirrel_sql.client.gui.IProgressCallBackFactory# + * create(javax.swing.JDialog, java.lang.String, int) + */ + @Override + public ProgressCallBack create(JDialog owner, String title, int totalItems) + { + ProgressCallBackCreationTask task = new ProgressCallBackCreationTask(owner, title, totalItems); + GUIUtils.processOnSwingEventThread(task, true); + return task.getResult(); + } + + + /** + * This runnable is used by the factory methods above to create the ProgressCallBackDialog. This allows + * this task to be performed on the event dispatch thread, and afterwards the ProgressCallBackDialog can + * be obtained using getResult(). + */ + private class ProgressCallBackCreationTask implements Runnable + { + + private ProgressCallBack result = null; + + private final String title; + + private final int totalItems; + + private Frame frameOwner; + + private JDialog dialogOwner; + + public ProgressCallBackCreationTask(Frame owner, String title, int totalItems) + { + this.frameOwner = owner; + this.title = title; + this.totalItems = totalItems; + } + + public ProgressCallBackCreationTask(JDialog owner, String title, int totalItems) + { + this.dialogOwner = owner; + this.title = title; + this.totalItems = totalItems; + } + + @Override + public void run() + { + if (frameOwner != null) { + result = new ProgressCallBackDialog(frameOwner, title, totalItems); + } else { + result = new ProgressCallBackDialog(dialogOwner, title, totalItems); + } + } + + /** + * @return the result + */ + public ProgressCallBack getResult() + { + return result; + } + + } +} Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/ColumnDetailDialog.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/ColumnDetailDialog.java 2010-10-30 18:06:17 UTC (rev 5945) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/ColumnDetailDialog.java 2010-10-30 18:14:42 UTC (rev 5946) @@ -134,9 +134,6 @@ //i18n[ColumnDetailsDialog.lengthLabel=Length: ] String LENGTH_LABEL = s_stringMgr.getString("ColumnDetailsDialog.lengthLabel"); - //i18n[ColumnDetailsDialog.modifyColumnTitle=Modify Column] - String MODIFY_TITLE = - s_stringMgr.getString("ColumnDetailsDialog.modifyColumnTitle"); //i18n[ColumnDetailsDialog.nullableLabel=Nullable: ] String NULLABLE_LABEL = s_stringMgr.getString("ColumnDetailsDialog.nullableLabel"); @@ -420,10 +417,10 @@ lengthSpinner = new JSpinner(); lengthSpinner.setPreferredSize(mediumField); - double value = 10; - double min = 1; - double max = Long.MAX_VALUE; - double step = 1; + int value = 10; + int min = 1; + int max = Integer.MAX_VALUE; + int step = 1; SpinnerNumberModel model = new SpinnerNumberModel(value, min, max, step); lengthSpinner.setModel(model); lengthSpinner.setPreferredSize(mediumField); @@ -438,7 +435,7 @@ precisionSpinner.setPreferredSize(mediumField); value = 8; min = 0; - max = Long.MAX_VALUE; + max = Integer.MAX_VALUE; step = 1; SpinnerNumberModel precisionModel = new SpinnerNumberModel(value, min, max, step); @@ -455,7 +452,7 @@ scaleSpinner.setPreferredSize(mediumField); value = 8; min = 0; - max = Long.MAX_VALUE; + max = Integer.MAX_VALUE; step = 1; SpinnerNumberModel scaleModel = new SpinnerNumberModel(value, min, max, step); Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/UpdateCommand.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/UpdateCommand.java 2010-10-30 18:06:17 UTC (rev 5945) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/UpdateCommand.java 2010-10-30 18:14:42 UTC (rev 5946) @@ -23,6 +23,8 @@ import net.sourceforge.squirrel_sql.client.update.UpdateControllerFactoryImpl; import net.sourceforge.squirrel_sql.client.update.UpdateUtilImpl; import net.sourceforge.squirrel_sql.client.update.downloader.ArtifactDownloaderFactoryImpl; +import net.sourceforge.squirrel_sql.fw.gui.JOptionPaneService; +import net.sourceforge.squirrel_sql.fw.util.FileWrapperFactoryImpl; import net.sourceforge.squirrel_sql.fw.util.ICommand; /** * This <CODE>ICommand</CODE> allows the user to check for updates and apply changes to the currently @@ -61,7 +63,7 @@ { UpdateController updateController = updateControllerFactory.createUpdateController(_app, new ArtifactDownloaderFactoryImpl(), - new UpdateUtilImpl()); + new UpdateUtilImpl(), new JOptionPaneService(), new FileWrapperFactoryImpl()); updateController.showUpdateDialog(); } } Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/DeleteTablesCommand.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/DeleteTablesCommand.java 2010-10-30 18:06:17 UTC (rev 5945) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/DeleteTablesCommand.java 2010-10-30 18:14:42 UTC (rev 5946) @@ -24,13 +24,15 @@ import java.util.HashSet; import java.util.List; -import net.sourceforge.squirrel_sql.client.gui.ProgessCallBackDialog; +import net.sourceforge.squirrel_sql.client.gui.IProgressCallBackFactory; +import net.sourceforge.squirrel_sql.client.gui.ProgressCallBackFactory; import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI; import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask; import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory; import net.sourceforge.squirrel_sql.fw.gui.GUIUtils; import net.sourceforge.squirrel_sql.fw.sql.ITableInfo; +import net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack; import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData; import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities; import net.sourceforge.squirrel_sql.fw.util.ICommand; @@ -78,6 +80,8 @@ /** API for the current tree. */ private IObjectTreeAPI _tree; + private IProgressCallBackFactory progressCallBackFactory = new ProgressCallBackFactory(); + /** * Ctor. * @@ -103,11 +107,11 @@ * Delete records from the selected tables in the object tree. */ public void execute() - { - ProgessCallBackDialog cb = - new ProgessCallBackDialog(_session.getApplication().getMainFrame(), i18n.PROGRESS_DIALOG_TITLE, - _tables.size()); - + { + ProgressCallBack cb = + progressCallBackFactory.create(_session.getApplication().getMainFrame(), + i18n.PROGRESS_DIALOG_TITLE, _tables.size()); + cb.setLoadingPrefix(i18n.LOADING_PREFIX); DeleteExecuter executer = new DeleteExecuter(cb); _session.getApplication().getThreadPool().addTask(executer); @@ -116,9 +120,9 @@ private class DeleteExecuter implements Runnable { - ProgessCallBackDialog _cb = null; + ProgressCallBack _cb = null; - public DeleteExecuter(ProgessCallBackDialog cb) + public DeleteExecuter(ProgressCallBack cb) { Utilities.checkNull("DeleteExecuter.init", "cb", cb); _cb = cb; @@ -241,4 +245,9 @@ } + public void setProgressCallBackFactory(IProgressCallBackFactory progressCallBackFactory) + { + this.progressCallBackFactory = progressCallBackFactory; + } + } Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfo.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfo.java 2010-10-30 18:06:17 UTC (rev 5945) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfo.java 2010-10-30 18:14:42 UTC (rev 5946) @@ -50,6 +50,7 @@ import net.sourceforge.squirrel_sql.fw.sql.ITableInfo; import net.sourceforge.squirrel_sql.fw.sql.ProcedureInfo; import net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack; +import net.sourceforge.squirrel_sql.fw.sql.ProgressCallBackAdaptor; import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData; import net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo; import net.sourceforge.squirrel_sql.fw.sql.TableInfo; @@ -578,8 +579,8 @@ try { - ProgressCallBack pcb = new ProgressCallBack() - { + ProgressCallBack pcb = new ProgressCallBackAdaptor() + { @Override public void currentlyLoading(String simpleName) { setProgress(msg + " (" + simpleName + ")", beginProgress); @@ -1108,10 +1109,11 @@ try { String[] buf = missingTypes.toArray(new String[missingTypes.size()]); - ProgressCallBack pcb = new ProgressCallBack() + ProgressCallBack pcb = new ProgressCallBackAdaptor() { + @Override public void currentlyLoading(String simpleName) - { + { StringBuilder tmp = new StringBuilder(i18n.LOADING_TABLES_MSG); tmp.append(" ("); tmp.append(simpleName); @@ -1194,8 +1196,8 @@ { try { - ProgressCallBack pcb = new ProgressCallBack() - { + ProgressCallBack pcb = new ProgressCallBackAdaptor() + { @Override public void currentlyLoading(String simpleName) { setProgress(msg + " (" + simpleName + ")", beginProgress); @@ -1647,6 +1649,4 @@ throw new RuntimeException(e); } } - - } Added: trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/gui/ProgressCallBackDialogTestUI.java =================================================================== --- trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/gui/ProgressCallBackDialogTestUI.java (rev 0) +++ trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/gui/ProgressCallBackDialogTestUI.java 2010-10-30 18:14:42 UTC (rev 5946) @@ -0,0 +1,57 @@ +package net.sourceforge.squirrel_sql.client.gui; + +import java.awt.Dimension; + +import javax.swing.JFrame; + +import net.sourceforge.squirrel_sql.client.ApplicationArguments; +import net.sourceforge.squirrel_sql.fw.gui.GUIUtils; +import net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack; + +/* + * Copyright (C) 2010 Rob Manning + * man...@us... + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +public class ProgressCallBackDialogTestUI +{ + + private static IProgressCallBackFactory progressCallBackFactory = new ProgressCallBackFactory(); + + /** + * @param args + */ + public static void main(String[] args) throws Exception + { + ApplicationArguments.initialize(new String[] {}); + String[] tables = new String[] { "table_a", "table_b", "table_c", "table_d", "table_e", }; + JFrame parent = new JFrame(); + GUIUtils.centerWithinScreen(parent); + parent.setSize(new Dimension(200, 200)); + parent.setVisible(true); + ProgressCallBack pcb = progressCallBackFactory.create(parent, "test", 5); + + pcb.setVisible(true); + for (int i = 0; i < 5; i++) + { + pcb.currentlyLoading(tables[i]); + Thread.sleep(1000); + } + System.exit(0); + } + +} Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/ProgressCallBack.java =================================================================== --- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/ProgressCallBack.java 2010-10-30 18:06:17 UTC (rev 5945) +++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/ProgressCallBack.java 2010-10-30 18:14:42 UTC (rev 5946) @@ -1,7 +1,65 @@ package net.sourceforge.squirrel_sql.fw.sql; +/* + * Copyright (C) 2006 Gerd Wagner + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +/** + * Interface for ProgressCallBack implementations. + */ public interface ProgressCallBack { + /** + * @param simpleName + */ + void currentlyLoading(String simpleName); - void currentlyLoading(String simpleName); + /** + * Sets the text that is displayed before each thing being loaded. For example, it could be a string like + * "Loading:". See the implementation for details. + * + * @param loadingPrefix the string to use as the loadingPrefix. + */ + void setLoadingPrefix(String loadingPrefix); + + /** + * Whether or not to make this callback visible. + * + * @param b + */ + void setVisible(boolean b); + + /** + * Sets the total number of items for the progress bar + * + * @param totalItems + */ + void setTotalItems(int totalItems); + + /** + * Whether or not the progress bar has reached the total count of items + * + * @return true if finished loading; false otherwise + */ + boolean finishedLoading(); + + /** + * Dispose of the resources used by this progress callback. + */ + void dispose(); } Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/ProgressCallBackAdaptor.java =================================================================== --- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/ProgressCallBackAdaptor.java (rev 0) +++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/ProgressCallBackAdaptor.java 2010-10-30 18:14:42 UTC (rev 5946) @@ -0,0 +1,89 @@ +/** + * + */ +package net.sourceforge.squirrel_sql.fw.sql; + + +/* + * Copyright (C) 2010 Rob Manning + * man...@us... + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/** + * This adaptor allows callers of methods that accept a ProgressCallBack to get feedback on progress from + * callee's and do whatever is necessary to show that progress to the user. This allows for custom behavior + * of some of the ProgressCallBack interface without requiring implementation all of the call back methods. + */ +public class ProgressCallBackAdaptor implements ProgressCallBack +{ + + /** + * @see net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack#currentlyLoading(java.lang.String) + */ + @Override + public void currentlyLoading(String simpleName) + { + /* override in sub-class */ + } + + /** + * @see net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack#dispose() + */ + @Override + public void dispose() + { + /* override in sub-class */ + } + + /** + * @see net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack#finishedLoading() + */ + @Override + public boolean finishedLoading() + { + /* override in sub-class */ + return false; + } + + /** + * @see net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack#setLoadingPrefix(java.lang.String) + */ + @Override + public void setLoadingPrefix(String loadingPrefix) + { + /* override in sub-class */ + } + + /** + * @see net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack#setTotalItems(int) + */ + @Override + public void setTotalItems(int totalItems) + { + /* override in sub-class */ + } + + /** + * @see net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack#setVisible(boolean) + */ + @Override + public void setVisible(boolean b) + { + /* override in sub-class */ + } + +} Modified: trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/sql/SQLUtilitiesTest.java =================================================================== --- trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/sql/SQLUtilitiesTest.java 2010-10-30 18:06:17 UTC (rev 5945) +++ trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/sql/SQLUtilitiesTest.java 2010-10-30 18:14:42 UTC (rev 5946) @@ -84,7 +84,7 @@ try { List<ITableInfo> result = - SQLUtilities.getInsertionOrder(tables, mockSQLDatabaseMetaData, new MyCallback()); + SQLUtilities.getInsertionOrder(tables, mockSQLDatabaseMetaData, new ProgressCallBackAdaptor()); Assert.assertEquals(tables.size(), result.size()); } catch (Exception e) @@ -117,13 +117,4 @@ assertEquals(tableName, quotedTableName); } - private static class MyCallback implements ProgressCallBack - { - - public void currentlyLoading(String simpleName) - { - // Do Nothing - } - - } } Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/commands/CopyTableCommand.java =================================================================== --- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/commands/CopyTableCommand.java 2010-10-30 18:06:17 UTC (rev 5945) +++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/commands/CopyTableCommand.java 2010-10-30 18:14:42 UTC (rev 5946) @@ -23,12 +23,14 @@ import java.util.ArrayList; import java.util.List; -import net.sourceforge.squirrel_sql.client.gui.ProgessCallBackDialog; +import net.sourceforge.squirrel_sql.client.gui.IProgressCallBackFactory; +import net.sourceforge.squirrel_sql.client.gui.ProgressCallBackFactory; import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI; import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType; import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; import net.sourceforge.squirrel_sql.fw.sql.ITableInfo; +import net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack; import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData; import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities; import net.sourceforge.squirrel_sql.fw.util.ICommand; @@ -41,119 +43,131 @@ public class CopyTableCommand implements ICommand { - /** - * Current session. - */ - private ISession _session; - - /** - * Current plugin. - */ - private final DBCopyPlugin _plugin; - - /** Logger for this class. */ - private final static ILogger log = - LoggerController.createLogger(CopyTableCommand.class); - - /** Internationalized strings for this class */ - private static final StringManager s_stringMgr = - StringManagerFactory.getStringManager(CopyTableCommand.class); - - static interface i18n { - - //i18n[CopyTablesCommand.progressDialogTitle=Analyzing FKs in Tables to Copy] - String PROGRESS_DIALOG_TITLE = - s_stringMgr.getString("CopyTablesCommand.progressDialogTitle"); - - //i18n[CopyTablesCommand.loadingPrefix=Analyzing table:] - String LOADING_PREFIX = - s_stringMgr.getString("CopyTablesCommand.loadingPrefix"); - - } - - /** - * Ctor specifying the current session. - */ - public CopyTableCommand(ISession session, DBCopyPlugin plugin) - { - super(); - _session = session; - _plugin = plugin; - } - - /** - * Execute this command. Save the session and selected objects in the plugin - * for use in paste command. - */ - public void execute() - { - IObjectTreeAPI api = _session.getObjectTreeAPIOfActiveSessionWindow(); - if (api != null) { - IDatabaseObjectInfo[] dbObjs = api.getSelectedDatabaseObjects(); - if (DatabaseObjectType.TABLE_TYPE_DBO.equals(dbObjs[0].getDatabaseObjectType())) { - String catalog = dbObjs[0].getCatalogName(); - String schema = dbObjs[0].getSchemaName(); - if (log.isDebugEnabled()) { - log.debug("CopyTableCommand.execute: catalog="+catalog); - log.debug("CopyTableCommand.execute: schema="+schema); - } - dbObjs = DBUtil.getTables(_session, catalog, schema, null); - for (int i = 0; i < dbObjs.length; i++) { - ITableInfo info = (ITableInfo)dbObjs[i]; - if (log.isDebugEnabled()) { - log.debug("dbObj["+i+"] = "+info.getSimpleName()); - } + /** + * Current session. + */ + private ISession _session; + + /** + * Current plugin. + */ + private final DBCopyPlugin _plugin; + + /** Logger for this class. */ + private final static ILogger log = LoggerController.createLogger(CopyTableCommand.class); + + /** Internationalized strings for this class */ + private static final StringManager s_stringMgr = + StringManagerFactory.getStringManager(CopyTableCommand.class); + + private IProgressCallBackFactory progressCallBackFactory = new ProgressCallBackFactory(); + + static interface i18n + { + + // i18n[CopyTablesCommand.progressDialogTitle=Analyzing FKs in Tables to Copy] + String PROGRESS_DIALOG_TITLE = s_stringMgr.getString("CopyTablesCommand.progressDialogTitle"); + + // i18n[CopyTablesCommand.loadingPrefix=Analyzing table:] + String LOADING_PREFIX = s_stringMgr.getString("CopyTablesCommand.loadingPrefix"); + + } + + /** + * Ctor specifying the current session. + */ + public CopyTableCommand(ISession session, DBCopyPlugin plugin) + { + super(); + _session = session; + _plugin = plugin; + } + + public void setProgressCallBackFactory(IProgressCallBackFactory progressCallBackFactory) + { + this.progressCallBackFactory = progressCallBackFactory; + } + + /** + * Execute this command. Save the session and selected objects in the plugin for use in paste command. + */ + public void execute() + { + IObjectTreeAPI api = _session.getObjectTreeAPIOfActiveSessionWindow(); + if (api != null) + { + IDatabaseObjectInfo[] dbObjs = api.getSelectedDatabaseObjects(); + if (DatabaseObjectType.TABLE_TYPE_DBO.equals(dbObjs[0].getDatabaseObjectType())) + { + String catalog = dbObjs[0].getCatalogName(); + String schema = dbObjs[0].getSchemaName(); + if (log.isDebugEnabled()) + { + log.debug("CopyTableCommand.execute: catalog=" + catalog); + log.debug("CopyTableCommand.execute: schema=" + schema); } - } + dbObjs = DBUtil.getTables(_session, catalog, schema, null); + for (int i = 0; i < dbObjs.length; i++) + { + ITableInfo info = (ITableInfo) dbObjs[i]; + if (log.isDebugEnabled()) + { + log.debug("dbObj[" + i + "] = " + info.getSimpleName()); + } + } + } - _plugin.setCopySourceSession(_session); - final IDatabaseObjectInfo[] fdbObjs = dbObjs; - final SQLDatabaseMetaData md = - _session.getSQLConnection().getSQLMetaData(); - _session.getApplication().getThreadPool().addTask(new Runnable() { - public void run() { - try { - getInsertionOrder(fdbObjs, md); - _plugin.setPasteMenuEnabled(true); - } catch (SQLException e) { - log.error("Unexected exception: ", e); - } - } - }); - - } - } - - private void getInsertionOrder(IDatabaseObjectInfo[] dbObjs, - SQLDatabaseMetaData md) - throws SQLException - { - - // Only concerned about order when more than one table. - if (dbObjs.length > 1) { - List<ITableInfo> selectedTables = new ArrayList<ITableInfo>(); - for (int i = 0; i < dbObjs.length; i++) { - selectedTables.add((ITableInfo)dbObjs[i]); - } - - ProgessCallBackDialog cb = - new ProgessCallBackDialog(_session.getApplication().getMainFrame(), - i18n.PROGRESS_DIALOG_TITLE, - dbObjs.length); - - cb.setLoadingPrefix(i18n.LOADING_PREFIX); - selectedTables = - SQLUtilities.getInsertionOrder(selectedTables, - md, - cb); - cb.setVisible(false); + _plugin.setCopySourceSession(_session); + final IDatabaseObjectInfo[] fdbObjs = dbObjs; + final SQLDatabaseMetaData md = _session.getSQLConnection().getSQLMetaData(); + _session.getApplication().getThreadPool().addTask(new Runnable() + { + public void run() + { + try + { + getInsertionOrder(fdbObjs, md); + _plugin.setPasteMenuEnabled(true); + } + catch (SQLException e) + { + log.error("Unexected exception: ", e); + } + } + }); - _plugin.setSelectedDatabaseObjects( - selectedTables.toArray(new IDatabaseObjectInfo[dbObjs.length])); - - } else { - _plugin.setSelectedDatabaseObjects(dbObjs); - } - } - + } + } + + private void getInsertionOrder(IDatabaseObjectInfo[] dbObjs, SQLDatabaseMetaData md) throws SQLException + { + + // Only concerned about order when more than one table. + if (dbObjs.length > 1) + { + List<ITableInfo> selectedTables = new ArrayList<ITableInfo>(); + for (int i = 0; i < dbObjs.length; i++) + { + selectedTables.add((ITableInfo) dbObjs[i]); + } + + ProgressCallBack cb = + progressCallBackFactory.create(_session.getApplication().getMainFrame(), + i18n.PROGRESS_DIALOG_TITLE, dbObjs.length); + + cb.setLoadingPrefix(i18n.LOADING_PREFIX); + selectedTables = SQLUtilities.getInsertionOrder(selectedTables, md, cb); + cb.setVisible(false); + cb.dispose(); + + _plugin.setSelectedDatabaseObjects(selectedTables.toArray(new IDatabaseObjectInfo[dbObjs.length])); + + } + else + { + _plugin.setSelectedDatabaseObjects(dbObjs); + } + } + + } \ No newline at end of file Modified: trunk/sql12/plugins/postgres/src/main/java/net/sourceforge/squirrel_sql/plugins/postgres/commands/handler/ProgressSQLExecuterHandler.java =================================================================== --- trunk/sql12/plugins/postgres/src/main/java/net/sourceforge/squirrel_sql/plugins/postgres/commands/handler/ProgressSQLExecuterHandler.java 2010-10-30 18:06:17 UTC (rev 5945) +++ trunk/sql12/plugins/postgres/src/main/java/net/sourceforge/squirrel_sql/plugins/postgres/commands/handler/ProgressSQLExecuterHandler.java 2010-10-30 18:14:42 UTC (rev 5946) @@ -18,25 +18,30 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -import net.sourceforge.squirrel_sql.client.gui.ProgessCallBackDialog; +import java.sql.ResultSet; +import java.sql.SQLWarning; + +import javax.swing.JDialog; + +import net.sourceforge.squirrel_sql.client.gui.IProgressCallBackFactory; +import net.sourceforge.squirrel_sql.client.gui.ProgressCallBackFactory; import net.sourceforge.squirrel_sql.client.session.ISQLExecuterHandler; import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.SQLExecutionInfo; import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSetUpdateableTableModel; +import net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack; import net.sourceforge.squirrel_sql.fw.sql.SQLExecutionException; import net.sourceforge.squirrel_sql.fw.util.log.ILogger; import net.sourceforge.squirrel_sql.fw.util.log.LoggerController; -import javax.swing.*; -import java.sql.ResultSet; -import java.sql.SQLWarning; - public abstract class ProgressSQLExecuterHandler implements ISQLExecuterHandler { protected ISession _session; - protected ProgessCallBackDialog _pdialog; + protected ProgressCallBack _pdialog; + protected IProgressCallBackFactory progressCallBackFactory = new ProgressCallBackFactory(); + protected String _commandPrefix; /** @@ -48,10 +53,15 @@ String commandPrefix) { _session = session; - _pdialog = new ProgessCallBackDialog(owner, progressDialogTitle, 0); + _pdialog = progressCallBackFactory.create(owner, progressDialogTitle, 0); _commandPrefix = commandPrefix; } + public void setProgressCallBackFactory(IProgressCallBackFactory progressCallBackFactory) + { + this.progressCallBackFactory = progressCallBackFactory; + } + public void sqlToBeExecuted(String sql) { if (s_log.isDebugEnabled()) @@ -94,13 +104,7 @@ public void sqlExecutionCancelled() { - SwingUtilities.invokeLater(new Runnable() - { - public void run() - { - _pdialog.dispose(); - } - }); + _pdialog.dispose(); } public void sqlDataUpdated(int updateCount) @@ -120,12 +124,6 @@ { s_log.info(message); } - SwingUtilities.invokeLater(new Runnable() - { - public void run() - { - _pdialog.dispose(); - } - }); + _pdialog.dispose(); } } Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropTablesCommand.java =================================================================== --- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropTablesCommand.java 2010-10-30 18:06:17 UTC (rev 5945) +++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropTablesCommand.java 2010-10-30 18:14:42 UTC (rev 5946) @@ -26,7 +26,8 @@ import java.util.HashSet; import java.util.List; -import net.sourceforge.squirrel_sql.client.gui.ProgessCallBackDialog; +import net.sourceforge.squirrel_sql.client.gui.IProgressCallBackFactory; +import net.sourceforge.squirrel_sql.client.gui.ProgressCallBackFactory; import net.sourceforge.squirrel_sql.client.session.DefaultSQLExecuterHandler; import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask; @@ -37,6 +38,7 @@ import net.sourceforge.squirrel_sql.fw.sql.ForeignKeyInfo; import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; import net.sourceforge.squirrel_sql.fw.sql.ITableInfo; +import net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack; import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData; import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities; import net.sourceforge.squirrel_sql.fw.util.StringManager; @@ -79,8 +81,10 @@ private List<ITableInfo> orderedTables; - ProgessCallBackDialog getOrderedTablesCallBack; + ProgressCallBack getOrderedTablesCallBack; + private IProgressCallBackFactory progressCallBackFactory = new ProgressCallBackFactory(); + /** * A set of materialized view names in the same schema as the table(s) being dropped. */ @@ -135,7 +139,8 @@ if (tables.size() > 1) { orderedTables = getOrderedTables(tables); - } else + } + else { orderedTables = tables; } @@ -171,7 +176,8 @@ _dialect.getTableDropSQL(info, cascadeConstraints, isMaterializedView, _qualifier, _sqlPrefs); result.addAll(sqls); } - } catch (final UnsupportedOperationException e2) + } + catch (final UnsupportedOperationException e2) { _session.showMessage(s_stringMgr.getString("DropTablesCommand.unsupportedOperationMsg", _dialect.getDisplayName())); @@ -220,18 +226,10 @@ } final SQLDatabaseMetaData md = _session.getSQLConnection().getSQLMetaData(); - // Create the analysis dialog using the EDT, and wait for it to finish. - GUIUtils.processOnSwingEventThread(new Runnable() - { - public void run() - { - getOrderedTablesCallBack = - new ProgessCallBackDialog(customDialog, i18n.PROGRESS_DIALOG_ANALYZE_TITLE, tables.size()); + ProgressCallBack getOrderedTablesCallBack = + progressCallBackFactory.create(customDialog, i18n.PROGRESS_DIALOG_ANALYZE_TITLE, tables.size()); + getOrderedTablesCallBack.setLoadingPrefix(i18n.LOADING_PREFIX); - getOrderedTablesCallBack.setLoadingPrefix(i18n.LOADING_PREFIX); - } - }, true); - // Now, get the drop order (same as delete) and update the dialog // status while doing so. final List<ITableInfo> result = SQLUtilities.getDeletionOrder(tables, md, getOrderedTablesCallBack); @@ -293,7 +291,8 @@ final String tableName = rs.getString(1); matViewLookup.add(tableName); } - } finally + } + finally { SQLUtilities.closeResultSet(rs); SQLUtilities.closeStatement(stmt); @@ -318,16 +317,16 @@ final SQLExecuterTask executer = new SQLExecuterTask(_session, script, handler); executer.setSchemaCheck(false); executer.run(); - + GUIUtils.processOnSwingEventThread(new Runnable() { public void run() { - handler.hideProgressDialog(); + handler.hideProgressDialog(); customDialog.setVisible(false); } }); - + _session.getSchemaInfo().reloadAllTables(); } }); @@ -352,7 +351,7 @@ private class DropTableCommandExecHandler extends DefaultSQLExecuterHandler { - ProgessCallBackDialog cb = null; + ProgressCallBack cb = null; /** * This is used to track the number of tables seen so far, so that we can pick the right one from the @@ -363,20 +362,22 @@ public DropTableCommandExecHandler(final ISession session) { super(session); + cb = - new ProgessCallBackDialog( customDialog, - i18n.PROGRESS_DIALOG_DROP_TITLE, - DropTablesCommand.this.orderedTables.size()); + progressCallBackFactory.create(customDialog, i18n.PROGRESS_DIALOG_DROP_TITLE, + DropTablesCommand.this.orderedTables.size()); + } /** * hides the progress dialog. */ - public void hideProgressDialog() { + public void hideProgressDialog() + { cb.setVisible(false); cb.dispose(); } - + /** * @see net.sourceforge.squirrel_sql.client.session.DefaultSQLExecuterHandler#sqlStatementCount(int) */ @@ -403,7 +404,8 @@ // Hack!!! hopefully the FK name will always be the last token! final String[] parts = StringUtilities.split(sql, ' '); cb.currentlyLoading(parts[parts.length - 1]); - } else + } + else { cb.setLoadingPrefix(i18n.DROPPING_TABLE_PREFIX); if (tableCount < DropTablesCommand.this.orderedTables.size()) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-11-12 23:10:21
|
Revision: 5963 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5963&view=rev Author: manningr Date: 2010-11-12 23:10:10 +0000 (Fri, 12 Nov 2010) Log Message: ----------- [maven-release-plugin] prepare release 3.2.0-RC1 Modified Paths: -------------- trunk/sql12/app/pom.xml trunk/sql12/doc/pom.xml trunk/sql12/fw/pom.xml trunk/sql12/installer/pom.xml trunk/sql12/installer/squirrelsql-installer-deps/pom.xml trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml trunk/sql12/installer/squirrelsql-launcher/pom.xml trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml trunk/sql12/installer/squirrelsql-other-installer/pom.xml trunk/sql12/installer/squirrelsql-update-site/pom.xml trunk/sql12/plugins/codecompletion/pom.xml trunk/sql12/plugins/dataimport/pom.xml trunk/sql12/plugins/db2/pom.xml trunk/sql12/plugins/dbcopy/pom.xml trunk/sql12/plugins/dbdiff/pom.xml trunk/sql12/plugins/derby/pom.xml trunk/sql12/plugins/editextras/pom.xml trunk/sql12/plugins/example/pom.xml trunk/sql12/plugins/exportconfig/pom.xml trunk/sql12/plugins/favs/pom.xml trunk/sql12/plugins/firebird/pom.xml trunk/sql12/plugins/firebirdmanager/pom.xml trunk/sql12/plugins/graph/pom.xml trunk/sql12/plugins/h2/pom.xml trunk/sql12/plugins/hibernate/pom.xml trunk/sql12/plugins/i18n/pom.xml trunk/sql12/plugins/informix/pom.xml trunk/sql12/plugins/laf/pom.xml trunk/sql12/plugins/macosx/pom.xml trunk/sql12/plugins/mssql/pom.xml trunk/sql12/plugins/mysql/pom.xml trunk/sql12/plugins/netezza/pom.xml trunk/sql12/plugins/oracle/pom.xml trunk/sql12/plugins/pom.xml trunk/sql12/plugins/postgres/pom.xml trunk/sql12/plugins/refactoring/pom.xml trunk/sql12/plugins/sessionscript/pom.xml trunk/sql12/plugins/smarttools/pom.xml trunk/sql12/plugins/sqlbookmark/pom.xml trunk/sql12/plugins/sqlparam/pom.xml trunk/sql12/plugins/sqlreplace/pom.xml trunk/sql12/plugins/sqlscript/pom.xml trunk/sql12/plugins/sqlval/pom.xml trunk/sql12/plugins/squirrelsql-plugins-assembly-descriptor/pom.xml trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml trunk/sql12/plugins/sybase/pom.xml trunk/sql12/plugins/syntax/pom.xml trunk/sql12/plugins/userscript/pom.xml trunk/sql12/pom.xml trunk/sql12/squirrelsql-translations/pom.xml trunk/sql12/web-site/pom.xml Modified: trunk/sql12/app/pom.xml =================================================================== --- trunk/sql12/app/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/app/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,10 +1,9 @@ -<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"> +<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>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../pom.xml</relativePath> </parent> @@ -42,9 +41,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/doc/pom.xml =================================================================== --- trunk/sql12/doc/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/doc/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,11 +1,10 @@ -<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"> +<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>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../pom.xml</relativePath> </parent> @@ -42,9 +41,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/fw/pom.xml =================================================================== --- trunk/sql12/fw/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/fw/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,11 +1,10 @@ -<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"> +<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>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../pom.xml</relativePath> </parent> @@ -46,9 +45,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/pom.xml =================================================================== --- trunk/sql12/installer/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/installer/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,11 +1,10 @@ -<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"> +<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>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../pom.xml</relativePath> </parent> @@ -43,9 +42,9 @@ <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/squirrelsql-installer-deps/pom.xml =================================================================== --- trunk/sql12/installer/squirrelsql-installer-deps/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/installer/squirrelsql-installer-deps/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,11 +1,10 @@ -<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/xsd/maven-4.0.0.xsd"> +<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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -40,9 +39,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml =================================================================== --- trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,11 +1,10 @@ -<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"> +<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>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -44,9 +43,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/squirrelsql-launcher/pom.xml =================================================================== --- trunk/sql12/installer/squirrelsql-launcher/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/installer/squirrelsql-launcher/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,11 +1,10 @@ -<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"> +<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>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -41,11 +40,11 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/ + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12 </connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/ + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12 </developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> @@ -122,7 +121,7 @@ <dependency> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-sql</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> </dependency> </dependencies> Modified: trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml =================================================================== --- trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,11 +1,10 @@ -<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"> +<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>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -40,9 +39,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/squirrelsql-other-installer/pom.xml =================================================================== --- trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,11 +1,10 @@ -<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"> +<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>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -40,9 +39,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/squirrelsql-update-site/pom.xml =================================================================== --- trunk/sql12/installer/squirrelsql-update-site/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/installer/squirrelsql-update-site/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,11 +1,10 @@ -<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"> +<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>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -44,9 +43,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/codecompletion/pom.xml =================================================================== --- trunk/sql12/plugins/codecompletion/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/plugins/codecompletion/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,12 +1,9 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>codecompletion</artifactId> @@ -39,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/dataimport/pom.xml =================================================================== --- trunk/sql12/plugins/dataimport/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/plugins/dataimport/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,12 +1,9 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>dataimport</artifactId> @@ -39,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/db2/pom.xml =================================================================== --- trunk/sql12/plugins/db2/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/plugins/db2/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,12 +1,9 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> @@ -41,9 +38,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/dbcopy/pom.xml =================================================================== --- trunk/sql12/plugins/dbcopy/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/plugins/dbcopy/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,12 +1,9 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>dbcopy</artifactId> @@ -39,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/dbdiff/pom.xml =================================================================== --- trunk/sql12/plugins/dbdiff/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/plugins/dbdiff/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,12 +1,9 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>dbdiff</artifactId> @@ -39,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/derby/pom.xml =================================================================== --- trunk/sql12/plugins/derby/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/plugins/derby/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,12 +1,9 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>derby</artifactId> @@ -39,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/editextras/pom.xml =================================================================== --- trunk/sql12/plugins/editextras/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/plugins/editextras/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,12 +1,9 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>editextras</artifactId> @@ -39,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/example/pom.xml =================================================================== --- trunk/sql12/plugins/example/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/plugins/example/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,12 +1,9 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>example</artifactId> @@ -39,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/exportconfig/pom.xml =================================================================== --- trunk/sql12/plugins/exportconfig/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/plugins/exportconfig/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,12 +1,9 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>exportconfig</artifactId> @@ -39,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/favs/pom.xml =================================================================== --- trunk/sql12/plugins/favs/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/plugins/favs/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,12 +1,9 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>favs</artifactId> @@ -39,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/firebird/pom.xml =================================================================== --- trunk/sql12/plugins/firebird/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/plugins/firebird/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,12 +1,9 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>firebird</artifactId> @@ -39,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/firebirdmanager/pom.xml =================================================================== --- trunk/sql12/plugins/firebirdmanager/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/plugins/firebirdmanager/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,10 +1,9 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>firebirdmanager</artifactId> @@ -37,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/graph/pom.xml =================================================================== --- trunk/sql12/plugins/graph/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/plugins/graph/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,12 +1,9 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>graph</artifactId> @@ -39,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/h2/pom.xml =================================================================== --- trunk/sql12/plugins/h2/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/plugins/h2/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,12 +1,9 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>h2</artifactId> @@ -39,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/hibernate/pom.xml =================================================================== --- trunk/sql12/plugins/hibernate/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/plugins/hibernate/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,12 +1,9 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>hibernate</artifactId> @@ -39,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/i18n/pom.xml =================================================================== --- trunk/sql12/plugins/i18n/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/plugins/i18n/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,12 +1,9 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>i18n</artifactId> @@ -39,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/informix/pom.xml =================================================================== --- trunk/sql12/plugins/informix/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/plugins/informix/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,12 +1,9 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>informix</artifactId> @@ -39,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/laf/pom.xml =================================================================== --- trunk/sql12/plugins/laf/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/plugins/laf/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,7 +1,4 @@ -<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"> +<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> <!-- This pom is slightly different from other plugin poms because it requires special assembly instructions @@ -14,7 +11,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> @@ -59,9 +56,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/macosx/pom.xml =================================================================== --- trunk/sql12/plugins/macosx/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/plugins/macosx/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,12 +1,9 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>macosx</artifactId> @@ -39,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/mssql/pom.xml =================================================================== --- trunk/sql12/plugins/mssql/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/plugins/mssql/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,12 +1,9 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>mssql</artifactId> @@ -39,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/mysql/pom.xml =================================================================== --- trunk/sql12/plugins/mysql/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/plugins/mysql/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) @@ -1,12 +1,9 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-RC1</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>mysql</artifactId> @@ -39,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/netezza/pom.xml =================================================================== --- trunk/sql12/plugins/netezza/pom.xml 2010-11-11 18:50:28 UTC (rev 5962) +++ trunk/sql12/plugins/nete... [truncated message content] |
From: <man...@us...> - 2010-11-14 00:58:49
|
Revision: 5964 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5964&view=rev Author: manningr Date: 2010-11-14 00:58:37 +0000 (Sun, 14 Nov 2010) Log Message: ----------- Fixed scm settings in poms to allow the release plugin to work properly. Reset version to 3.2.0-SNAPSHOT. Removed unused build.xml ant build file. Modified Paths: -------------- trunk/sql12/app/pom.xml trunk/sql12/doc/pom.xml trunk/sql12/fw/pom.xml trunk/sql12/installer/pom.xml trunk/sql12/installer/squirrelsql-installer-deps/pom.xml trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml trunk/sql12/installer/squirrelsql-launcher/pom.xml trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml trunk/sql12/installer/squirrelsql-other-installer/pom.xml trunk/sql12/installer/squirrelsql-source/pom.xml trunk/sql12/installer/squirrelsql-update-site/pom.xml trunk/sql12/plugins/codecompletion/pom.xml trunk/sql12/plugins/dataimport/pom.xml trunk/sql12/plugins/db2/pom.xml trunk/sql12/plugins/dbcopy/pom.xml trunk/sql12/plugins/dbdiff/pom.xml trunk/sql12/plugins/derby/pom.xml trunk/sql12/plugins/editextras/pom.xml trunk/sql12/plugins/example/pom.xml trunk/sql12/plugins/exportconfig/pom.xml trunk/sql12/plugins/favs/pom.xml trunk/sql12/plugins/firebird/pom.xml trunk/sql12/plugins/firebirdmanager/pom.xml trunk/sql12/plugins/graph/pom.xml trunk/sql12/plugins/h2/pom.xml trunk/sql12/plugins/hibernate/pom.xml trunk/sql12/plugins/i18n/pom.xml trunk/sql12/plugins/informix/pom.xml trunk/sql12/plugins/laf/pom.xml trunk/sql12/plugins/macosx/pom.xml trunk/sql12/plugins/mssql/pom.xml trunk/sql12/plugins/mysql/pom.xml trunk/sql12/plugins/netezza/pom.xml trunk/sql12/plugins/oracle/pom.xml trunk/sql12/plugins/pom.xml trunk/sql12/plugins/postgres/pom.xml trunk/sql12/plugins/refactoring/pom.xml trunk/sql12/plugins/sessionscript/pom.xml trunk/sql12/plugins/smarttools/pom.xml trunk/sql12/plugins/sqlbookmark/pom.xml trunk/sql12/plugins/sqlparam/pom.xml trunk/sql12/plugins/sqlreplace/pom.xml trunk/sql12/plugins/sqlscript/pom.xml trunk/sql12/plugins/sqlval/pom.xml trunk/sql12/plugins/squirrelsql-plugins-assembly-descriptor/pom.xml trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml trunk/sql12/plugins/sybase/pom.xml trunk/sql12/plugins/syntax/pom.xml trunk/sql12/plugins/userscript/pom.xml trunk/sql12/pom.xml trunk/sql12/squirrelsql-integration-environment/pom.xml trunk/sql12/squirrelsql-translations/pom.xml trunk/sql12/web-site/pom.xml Removed Paths: ------------- trunk/sql12/plugins/mssql/build.xml Modified: trunk/sql12/app/pom.xml =================================================================== --- trunk/sql12/app/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/app/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -41,9 +41,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/sql12</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/app</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/app</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/app</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/doc/pom.xml =================================================================== --- trunk/sql12/doc/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/doc/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -1,76 +1,77 @@ -<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>net.sf.squirrel-sql</groupId> - <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-RC1</version> +<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>net.sf.squirrel-sql</groupId> + <artifactId>squirrel-root-pom</artifactId> + <version>3.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>doc</artifactId> - <packaging>jar</packaging> - - <name>SQuirreL-SQL Documentation</name> - <description> + </parent> + + <artifactId>doc</artifactId> + <packaging>jar</packaging> + + <name>SQuirreL-SQL Documentation</name> + <description> Project that contains documentation for SQuirreL SQL Client that gets distributed in the installer </description> - <inceptionYear>2001</inceptionYear> - <developers> - <developer> - <name>Gerd Wagner</name> - <roles> - <role>Administrator</role> - <role>Developer</role> - </roles> - </developer> - <developer> - <name>Rob Manning</name> - <roles> - <role>Developer</role> - <role>Release Manager</role> - </roles> - </developer> - </developers> - <licenses> - <license> - <name>GNU Lesser General Public License</name> - <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url> - <distribution>repo</distribution> - </license> - </licenses> - <url>http://www.squirrelsql.org/</url> - <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/sql12</url> - </scm> - <issueManagement> - <system>SourceForge Tracker</system> - <url>http://sourceforge.net/tracker/?group_id=28383%26atid=393414</url> - </issueManagement> - <ciManagement> - <system>Hudson</system> - <url>https://www.squirrel-sql.org/hudson/</url> - </ciManagement> + <inceptionYear>2001</inceptionYear> + <developers> + <developer> + <name>Gerd Wagner</name> + <roles> + <role>Administrator</role> + <role>Developer</role> + </roles> + </developer> + <developer> + <name>Rob Manning</name> + <roles> + <role>Developer</role> + <role>Release Manager</role> + </roles> + </developer> + </developers> + <licenses> + <license> + <name>GNU Lesser General Public License</name> + <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <url>http://www.squirrelsql.org/</url> + <scm> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/doc</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/doc</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/doc</url> + </scm> + <issueManagement> + <system>SourceForge Tracker</system> + <url>http://sourceforge.net/tracker/?group_id=28383%26atid=393414</url> + </issueManagement> + <ciManagement> + <system>Hudson</system> + <url>https://www.squirrel-sql.org/hudson/</url> + </ciManagement> - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <addMavenDescriptor>false</addMavenDescriptor> - </archive> - </configuration> - </plugin> - </plugins> - </build> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <addMavenDescriptor>false</addMavenDescriptor> + </archive> + </configuration> + </plugin> + </plugins> + </build> </project> \ No newline at end of file Modified: trunk/sql12/fw/pom.xml =================================================================== --- trunk/sql12/fw/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/fw/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -4,7 +4,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -45,9 +45,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/sql12</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/fw</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/fw</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/fw</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/pom.xml =================================================================== --- trunk/sql12/installer/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/installer/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -1,10 +1,11 @@ -<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"> +<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>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -42,9 +43,9 @@ <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/sql12</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer</url> </scm> <issueManagement> <system>SourceForge Tracker</system> @@ -65,12 +66,12 @@ </modules> <profiles> - <!-- + <!-- The only difference here is that we want to include the squirrelsql-source project as a module - when the uploadInstallers property is set. Since the squirrelsql-source project takes some time - to export the source from subversion, and there is very little use for it except when uploading - the installers (uploadInstallers property is set), we exclude it for now in the default build. - --> + when the uploadInstallers property is set. Since the squirrelsql-source project takes some time + to export the source from subversion, and there is very little use for it except when uploading + the installers (uploadInstallers property is set), we exclude it for now in the default build. + --> <profile> <activation> <property> Modified: trunk/sql12/installer/squirrelsql-installer-deps/pom.xml =================================================================== --- trunk/sql12/installer/squirrelsql-installer-deps/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/installer/squirrelsql-installer-deps/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -4,7 +4,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -39,9 +39,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-installer-deps</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-installer-deps</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-installer-deps</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml =================================================================== --- trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -4,7 +4,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -43,9 +43,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-java-version-checker</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-java-version-checker</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-java-version-checker</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/squirrelsql-launcher/pom.xml =================================================================== --- trunk/sql12/installer/squirrelsql-launcher/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/installer/squirrelsql-launcher/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -1,10 +1,11 @@ -<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"> +<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>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -40,11 +41,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12 - </connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12 - </developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-launcher</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-launcher</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-launcher</url> </scm> <issueManagement> <system>SourceForge Tracker</system> @@ -121,7 +120,7 @@ <dependency> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-sql</artifactId> - <version>3.2.0-RC1</version> + <version>${project.version}</version> </dependency> </dependencies> Modified: trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml =================================================================== --- trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -1,10 +1,11 @@ -<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"> +<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>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -39,9 +40,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-macosx-installer</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-macosx-installer</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-macosx-installer</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/squirrelsql-other-installer/pom.xml =================================================================== --- trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -4,7 +4,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -39,9 +39,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-other-installer</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-other-installer</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-other-installer</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/squirrelsql-source/pom.xml =================================================================== --- trunk/sql12/installer/squirrelsql-source/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/installer/squirrelsql-source/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -43,9 +43,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-source</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-source</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-source</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/squirrelsql-update-site/pom.xml =================================================================== --- trunk/sql12/installer/squirrelsql-update-site/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/installer/squirrelsql-update-site/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -1,10 +1,11 @@ -<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"> +<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>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -43,9 +44,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-update-site</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-update-site</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-update-site</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/codecompletion/pom.xml =================================================================== --- trunk/sql12/plugins/codecompletion/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/plugins/codecompletion/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -1,9 +1,10 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>codecompletion</artifactId> @@ -36,9 +37,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/codecompletion</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/codecompletion</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/codecompletion</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/dataimport/pom.xml =================================================================== --- trunk/sql12/plugins/dataimport/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/plugins/dataimport/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -1,9 +1,10 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>dataimport</artifactId> @@ -36,9 +37,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dataimport</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dataimport</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/dataimport</url> </scm> <issueManagement> <system>SourceForge Tracker</system> @@ -86,7 +87,7 @@ </dependencies> <properties> <pluginClassName>net.sourceforge.squirrel_sql.plugins.dataimport.DataImportPlugin</pluginClassName> - </properties> + </properties> <build> <plugins> <plugin> Modified: trunk/sql12/plugins/db2/pom.xml =================================================================== --- trunk/sql12/plugins/db2/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/plugins/db2/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -1,15 +1,16 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>db2</artifactId> <packaging>jar</packaging> - + <name>Db2 Plugin</name> <description>Db2 Plugin</description> <inceptionYear>2001</inceptionYear> @@ -38,9 +39,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/db2</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/db2</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/db2</url> </scm> <issueManagement> <system>SourceForge Tracker</system> @@ -60,7 +61,7 @@ <artifactId>fw</artifactId> <type>test-jar</type> <scope>test</scope> - </dependency> + </dependency> <dependency> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-sql</artifactId> @@ -70,7 +71,7 @@ <artifactId>squirrel-sql</artifactId> <type>test-jar</type> <scope>test</scope> - </dependency> + </dependency> <dependency> <groupId>gsbase</groupId> <artifactId>gsbase</artifactId> Modified: trunk/sql12/plugins/dbcopy/pom.xml =================================================================== --- trunk/sql12/plugins/dbcopy/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/plugins/dbcopy/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -1,9 +1,10 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>dbcopy</artifactId> @@ -36,9 +37,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dbcopy</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dbcopy</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/dbcopy</url> </scm> <issueManagement> <system>SourceForge Tracker</system> @@ -86,7 +87,7 @@ </dependencies> <properties> <pluginClassName>net.sourceforge.squirrel_sql.plugins.dbcopy.DBCopyPlugin</pluginClassName> - </properties> + </properties> <build> <plugins> <plugin> Modified: trunk/sql12/plugins/dbdiff/pom.xml =================================================================== --- trunk/sql12/plugins/dbdiff/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/plugins/dbdiff/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -1,9 +1,10 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>dbdiff</artifactId> @@ -36,9 +37,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dbdiff</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dbdiff</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/dbdiff</url> </scm> <issueManagement> <system>SourceForge Tracker</system> @@ -86,7 +87,7 @@ </dependencies> <properties> <pluginClassName>net.sourceforge.squirrel_sql.plugins.dbdiff.DBDiffPlugin</pluginClassName> - </properties> + </properties> <build> <plugins> <plugin> Modified: trunk/sql12/plugins/derby/pom.xml =================================================================== --- trunk/sql12/plugins/derby/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/plugins/derby/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -1,9 +1,10 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>derby</artifactId> @@ -36,9 +37,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/derby</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/derby</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/derby</url> </scm> <issueManagement> <system>SourceForge Tracker</system> @@ -86,7 +87,7 @@ </dependencies> <properties> <pluginClassName>net.sourceforge.squirrel_sql.plugins.derby.DerbyPlugin</pluginClassName> - </properties> + </properties> <build> <plugins> <plugin> Modified: trunk/sql12/plugins/editextras/pom.xml =================================================================== --- trunk/sql12/plugins/editextras/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/plugins/editextras/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -1,9 +1,10 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>editextras</artifactId> @@ -36,9 +37,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/editextras</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/editextras</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/editextras</url> </scm> <issueManagement> <system>SourceForge Tracker</system> @@ -86,7 +87,7 @@ </dependencies> <properties> <pluginClassName>net.sourceforge.squirrel_sql.editextras.EditExtrasPlugin</pluginClassName> - </properties> + </properties> <build> <plugins> <plugin> Modified: trunk/sql12/plugins/example/pom.xml =================================================================== --- trunk/sql12/plugins/example/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/plugins/example/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -1,9 +1,10 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>example</artifactId> @@ -36,9 +37,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/example</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/example</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/example</url> </scm> <issueManagement> <system>SourceForge Tracker</system> @@ -86,7 +87,7 @@ </dependencies> <properties> <pluginClassName>net.sourceforge.squirrel_sql.plugins.example.ExamplePlugin</pluginClassName> - </properties> + </properties> <build> <plugins> <plugin> Modified: trunk/sql12/plugins/exportconfig/pom.xml =================================================================== --- trunk/sql12/plugins/exportconfig/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/plugins/exportconfig/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -1,9 +1,10 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>exportconfig</artifactId> @@ -36,9 +37,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/exportconfig</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/exportconfig</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/exportconfig</url> </scm> <issueManagement> <system>SourceForge Tracker</system> @@ -86,7 +87,7 @@ </dependencies> <properties> <pluginClassName>net.sourceforge.squirrel_sql.plugins.exportconfig.ExportConfigPlugin</pluginClassName> - </properties> + </properties> <build> <plugins> <plugin> Modified: trunk/sql12/plugins/favs/pom.xml =================================================================== --- trunk/sql12/plugins/favs/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/plugins/favs/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -1,9 +1,10 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>favs</artifactId> @@ -36,9 +37,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/favs</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/favs</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/favs</url> </scm> <issueManagement> <system>SourceForge Tracker</system> @@ -86,7 +87,7 @@ </dependencies> <properties> <pluginClassName>net.sourceforge.squirrel_sql.plugins.favs.SavedQueriesPlugin</pluginClassName> - </properties> + </properties> <build> <plugins> <plugin> Modified: trunk/sql12/plugins/firebird/pom.xml =================================================================== --- trunk/sql12/plugins/firebird/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/plugins/firebird/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -1,9 +1,10 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>firebird</artifactId> @@ -36,9 +37,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/firebird</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/firebird</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/firebird</url> </scm> <issueManagement> <system>SourceForge Tracker</system> @@ -86,7 +87,7 @@ </dependencies> <properties> <pluginClassName>org.firebirdsql.squirrel.FirebirdPlugin</pluginClassName> - </properties> + </properties> <build> <plugins> <plugin> Modified: trunk/sql12/plugins/firebirdmanager/pom.xml =================================================================== --- trunk/sql12/plugins/firebirdmanager/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/plugins/firebirdmanager/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -1,9 +1,10 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>firebirdmanager</artifactId> @@ -36,9 +37,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/firebirdmanager</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/firebirdmanager</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/firebirdmanager</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/graph/pom.xml =================================================================== --- trunk/sql12/plugins/graph/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/plugins/graph/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -1,9 +1,10 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>graph</artifactId> @@ -36,9 +37,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/graph</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/graph</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/graph</url> </scm> <issueManagement> <system>SourceForge Tracker</system> @@ -86,7 +87,7 @@ </dependencies> <properties> <pluginClassName>net.sourceforge.squirrel_sql.plugins.graph.GraphPlugin</pluginClassName> - </properties> + </properties> <build> <plugins> <plugin> Modified: trunk/sql12/plugins/h2/pom.xml =================================================================== --- trunk/sql12/plugins/h2/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/plugins/h2/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -1,9 +1,10 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>h2</artifactId> @@ -36,9 +37,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/h2</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/h2</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/h2</url> </scm> <issueManagement> <system>SourceForge Tracker</system> @@ -86,7 +87,7 @@ </dependencies> <properties> <pluginClassName>net.sourceforge.squirrel_sql.plugins.h2.H2Plugin</pluginClassName> - </properties> + </properties> <build> <plugins> <plugin> Modified: trunk/sql12/plugins/hibernate/pom.xml =================================================================== --- trunk/sql12/plugins/hibernate/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/plugins/hibernate/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -1,9 +1,10 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>hibernate</artifactId> @@ -36,9 +37,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/hibernate</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/hibernate</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/hibernate</url> </scm> <issueManagement> <system>SourceForge Tracker</system> @@ -86,7 +87,7 @@ </dependencies> <properties> <pluginClassName>net.sourceforge.squirrel_sql.plugins.hibernate.HibernatePlugin</pluginClassName> - </properties> + </properties> <build> <plugins> <plugin> Modified: trunk/sql12/plugins/i18n/pom.xml =================================================================== --- trunk/sql12/plugins/i18n/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/plugins/i18n/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -1,9 +1,10 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>i18n</artifactId> @@ -36,9 +37,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/i18n</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/i18n</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/i18n</url> </scm> <issueManagement> <system>SourceForge Tracker</system> @@ -86,7 +87,7 @@ </dependencies> <properties> <pluginClassName>net.sourceforge.squirrel_sql.plugins.i18n.I18nPlugin</pluginClassName> - </properties> + </properties> <build> <plugins> <plugin> Modified: trunk/sql12/plugins/informix/pom.xml =================================================================== --- trunk/sql12/plugins/informix/pom.xml 2010-11-12 23:10:10 UTC (rev 5963) +++ trunk/sql12/plugins/informix/pom.xml 2010-11-14 00:58:37 UTC (rev 5964) @@ -1,9 +1,10 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC1</version> + <version>3.2.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>informix</artifactId> @@ -36,9 +37,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</connection> - <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/3.2.0-RC1/trunk/sql12</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc... [truncated message content] |
From: <man...@us...> - 2010-11-20 18:57:28
|
Revision: 5980 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5980&view=rev Author: manningr Date: 2010-11-20 18:57:21 +0000 (Sat, 20 Nov 2010) Log Message: ----------- Updated maven plugin versions to use ones that support parallel builds ( a new feature in Maven 3). There is still one plugin (assembly) which isn't thread-safe and causes parallel builds to fail currently when building the assembly zips for the plugins. Modified Paths: -------------- trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml trunk/sql12/pom.xml Modified: trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml =================================================================== --- trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml 2010-11-20 14:50:08 UTC (rev 5979) +++ trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml 2010-11-20 18:57:21 UTC (rev 5980) @@ -221,9 +221,9 @@ <goal>single</goal> </goals> <configuration> - <descriptors> - <descriptor>squirrelsql-plugin-assembly.xml</descriptor> - </descriptors> + <descriptorRefs> + <descriptorRef>squirrelsql-plugin-assembly</descriptorRef> + </descriptorRefs> <!-- This must be true, or else it will cause this to become the main artifact for each plugin project Modified: trunk/sql12/pom.xml =================================================================== --- trunk/sql12/pom.xml 2010-11-20 14:50:08 UTC (rev 5979) +++ trunk/sql12/pom.xml 2010-11-20 18:57:21 UTC (rev 5980) @@ -57,9 +57,9 @@ </ciManagement> <properties> <!-- Maven plugin versions --> - <assembly-plugin-version>2.2-beta-5</assembly-plugin-version> + <assembly-plugin-version>2.2</assembly-plugin-version> <checkstyle-plugin-version>2.2</checkstyle-plugin-version> - <compiler-plugin-version>2.0.2</compiler-plugin-version> + <compiler-plugin-version>2.3.2</compiler-plugin-version> <dependency-plugin-version>2.0</dependency-plugin-version> <exec-plugin-version>1.2</exec-plugin-version> <findbugs-plugin-version>2.1</findbugs-plugin-version> @@ -72,10 +72,10 @@ <pmd-plugin-version>2.4</pmd-plugin-version> <release-plugin-version>2.1</release-plugin-version> <scm-plugin-version>1.4</scm-plugin-version> - <source-plugin-version>2.1</source-plugin-version> - <squirrelsql-version-plugin-version>1.0.3</squirrelsql-version-plugin-version> - <squirrelsql-update-site-plugin-version>1.0.1</squirrelsql-update-site-plugin-version> - <surefire-plugin-version>2.5</surefire-plugin-version> + <source-plugin-version>2.1.2</source-plugin-version> + <squirrelsql-version-plugin-version>1.0.4</squirrelsql-version-plugin-version> + <squirrelsql-update-site-plugin-version>1.0.4</squirrelsql-update-site-plugin-version> + <surefire-plugin-version>2.6</surefire-plugin-version> <surefire-report-plugin-version>2.0-beta-1</surefire-report-plugin-version> <wagon-plugin-version>1.0-beta-3</wagon-plugin-version> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ger...@us...> - 2010-11-23 23:10:39
|
Revision: 6003 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6003&view=rev Author: gerdwagner Date: 2010-11-23 23:10:33 +0000 (Tue, 23 Nov 2010) Log Message: ----------- New Session property to let SQuirreL set fetch size (call Statement.setFetchSize(int)). Modified Paths: -------------- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecuterTask.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SessionProperties.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SessionPropertiesBeanInfo.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SessionSQLPropertiesPanel.java trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/properties/I18NStrings.properties trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/properties/SessionPropertiesTest.java trunk/sql12/doc/src/main/resources/changes.txt Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecuterTask.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecuterTask.java 2010-11-23 22:09:58 UTC (rev 6002) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecuterTask.java 2010-11-23 23:10:33 UTC (rev 6003) @@ -150,6 +150,12 @@ try { + if(props.getSQLUseFetchSize() && props.getSQLFetchSize() > 0) + { + setFetchSize(props); + } + + final boolean correctlySupportsMaxRows = conn.getSQLMetaData() .correctlySupportsSetMaxRows(); if (correctlySupportsMaxRows && props.getSQLLimitRows()) @@ -311,6 +317,21 @@ } } + /** + * Set the fetchSize Arrtibute for the SQL-Statement; + */ + private void setFetchSize(SessionProperties props) + { + try + { + _stmt.setFetchSize(props.getSQLFetchSize()); + } + catch (Exception e) + { + s_log.error("Can't Set FetchSize", e); + } + } + private void setMaxRows(final SessionProperties props) { try @@ -796,4 +817,4 @@ ////////////////////////////////////////////////////////////////////////////////// -} \ No newline at end of file +} Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SessionProperties.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SessionProperties.java 2010-11-23 22:09:58 UTC (rev 6002) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SessionProperties.java 2010-11-23 23:10:33 UTC (rev 6003) @@ -86,6 +86,8 @@ String KEEP_TABLE_LAYOUT_ON_RERUN = "keepTableLayoutOnRerun"; String LIMIT_SQL_RESULT_TABS = "limitSqlResultTabs"; String REMOVE_MULTI_LINE_COMMENT = "removeMultiLineComment"; + String SQL_USE_FETCH_SIZE = "sqlUseFetchSize"; + String SQL_FETCH_SIZE = "sqlFetchSize"; } private static final FontInfo DEFAULT_FONT_INFO = @@ -237,6 +239,16 @@ private int _sqlResultTabLimit = 15; /** + * The nuber of rows, which the database driver should fetch at once. + */ + private int _sqlFetchSize=50; + + /** + * Indicates that the we should use the setFetchSize() Method of an Statement. + */ + private boolean _sqlUseFetchSize; + + /** * Default ctor. */ public SessionProperties() @@ -565,6 +577,38 @@ oldValue, _sqlLimitRows); } } + + /** + * Sets the number of rows which should be fetched at once. + */ + public void setSQLFetchSize(int value) + { + if(value < 0){ + throw new IllegalArgumentException("FetchSize must be >= 0. fetchSize=" +value); + } + if (_sqlFetchSize != value) + { + final int oldValue = _sqlFetchSize; + _sqlFetchSize = value; + getPropertyChangeReporter().firePropertyChange( + IPropertyNames.SQL_FETCH_SIZE, + oldValue, _sqlFetchSize); + } + } + /** + * Defines, if we should use {@link Statement#setFetchSize(int)} + */ + public void setSQLUseFetchSize(boolean value) + { + if (_sqlUseFetchSize != value) + { + final boolean oldValue = _sqlUseFetchSize; + _sqlUseFetchSize = value; + getPropertyChangeReporter().firePropertyChange( + IPropertyNames.SQL_USE_FETCH_SIZE, + oldValue, _sqlUseFetchSize); + } + } /** @@ -1004,4 +1048,14 @@ } return _propChgReporter; } + + public int getSQLFetchSize() + { + return _sqlFetchSize; + } + + public boolean getSQLUseFetchSize() + { + return _sqlUseFetchSize; + } } Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SessionPropertiesBeanInfo.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SessionPropertiesBeanInfo.java 2010-11-23 22:09:58 UTC (rev 6002) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SessionPropertiesBeanInfo.java 2010-11-23 23:10:33 UTC (rev 6003) @@ -91,6 +91,10 @@ "getSQLExecutionTabPlacement", "setSQLExecutionTabPlacement"), new PropertyDescriptor(IPropNames.SQL_RESULTS_TAB_PLACEMENT, SessionProperties.class, "getSQLResultsTabPlacement", "setSQLResultsTabPlacement"), + new PropertyDescriptor(IPropNames.SQL_USE_FETCH_SIZE, SessionProperties.class, + "getSQLFetchSize", "setSQLFetchSize"), + new PropertyDescriptor(IPropNames.SQL_FETCH_SIZE, SessionProperties.class, + "getSQLUseFetchSize", "setSQLUseFetchSize"), new PropertyDescriptor(IPropNames.TABLE_CONTENTS_OUTPUT_CLASS_NAME, SessionProperties.class, "getTableContentsOutputClassName", "setTableContentsOutputClassName"), Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SessionSQLPropertiesPanel.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SessionSQLPropertiesPanel.java 2010-11-23 22:09:58 UTC (rev 6002) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SessionSQLPropertiesPanel.java 2010-11-23 23:10:33 UTC (rev 6003) @@ -129,6 +129,8 @@ private JCheckBox _commitOnClose = new JCheckBox(s_stringMgr.getString("SessionSQLPropertiesPanel.commitonclose")); private IntegerField _sqlNbrRowsToShowField = new IntegerField(5); private JCheckBox _sqlLimitRowsChk = new JCheckBox(s_stringMgr.getString("SessionSQLPropertiesPanel.limitrows")); + private JCheckBox _sqlFetchSizeChk = new JCheckBox(s_stringMgr.getString("SessionSQLPropertiesPanel.fetchSize")); + private IntegerField _sqlFetchSizeField = new IntegerField(5); private JTextField _stmtSepField = new JTextField(5); private JTextField _solCommentField = new JTextField(2); // i18n[SessionSQLPropertiesPanel.removeMultiLineComment=Remove multi line comment (/*...*/) from SQL before sending to database] @@ -172,8 +174,9 @@ _commitOnClose.setSelected(props.getCommitOnClosingConnection()); _sqlNbrRowsToShowField.setInt(props.getSQLNbrRowsToShow()); _sqlLimitRowsChk.setSelected(props.getSQLLimitRows()); + _sqlFetchSizeChk.setSelected(props.getSQLUseFetchSize()); + _sqlFetchSizeField.setInt(props.getSQLFetchSize()); - if(null != _session) { IQueryTokenizer queryTokenizer = _session.getQueryTokenizer(); @@ -247,6 +250,9 @@ props.setCommitOnClosingConnection(_commitOnClose.isSelected()); props.setSQLNbrRowsToShow(_sqlNbrRowsToShowField.getInt()); props.setSQLLimitRows(_sqlLimitRowsChk.isSelected()); + props.setSQLFetchSize(_sqlFetchSizeField.getInt()); + props.setSQLUseFetchSize(_sqlFetchSizeChk.isSelected()); + props.setSQLStatementSeparator(_stmtSepField.getText()); props.setStartOfLineComment(_solCommentField.getText()); props.setRemoveMultiLineComment(_removeMultiLineComment.isSelected()); @@ -277,6 +283,8 @@ _sqlNbrRowsToShowField.setEnabled(_sqlLimitRowsChk.isSelected()); + _sqlFetchSizeField.setEnabled(_sqlFetchSizeChk.isSelected()); + _limitSQLResultTabsField.setEnabled(_limitSQLResultTabsChk.isSelected()); // If this session doesn't share SQL history with other sessions @@ -315,6 +323,7 @@ _autoCommitChk.addChangeListener(_controlMediator); _sqlLimitRowsChk.addChangeListener(_controlMediator); + _sqlFetchSizeChk.addChangeListener(_controlMediator); _sqlNbrRowsToShowField.setColumns(5); _stmtSepField.setColumns(5); @@ -346,6 +355,27 @@ ++gbc.gridx; gbc.gridwidth = GridBagConstraints.REMAINDER; pnl.add(new JLabel(s_stringMgr.getString("SessionSQLPropertiesPanel.rows")), gbc); + + + // Show fetchSize-Option + ++gbc.gridy; // new line + gbc.gridx = 0; + gbc.gridwidth = 2; + pnl.add(_sqlFetchSizeChk, gbc); + gbc.gridwidth = 1; + gbc.gridx+=2; + pnl.add(_sqlFetchSizeField, gbc); + ++gbc.gridx; + gbc.gridwidth = GridBagConstraints.REMAINDER; + pnl.add(new JLabel(s_stringMgr.getString("SessionSQLPropertiesPanel.rows")), gbc); + + + + + + + + ++gbc.gridy; // new line gbc.gridx = 0; Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/properties/I18NStrings.properties =================================================================== --- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/properties/I18NStrings.properties 2010-11-23 22:09:58 UTC (rev 6002) +++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/properties/I18NStrings.properties 2010-11-23 23:10:33 UTC (rev 6003) @@ -4,6 +4,7 @@ SessionSQLPropertiesPanel.commitonclose=Commit On Closing Session SessionSQLPropertiesPanel.font=Font SessionSQLPropertiesPanel.limitrows=SQL results - Limit rows +SessionSQLPropertiesPanel.fetchSize=Fetch Rows at once SessionSQLPropertiesPanel.limitsqlhistorysize=Limit SQL History Combo Size SessionSQLPropertiesPanel.rows=rows SessionSQLPropertiesPanel.sharesqlhistory=Share SQL History Modified: trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/properties/SessionPropertiesTest.java =================================================================== --- trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/properties/SessionPropertiesTest.java 2010-11-23 22:09:58 UTC (rev 6002) +++ trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/properties/SessionPropertiesTest.java 2010-11-23 23:10:33 UTC (rev 6003) @@ -322,5 +322,35 @@ classUnderTest.setShowResultsMetaData(true); assertEquals(true, classUnderTest.getShowResultsMetaData()); } + + @Test + public void testGetUseFetchSize() throws Exception { + classUnderTest.setSQLUseFetchSize(true); + assertEquals(true, classUnderTest.getSQLUseFetchSize()); + + classUnderTest.setSQLUseFetchSize(false); + assertEquals(false, classUnderTest.getSQLUseFetchSize()); + } + + @Test + public void testGetFetchSize() throws Exception { + classUnderTest.setSQLFetchSize(99); + assertEquals(99, classUnderTest.getSQLFetchSize()); + + // If the fetchSize = 0, then the it will be ignored by the Statement. + classUnderTest.setSQLFetchSize(0); + assertEquals(0, classUnderTest.getSQLFetchSize()); + } + + @Test + public void testSetFetchSizeFailure() throws Exception { + try { + classUnderTest.setSQLFetchSize(-1); + assertEquals("Using a negativ value for the FetchSize isn't allowed",false, true); + + } catch (IllegalArgumentException e) { + assertEquals("FetchSize must be >= 0. fetchSize=-1",e.getMessage()); + } + } } Modified: trunk/sql12/doc/src/main/resources/changes.txt =================================================================== --- trunk/sql12/doc/src/main/resources/changes.txt 2010-11-23 22:09:58 UTC (rev 6002) +++ trunk/sql12/doc/src/main/resources/changes.txt 2010-11-23 23:10:33 UTC (rev 6003) @@ -12,7 +12,11 @@ Graph Plugin: Multiple tables can now be selected and moved simultanously Thanks to Markus Schulz for the patch. +New Session property to let SQuirreL set fetch size (call Statement.setFetchSize(int)). + See Session properties --> SQL tab. + Thanks to Stefan (wis775) for the patch + Bug-fixes: Bug 3055859: Regular expressions did not work in find & replace dialog This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ger...@us...> - 2010-11-29 21:07:26
|
Revision: 6006 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6006&view=rev Author: gerdwagner Date: 2010-11-29 21:07:20 +0000 (Mon, 29 Nov 2010) Log Message: ----------- Added Japanese translation Modified Paths: -------------- trunk/sql12/doc/src/main/resources/changes.txt Added Paths: ----------- trunk/sql12/squirrelsql-translations/src/main/resources/squirrel-sql_ja_JP.jar Modified: trunk/sql12/doc/src/main/resources/changes.txt =================================================================== --- trunk/sql12/doc/src/main/resources/changes.txt 2010-11-26 18:18:05 UTC (rev 6005) +++ trunk/sql12/doc/src/main/resources/changes.txt 2010-11-29 21:07:20 UTC (rev 6006) @@ -7,6 +7,9 @@ Enhancements: +New translation + Japanese (thanks to Toshiki IGA) + Feature request 3030479: New global preference that allows scrollable tabbed pane for Session tabs. Graph Plugin: Multiple tables can now be selected and moved simultanously Added: trunk/sql12/squirrelsql-translations/src/main/resources/squirrel-sql_ja_JP.jar =================================================================== (Binary files differ) Property changes on: trunk/sql12/squirrelsql-translations/src/main/resources/squirrel-sql_ja_JP.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ger...@us...> - 2010-12-14 20:36:04
|
Revision: 6008 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6008&view=rev Author: gerdwagner Date: 2010-12-14 20:35:57 +0000 (Tue, 14 Dec 2010) Log Message: ----------- Icons in Object tree Modified Paths: -------------- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeCellRenderer.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeNode.java trunk/sql12/doc/src/main/resources/changes.txt trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.java trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/DatabaseObjectType.java trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.properties Added Paths: ----------- trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/ trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/catalog.png trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/database.gif trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/datatype.png trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/datatypes.png trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/index.gif trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/indexes.gif trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/procedure.gif trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/procedures.gif trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/schema.png trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/sequence.png trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/sequences.png trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/table.png trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/tables.png trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/trigger.gif trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/triggers.gif trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/user.png trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/view.gif Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeCellRenderer.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeCellRenderer.java 2010-12-10 03:38:51 UTC (rev 6007) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeCellRenderer.java 2010-12-14 20:35:57 UTC (rev 6008) @@ -120,7 +120,41 @@ } else { + if(value instanceof ObjectTreeNode) + { + ObjectTreeNode otn = (ObjectTreeNode) value; + if (null != otn.getIcon()) + { + ret.setIcon(otn.getIcon()); + } + else + { + setDefaultIcon(expanded, leaf, ret); + } + + } + else + { + setDefaultIcon(expanded, leaf, ret); + } + return ret; } } + + private void setDefaultIcon(boolean expanded, boolean leaf, JLabel lbl) + { + if (leaf) + { + lbl.setIcon(getLeafIcon()); + } + else if (expanded) + { + lbl.setIcon(getDefaultOpenIcon()); + } + else + { + lbl.setIcon(getDefaultClosedIcon()); + } + } } Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeNode.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeNode.java 2010-12-10 03:38:51 UTC (rev 6007) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeNode.java 2010-12-14 20:35:57 UTC (rev 6008) @@ -20,10 +20,12 @@ import java.util.ArrayList; import java.util.List; +import javax.swing.*; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.MutableTreeNode; import net.sourceforge.squirrel_sql.fw.id.IIdentifier; +import net.sourceforge.squirrel_sql.fw.resources.LibraryResources; import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType; import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; @@ -54,10 +56,11 @@ private boolean _allowsChildren = true; /** Collection of <TT>INodeExpander</TT> objects for this node. */ - private final List<INodeExpander> _expanders = - new ArrayList<INodeExpander>(); + private final List<INodeExpander> _expanders = new ArrayList<INodeExpander>(); - /** + private ImageIcon _icon; + + /** * Ctor that assumes node cannot have children. * * @param session Current session. @@ -82,6 +85,13 @@ _app = session.getApplication(); _sessionId = session.getIdentifier(); _dboInfo = dboInfo; + + if(null != _dboInfo.getDatabaseObjectType().getImageName()) + { + LibraryResources rsrc = new LibraryResources(); + + _icon = rsrc.getIcon(_dboInfo.getDatabaseObjectType().getImageName()); + } } public void add(MutableTreeNode newChild) @@ -183,4 +193,9 @@ } return dbinfo.toString(); } + + public ImageIcon getIcon() + { + return _icon; + } } Modified: trunk/sql12/doc/src/main/resources/changes.txt =================================================================== --- trunk/sql12/doc/src/main/resources/changes.txt 2010-12-10 03:38:51 UTC (rev 6007) +++ trunk/sql12/doc/src/main/resources/changes.txt 2010-12-14 20:35:57 UTC (rev 6008) @@ -7,6 +7,8 @@ Enhancements: +New icons in Object tree + New translation Japanese (thanks to Toshiki IGA) Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.java =================================================================== --- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.java 2010-12-10 03:38:51 UTC (rev 6007) +++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.java 2010-12-14 20:35:57 UTC (rev 6008) @@ -26,6 +26,28 @@ String TABLE_ASCENDING = "table.ascending"; String TABLE_DESCENDING = "table.descending"; String OPEN = "open"; + + String DOT_CATALOG = "dot.catalog"; + String DOT_DATABASE = "dot.database"; + String DOT_DATATYPE = "dot.datatype"; + String DOT_DATATYPES = "dot.datatypes"; + String DOT_INDEX = "dot.index"; + String DOT_INDEXES = "dot.indexes"; + String DOT_PROCEDURE = "dot.procedure"; + String DOT_PROCEDURES = "dot.procedures"; + String DOT_SCHEMA = "dot.schema"; + String DOT_TABLE = "dot.table"; + String DOT_TABLES = "dot.tables"; + String DOT_VIEW = "dot.view"; + String DOT_USER = "dot.user"; + String DOT_SEQUENCE = "dot.sequence"; + String DOT_SEQUENCES = "dot.sequences"; + String DOT_TRIGGER = "dot.trigger"; + String DOT_TRIGGERS = "dot.triggers"; + + + + } public LibraryResources() throws IllegalArgumentException Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/DatabaseObjectType.java =================================================================== --- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/DatabaseObjectType.java 2010-12-10 03:38:51 UTC (rev 6007) +++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/DatabaseObjectType.java 2010-12-14 20:35:57 UTC (rev 6008) @@ -23,6 +23,8 @@ import net.sourceforge.squirrel_sql.fw.util.StringManager; import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; +import static net.sourceforge.squirrel_sql.fw.resources.LibraryResources.IImageNames.*; + import java.io.Serializable; /** @@ -33,8 +35,6 @@ */ public class DatabaseObjectType implements IHasIdentifier, Serializable { - static final long serialVersionUID = 2325635336825122256L; - /** Internationalized strings for this class. */ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(DatabaseObjectType.class); @@ -49,24 +49,24 @@ public final static DatabaseObjectType BEST_ROW_ID = createNewDatabaseObjectTypeI18n("DatabaseObjectType.bestRowID"); /** Catalog. */ - public final static DatabaseObjectType CATALOG = createNewDatabaseObjectTypeI18n("DatabaseObjectType.catalog"); + public final static DatabaseObjectType CATALOG = createNewDatabaseObjectTypeI18n("DatabaseObjectType.catalog", DOT_CATALOG); /** Column. */ public final static DatabaseObjectType COLUMN = createNewDatabaseObjectTypeI18n("DatabaseObjectType.column"); /** Database. */ - public final static DatabaseObjectType SESSION = createNewDatabaseObjectTypeI18n("DatabaseObjectType.database"); + public final static DatabaseObjectType SESSION = createNewDatabaseObjectTypeI18n("DatabaseObjectType.database", DOT_DATABASE); /** * Datbase object type for a "Database" node in the object tree. There is onle one * node of this type in the object tree and it indicates the alias of the database. */ - public final static DatabaseObjectType DATABASE_TYPE_DBO = createNewDatabaseObjectTypeI18n("DatabaseObjectType.DATABASE_TYPE_DBO"); //DatabaseObjectType.DATABASE_TYPE_DBO=Database Type + public final static DatabaseObjectType DATABASE_TYPE_DBO = createNewDatabaseObjectTypeI18n("DatabaseObjectType.DATABASE_TYPE_DBO", DOT_DATABASE); //DatabaseObjectType.DATABASE_TYPE_DBO=Database Type /** Standard datatype. */ - public final static DatabaseObjectType DATATYPE = createNewDatabaseObjectTypeI18n("DatabaseObjectType.datatype"); + public final static DatabaseObjectType DATATYPE = createNewDatabaseObjectTypeI18n("DatabaseObjectType.datatype", DOT_DATATYPE); /** Unique Key for a table. */ public final static DatabaseObjectType PRIMARY_KEY = createNewDatabaseObjectTypeI18n("DatabaseObjectType.primarykey"); @@ -81,78 +81,78 @@ * Database object type for a "Index Type" node in the object tree. There is * one node of this type in the object tree for each table and it is labeled "INDEX". */ - public static final DatabaseObjectType INDEX_TYPE_DBO = createNewDatabaseObjectTypeI18n("DatabaseObjectType.INDEX_TYPE_DBO"); //DatabaseObjectType.INDEX_TYPE_DBO=Index Type + public static final DatabaseObjectType INDEX_TYPE_DBO = createNewDatabaseObjectTypeI18n("DatabaseObjectType.INDEX_TYPE_DBO", DOT_INDEXES); //DatabaseObjectType.INDEX_TYPE_DBO=Index Type /** Index. */ - public final static DatabaseObjectType INDEX = createNewDatabaseObjectTypeI18n("DatabaseObjectType.index"); + public final static DatabaseObjectType INDEX = createNewDatabaseObjectTypeI18n("DatabaseObjectType.index", DOT_INDEX); /** Stored procedure. */ - public final static DatabaseObjectType PROCEDURE = createNewDatabaseObjectTypeI18n("DatabaseObjectType.storproc"); + public final static DatabaseObjectType PROCEDURE = createNewDatabaseObjectTypeI18n("DatabaseObjectType.storproc", DOT_PROCEDURE); /** * Database object type for a "Procedure Type" node in the object tree. There is * only one node of this type in the object tree and it is labeled "PROCEDURE". */ - public final static DatabaseObjectType PROC_TYPE_DBO = createNewDatabaseObjectTypeI18n("DatabaseObjectType.PROC_TYPE_DBO"); //DatabaseObjectType.PROC_TYPE_DBO=Stored Procedure Type + public final static DatabaseObjectType PROC_TYPE_DBO = createNewDatabaseObjectTypeI18n("DatabaseObjectType.PROC_TYPE_DBO", DOT_PROCEDURES); //DatabaseObjectType.PROC_TYPE_DBO=Stored Procedure Type /** Schema. */ - public final static DatabaseObjectType SCHEMA = createNewDatabaseObjectTypeI18n("DatabaseObjectType.schema"); + public final static DatabaseObjectType SCHEMA = createNewDatabaseObjectTypeI18n("DatabaseObjectType.schema", DOT_SCHEMA); /** * Database object type for a "Sequence Type" node in the object tree. There is * one node of this type in the object tree for each table and it is labeled "SEQUENCE". */ - public static final DatabaseObjectType SEQUENCE_TYPE_DBO = createNewDatabaseObjectTypeI18n("DatabaseObjectType.SEQUENCE_TYPE_DBO"); //DatabaseObjectType.SEQUENCE_TYPE_DBO=Sequence Type + public static final DatabaseObjectType SEQUENCE_TYPE_DBO = createNewDatabaseObjectTypeI18n("DatabaseObjectType.SEQUENCE_TYPE_DBO", DOT_SEQUENCE); //DatabaseObjectType.SEQUENCE_TYPE_DBO=Sequence Type /** * An object that generates uniques IDs for primary keys. E.G. an Oracle * sequence. */ - public final static DatabaseObjectType SEQUENCE = createNewDatabaseObjectTypeI18n("DatabaseObjectType.sequence"); - + public final static DatabaseObjectType SEQUENCE = createNewDatabaseObjectTypeI18n("DatabaseObjectType.sequence", DOT_SEQUENCES); + /** * Database object type for a "Synonym Type" node in the object tree. There is * one node of this type in the object tree for each table and it is labeled "SYNONYM". - */ + */ public static final DatabaseObjectType SYNONYM_TYPE_DBO = createNewDatabaseObjectTypeI18n("DatabaseObjectType.SYNONYM_TYPE_DBO"); //DatabaseObjectType.SEQUENCE_TYPE_DBO=Sequence Type - + /** * An object that is an alias for another object. While support for this isn't standardized or universal * this type of object is found in a few different databases (e.g. Oracle, Netezza) */ public final static DatabaseObjectType SYNONYM = createNewDatabaseObjectTypeI18n("DatabaseObjectType.synonym"); - + /** TABLE. */ - public final static DatabaseObjectType TABLE = createNewDatabaseObjectTypeI18n("DatabaseObjectType.table"); + public final static DatabaseObjectType TABLE = createNewDatabaseObjectTypeI18n("DatabaseObjectType.table", DOT_TABLE); /** * Database object type for a "Table Type" node in the object tree. Some examples * are "TABLE", "SYSTEM TABLE", "VIEW" etc. */ - public final static DatabaseObjectType TABLE_TYPE_DBO = createNewDatabaseObjectTypeI18n("DatabaseObjectType.TABLE_TYPE_DBO"); //DatabaseObjectType.TABLE_TYPE_DBO=Table Type + public final static DatabaseObjectType TABLE_TYPE_DBO = createNewDatabaseObjectTypeI18n("DatabaseObjectType.TABLE_TYPE_DBO", DOT_TABLES); //DatabaseObjectType.TABLE_TYPE_DBO=Table Type - public static final DatabaseObjectType VIEW = createNewDatabaseObjectTypeI18n("DatabaseObjectType.view"); + public static final DatabaseObjectType VIEW = createNewDatabaseObjectTypeI18n("DatabaseObjectType.view", DOT_VIEW); /** * Database object type for a "Trigger Type" node in the object tree. There is * one node of this type in the object tree for each table and it is labeled "TRIGGER". */ - public static final DatabaseObjectType TRIGGER_TYPE_DBO = createNewDatabaseObjectTypeI18n("DatabaseObjectType.TRIGGER_TYPE_DBO"); //DatabaseObjectType.TRIGGER_TYPE_DBO=Trigger Type + public static final DatabaseObjectType TRIGGER_TYPE_DBO = createNewDatabaseObjectTypeI18n("DatabaseObjectType.TRIGGER_TYPE_DBO", DOT_TRIGGERS); //DatabaseObjectType.TRIGGER_TYPE_DBO=Trigger Type /** Trigger. */ - public final static DatabaseObjectType TRIGGER = createNewDatabaseObjectTypeI18n("DatabaseObjectType.catalog"); + public final static DatabaseObjectType TRIGGER = createNewDatabaseObjectTypeI18n("DatabaseObjectType.catalog", DOT_TRIGGER); /** User defined type. */ - public final static DatabaseObjectType UDT = createNewDatabaseObjectTypeI18n("DatabaseObjectType.udt"); + public final static DatabaseObjectType UDT = createNewDatabaseObjectTypeI18n("DatabaseObjectType.udt", DOT_DATATYPE); /** * Database object type for a "UDT Type" node in the object tree. There is only one * node of this type in the object tree and it says "UDT". */ - public final static DatabaseObjectType UDT_TYPE_DBO = createNewDatabaseObjectTypeI18n("DatabaseObjectType.UDT_TYPE_DBO"); //DatabaseObjectType.UDT_TYPE_DBO=UDT Type + public final static DatabaseObjectType UDT_TYPE_DBO = createNewDatabaseObjectTypeI18n("DatabaseObjectType.UDT_TYPE_DBO", DOT_DATATYPES); //DatabaseObjectType.UDT_TYPE_DBO=UDT Type /** User defined function. */ public final static DatabaseObjectType UDF = createNewDatabaseObjectTypeI18n("DatabaseObjectType.udf"); @@ -164,7 +164,7 @@ public final static DatabaseObjectType UDF_TYPE_DBO = createNewDatabaseObjectTypeI18n("DatabaseObjectType.UDF_TYPE_DBO"); //DatabaseObjectType.UDF_TYPE_DBO=UDF Type /** A database user. */ - public final static DatabaseObjectType USER = createNewDatabaseObjectTypeI18n("DatabaseObjectType.user"); + public final static DatabaseObjectType USER = createNewDatabaseObjectTypeI18n("DatabaseObjectType.user", DOT_USER); /** Uniquely identifies this Object. */ private final IIdentifier _id; @@ -172,13 +172,15 @@ /** Describes this object type. */ private final String _name; private String _keyForSerializationReplace; + private String _imageName; /** * Default ctor. */ - private DatabaseObjectType(String name, String keyForSerializationReplace) + private DatabaseObjectType(String name, String keyForSerializationReplace, String imageName) { _keyForSerializationReplace = keyForSerializationReplace; + _imageName = imageName; _id = s_idFactory.createIdentifier(); _name = name != null ? name : _id.toString(); } @@ -209,19 +211,29 @@ return _keyForSerializationReplace; } + public String getImageName() + { + return _imageName; + } + public String toString() { return getName(); } + public static DatabaseObjectType createNewDatabaseObjectTypeI18n(String key, String imageName) + { + return new DatabaseObjectType(key, s_stringMgr.getString(key), imageName); + } + public static DatabaseObjectType createNewDatabaseObjectTypeI18n(String key) { - return new DatabaseObjectType(key, s_stringMgr.getString(key)); + return createNewDatabaseObjectTypeI18n(key, null); } public static DatabaseObjectType createNewDatabaseObjectType(String key) { - return new DatabaseObjectType(key, key); + return new DatabaseObjectType(key, key, null); } } Modified: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.properties =================================================================== --- trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.properties 2010-12-10 03:38:51 UTC (rev 6007) +++ trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.properties 2010-12-14 20:35:57 UTC (rev 6008) @@ -30,3 +30,23 @@ table.ascending.image=eclipse/prev_nav.gif table.descending.image=eclipse/next_nav.gif open.image=eclipse/open.gif + + + +dot.catalog.image=dot/catalog.png +dot.database.image=dot/database.gif +dot.datatype.image=dot/datatype.png +dot.datatypes.image=dot/datatypes.png +dot.index.image=dot/index.gif +dot.indexes.image=dot/indexes.gif +dot.procedure.image=dot/procedure.gif +dot.procedures.image=dot/procedures.gif +dot.schema.image=dot/schema.png +dot.table.image=dot/table.png +dot.tables.image=dot/tables.png +dot.view.image=dot/view.gif +dot.user.image=dot/user.png +dot.sequence.image=dot/sequence.png +dot.sequences.image=dot/sequences.png +dot.trigger.image=dot/trigger.gif +dot.triggers.image=dot/triggers.gif Added: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/catalog.png =================================================================== (Binary files differ) Property changes on: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/catalog.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/database.gif =================================================================== (Binary files differ) Property changes on: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/database.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/datatype.png =================================================================== (Binary files differ) Property changes on: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/datatype.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/datatypes.png =================================================================== (Binary files differ) Property changes on: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/datatypes.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/index.gif =================================================================== (Binary files differ) Property changes on: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/index.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/indexes.gif =================================================================== (Binary files differ) Property changes on: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/indexes.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/procedure.gif =================================================================== (Binary files differ) Property changes on: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/procedure.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/procedures.gif =================================================================== (Binary files differ) Property changes on: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/procedures.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/schema.png =================================================================== (Binary files differ) Property changes on: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/schema.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/sequence.png =================================================================== (Binary files differ) Property changes on: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/sequence.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/sequences.png =================================================================== (Binary files differ) Property changes on: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/sequences.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/table.png =================================================================== (Binary files differ) Property changes on: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/table.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/tables.png =================================================================== (Binary files differ) Property changes on: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/tables.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/trigger.gif =================================================================== (Binary files differ) Property changes on: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/trigger.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/triggers.gif =================================================================== (Binary files differ) Property changes on: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/triggers.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/user.png =================================================================== (Binary files differ) Property changes on: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/user.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/view.gif =================================================================== (Binary files differ) Property changes on: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/view.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-12-17 21:57:52
|
Revision: 6011 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6011&view=rev Author: manningr Date: 2010-12-17 21:57:46 +0000 (Fri, 17 Dec 2010) Log Message: ----------- Updated translation for Italian (Thanks to Ivo Neri) Modified Paths: -------------- trunk/sql12/doc/src/main/resources/changes.txt trunk/sql12/squirrelsql-translations/src/main/resources/squirrel-sql_it_IT.jar Modified: trunk/sql12/doc/src/main/resources/changes.txt =================================================================== --- trunk/sql12/doc/src/main/resources/changes.txt 2010-12-15 23:37:24 UTC (rev 6010) +++ trunk/sql12/doc/src/main/resources/changes.txt 2010-12-17 21:57:46 UTC (rev 6011) @@ -9,8 +9,10 @@ New icons in Object tree +Updated translation for Italian (Thanks to Ivo Neri) + New translation - Japanese (thanks to Toshiki IGA) + Japanese (Thanks to Toshiki IGA) Feature request 3030479: New global preference that allows scrollable tabbed pane for Session tabs. Modified: trunk/sql12/squirrelsql-translations/src/main/resources/squirrel-sql_it_IT.jar =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-12-18 20:34:31
|
Revision: 6027 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6027&view=rev Author: manningr Date: 2010-12-18 20:34:25 +0000 (Sat, 18 Dec 2010) Log Message: ----------- Updated squirrelsql-version-plugin to set the value for the changelog header (in changes.txt). Now, based on the project version, the header will be set to either the "latest changes in SVN or Snapshot" if the project version ends in -SNAPSHOT, or else the header is set to the version followed by the current date. Modified Paths: -------------- trunk/sql12/doc/pom.xml trunk/sql12/doc/src/main/resources/changes.txt trunk/sql12/pom.xml Modified: trunk/sql12/doc/pom.xml =================================================================== --- trunk/sql12/doc/pom.xml 2010-12-18 20:26:15 UTC (rev 6026) +++ trunk/sql12/doc/pom.xml 2010-12-18 20:34:25 UTC (rev 6027) @@ -58,10 +58,35 @@ <resources> <resource> <directory>src/main/resources</directory> + <excludes> + <exclude>changes.txt</exclude> + </excludes> + <filtering>false</filtering> </resource> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>changes.txt</include> + </includes> + <filtering>true</filtering> + </resource> </resources> <plugins> + <!-- Set the squirrelsql.changelog.header if it has not already been set. --> <plugin> + <groupId>net.sf.squirrel-sql</groupId> + <artifactId>squirrelsql-version-plugin</artifactId> + <version>${squirrelsql-version-plugin-version}</version> + <executions> + <execution> + <phase>initialize</phase> + <goals> + <goal>set-version</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <configuration> @@ -72,5 +97,4 @@ </plugin> </plugins> </build> - -</project> \ No newline at end of file +</project> Modified: trunk/sql12/doc/src/main/resources/changes.txt =================================================================== --- trunk/sql12/doc/src/main/resources/changes.txt 2010-12-18 20:26:15 UTC (rev 6026) +++ trunk/sql12/doc/src/main/resources/changes.txt 2010-12-18 20:34:25 UTC (rev 6027) @@ -2,8 +2,7 @@ ============================== -Not yet released - available from SVN or in the latest snapshot: ----------------------------------------------------------------- +${squirrelsql.changelog.header} Enhancements: @@ -26,7 +25,7 @@ Bug-fixes: -3137390: Cannot connect after latest software update. +3137390: Cannot connect after latest software update. 3123014: StackOverflow ProgressCallBackDialog. Thanks to Stefan (wis775) for the patch. 3055859: Regular expressions did not work in find & replace dialog Modified: trunk/sql12/pom.xml =================================================================== --- trunk/sql12/pom.xml 2010-12-18 20:26:15 UTC (rev 6026) +++ trunk/sql12/pom.xml 2010-12-18 20:34:25 UTC (rev 6027) @@ -73,7 +73,7 @@ <release-plugin-version>2.1</release-plugin-version> <scm-plugin-version>1.4</scm-plugin-version> <source-plugin-version>2.1.2</source-plugin-version> - <squirrelsql-version-plugin-version>1.0.4</squirrelsql-version-plugin-version> + <squirrelsql-version-plugin-version>1.0.5</squirrelsql-version-plugin-version> <squirrelsql-update-site-plugin-version>1.0.4</squirrelsql-update-site-plugin-version> <surefire-plugin-version>2.6</surefire-plugin-version> <surefire-report-plugin-version>2.0-beta-1</surefire-report-plugin-version> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-11-21 20:21:54
|
Revision: 5982 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5982&view=rev Author: manningr Date: 2010-11-21 20:21:45 +0000 (Sun, 21 Nov 2010) Log Message: ----------- [maven-release-plugin] prepare release squirrelsql-3.2.0 Modified Paths: -------------- trunk/sql12/app/pom.xml trunk/sql12/doc/pom.xml trunk/sql12/fw/pom.xml trunk/sql12/installer/pom.xml trunk/sql12/installer/squirrelsql-installer-deps/pom.xml trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml trunk/sql12/installer/squirrelsql-launcher/pom.xml trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml trunk/sql12/installer/squirrelsql-other-installer/pom.xml trunk/sql12/installer/squirrelsql-update-site/pom.xml trunk/sql12/plugins/codecompletion/pom.xml trunk/sql12/plugins/dataimport/pom.xml trunk/sql12/plugins/db2/pom.xml trunk/sql12/plugins/dbcopy/pom.xml trunk/sql12/plugins/dbdiff/pom.xml trunk/sql12/plugins/derby/pom.xml trunk/sql12/plugins/editextras/pom.xml trunk/sql12/plugins/example/pom.xml trunk/sql12/plugins/exportconfig/pom.xml trunk/sql12/plugins/favs/pom.xml trunk/sql12/plugins/firebird/pom.xml trunk/sql12/plugins/firebirdmanager/pom.xml trunk/sql12/plugins/graph/pom.xml trunk/sql12/plugins/h2/pom.xml trunk/sql12/plugins/hibernate/pom.xml trunk/sql12/plugins/i18n/pom.xml trunk/sql12/plugins/informix/pom.xml trunk/sql12/plugins/laf/pom.xml trunk/sql12/plugins/macosx/pom.xml trunk/sql12/plugins/mssql/pom.xml trunk/sql12/plugins/mysql/pom.xml trunk/sql12/plugins/netezza/pom.xml trunk/sql12/plugins/oracle/pom.xml trunk/sql12/plugins/pom.xml trunk/sql12/plugins/postgres/pom.xml trunk/sql12/plugins/refactoring/pom.xml trunk/sql12/plugins/sessionscript/pom.xml trunk/sql12/plugins/smarttools/pom.xml trunk/sql12/plugins/sqlbookmark/pom.xml trunk/sql12/plugins/sqlparam/pom.xml trunk/sql12/plugins/sqlreplace/pom.xml trunk/sql12/plugins/sqlscript/pom.xml trunk/sql12/plugins/sqlval/pom.xml trunk/sql12/plugins/squirrelsql-plugins-assembly-descriptor/pom.xml trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml trunk/sql12/plugins/sybase/pom.xml trunk/sql12/plugins/syntax/pom.xml trunk/sql12/plugins/userscript/pom.xml trunk/sql12/pom.xml trunk/sql12/squirrelsql-translations/pom.xml trunk/sql12/web-site/pom.xml Modified: trunk/sql12/app/pom.xml =================================================================== --- trunk/sql12/app/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/app/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../pom.xml</relativePath> </parent> @@ -41,9 +41,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/app</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/app</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/app</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/app</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/app</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/app</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/doc/pom.xml =================================================================== --- trunk/sql12/doc/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/doc/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -4,7 +4,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../pom.xml</relativePath> </parent> @@ -41,9 +41,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/doc</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/doc</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/doc</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/doc</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/doc</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/doc</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/fw/pom.xml =================================================================== --- trunk/sql12/fw/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/fw/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -4,7 +4,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../pom.xml</relativePath> </parent> @@ -45,9 +45,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/fw</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/fw</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/fw</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/fw</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/fw</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/fw</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/pom.xml =================================================================== --- trunk/sql12/installer/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/installer/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -4,7 +4,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../pom.xml</relativePath> </parent> @@ -42,9 +42,9 @@ <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/installer</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/squirrelsql-installer-deps/pom.xml =================================================================== --- trunk/sql12/installer/squirrelsql-installer-deps/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/installer/squirrelsql-installer-deps/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -4,7 +4,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -39,9 +39,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-installer-deps</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-installer-deps</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-installer-deps</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-installer-deps</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-installer-deps</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-installer-deps</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml =================================================================== --- trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -4,7 +4,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -43,9 +43,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-java-version-checker</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-java-version-checker</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-java-version-checker</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-java-version-checker</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-java-version-checker</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-java-version-checker</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/squirrelsql-launcher/pom.xml =================================================================== --- trunk/sql12/installer/squirrelsql-launcher/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/installer/squirrelsql-launcher/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -4,7 +4,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -40,9 +40,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-launcher</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-launcher</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-launcher</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-launcher</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-launcher</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-launcher</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml =================================================================== --- trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -4,7 +4,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -39,9 +39,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-macosx-installer</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-macosx-installer</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-macosx-installer</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-macosx-installer</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-macosx-installer</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-macosx-installer</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/squirrelsql-other-installer/pom.xml =================================================================== --- trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -4,7 +4,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -39,9 +39,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-other-installer</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-other-installer</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-other-installer</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-other-installer</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-other-installer</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-other-installer</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/squirrelsql-update-site/pom.xml =================================================================== --- trunk/sql12/installer/squirrelsql-update-site/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/installer/squirrelsql-update-site/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -4,7 +4,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -43,9 +43,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-update-site</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-update-site</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-update-site</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-update-site</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-update-site</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-update-site</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/codecompletion/pom.xml =================================================================== --- trunk/sql12/plugins/codecompletion/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/codecompletion/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>codecompletion</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/codecompletion</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/codecompletion</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/codecompletion</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/codecompletion</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/codecompletion</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/codecompletion</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/dataimport/pom.xml =================================================================== --- trunk/sql12/plugins/dataimport/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/dataimport/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>dataimport</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dataimport</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dataimport</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/dataimport</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/dataimport</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/dataimport</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/dataimport</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/db2/pom.xml =================================================================== --- trunk/sql12/plugins/db2/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/db2/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> @@ -38,9 +38,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/db2</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/db2</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/db2</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/db2</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/db2</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/db2</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/dbcopy/pom.xml =================================================================== --- trunk/sql12/plugins/dbcopy/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/dbcopy/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>dbcopy</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dbcopy</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dbcopy</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/dbcopy</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/dbcopy</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/dbcopy</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/dbcopy</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/dbdiff/pom.xml =================================================================== --- trunk/sql12/plugins/dbdiff/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/dbdiff/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>dbdiff</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dbdiff</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dbdiff</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/dbdiff</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/dbdiff</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/dbdiff</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/dbdiff</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/derby/pom.xml =================================================================== --- trunk/sql12/plugins/derby/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/derby/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>derby</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/derby</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/derby</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/derby</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/derby</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/derby</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/derby</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/editextras/pom.xml =================================================================== --- trunk/sql12/plugins/editextras/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/editextras/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>editextras</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/editextras</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/editextras</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/editextras</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/editextras</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/editextras</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/editextras</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/example/pom.xml =================================================================== --- trunk/sql12/plugins/example/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/example/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>example</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/example</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/example</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/example</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/example</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/example</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/example</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/exportconfig/pom.xml =================================================================== --- trunk/sql12/plugins/exportconfig/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/exportconfig/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>exportconfig</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/exportconfig</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/exportconfig</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/exportconfig</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/exportconfig</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/exportconfig</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/exportconfig</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/favs/pom.xml =================================================================== --- trunk/sql12/plugins/favs/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/favs/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>favs</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/favs</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/favs</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/favs</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/favs</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/favs</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/favs</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/firebird/pom.xml =================================================================== --- trunk/sql12/plugins/firebird/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/firebird/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>firebird</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/firebird</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/firebird</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/firebird</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/firebird</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/firebird</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/firebird</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/firebirdmanager/pom.xml =================================================================== --- trunk/sql12/plugins/firebirdmanager/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/firebirdmanager/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>firebirdmanager</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/firebirdmanager</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/firebirdmanager</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/firebirdmanager</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/firebirdmanager</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/firebirdmanager</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/firebirdmanager</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/graph/pom.xml =================================================================== --- trunk/sql12/plugins/graph/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/graph/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>graph</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/graph</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/graph</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/graph</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/graph</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/graph</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/graph</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/h2/pom.xml =================================================================== --- trunk/sql12/plugins/h2/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/h2/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>h2</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/h2</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/h2</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/h2</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/h2</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/h2</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/h2</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/hibernate/pom.xml =================================================================== --- trunk/sql12/plugins/hibernate/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/hibernate/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>hibernate</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/hibernate</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/hibernate</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/hibernate</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/hibernate</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/hibernate</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/hibernate</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/i18n/pom.xml =================================================================== --- trunk/sql12/plugins/i18n/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/i18n/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>i18n</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/i18n</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/i18n</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/i18n</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/i18n</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/i18n</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/i18n</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/informix/pom.xml =================================================================== --- trunk/sql12/plugins/informix/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/informix/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>informix</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/informix</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/informix</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/informix</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/informix</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/informix</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/informix</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/laf/pom.xml =================================================================== --- trunk/sql12/plugins/laf/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/laf/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -11,7 +11,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> @@ -56,9 +56,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/laf</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/laf</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/laf</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/laf</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/laf</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/laf</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/macosx/pom.xml =================================================================== --- trunk/sql12/plugins/macosx/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/macosx/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>macosx</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/macosx</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/macosx</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/macosx</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/macosx</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/macosx</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/macosx</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/mssql/pom.xml =================================================================== --- trunk/sql12/plugins/mssql/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/mssql/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>mssql</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/mssql</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/mssql</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/mssql</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/mssql</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/mssql</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/mssql</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/mysql/pom.xml =================================================================== --- trunk/sql12/plugins/mysql/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/mysql/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>mysql</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/mysql</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/mysql</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/mysql</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/mysql</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/mysql</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/mysql</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/netezza/pom.xml =================================================================== --- trunk/sql12/plugins/netezza/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/netezza/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>netezza</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/netezza</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/netezza</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/netezza</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/netezza</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/netezza</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/netezza</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/oracle/pom.xml =================================================================== --- trunk/sql12/plugins/oracle/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/oracle/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>oracle</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/oracle</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/oracle</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/oracle</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/oracle</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/oracle</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/oracle</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/pom.xml =================================================================== --- trunk/sql12/plugins/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -4,7 +4,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../pom.xml</relativePath> </parent> @@ -47,9 +47,9 @@ <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/postgres/pom.xml =================================================================== --- trunk/sql12/plugins/postgres/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/postgres/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>postgres</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/postgres</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/postgres</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/postgres</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/postgres</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/postgres</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/postgres</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/refactoring/pom.xml =================================================================== --- trunk/sql12/plugins/refactoring/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/refactoring/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>refactoring</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/refactoring</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/refactoring</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/refactoring</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/refactoring</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/refactoring</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/refactoring</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/sessionscript/pom.xml =================================================================== --- trunk/sql12/plugins/sessionscript/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/sessionscript/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>sessionscript</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/sessionscript</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/sessionscript</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/sessionscript</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/sessionscript</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/sessionscript</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/sessionscript</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/smarttools/pom.xml =================================================================== --- trunk/sql12/plugins/smarttools/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/smarttools/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>smarttools</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/smarttools</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/smarttools</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/smarttools</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/smarttools</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/smarttools</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/smarttools</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/sqlbookmark/pom.xml =================================================================== --- trunk/sql12/plugins/sqlbookmark/pom.xml 2010-11-20 22:28:33 UTC (rev 5981) +++ trunk/sql12/plugins/sqlbookmark/pom.xml 2010-11-21 20:21:45 UTC (rev 5982) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0-RC2-SNAPSHOT</version> + <version>3.2.0</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>sqlbookmark</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squ... [truncated message content] |
From: <man...@us...> - 2010-11-21 20:24:23
|
Revision: 5984 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5984&view=rev Author: manningr Date: 2010-11-21 20:24:14 +0000 (Sun, 21 Nov 2010) Log Message: ----------- [maven-release-plugin] prepare for next development iteration Modified Paths: -------------- trunk/sql12/app/pom.xml trunk/sql12/doc/pom.xml trunk/sql12/fw/pom.xml trunk/sql12/installer/pom.xml trunk/sql12/installer/squirrelsql-installer-deps/pom.xml trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml trunk/sql12/installer/squirrelsql-launcher/pom.xml trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml trunk/sql12/installer/squirrelsql-other-installer/pom.xml trunk/sql12/installer/squirrelsql-update-site/pom.xml trunk/sql12/plugins/codecompletion/pom.xml trunk/sql12/plugins/dataimport/pom.xml trunk/sql12/plugins/db2/pom.xml trunk/sql12/plugins/dbcopy/pom.xml trunk/sql12/plugins/dbdiff/pom.xml trunk/sql12/plugins/derby/pom.xml trunk/sql12/plugins/editextras/pom.xml trunk/sql12/plugins/example/pom.xml trunk/sql12/plugins/exportconfig/pom.xml trunk/sql12/plugins/favs/pom.xml trunk/sql12/plugins/firebird/pom.xml trunk/sql12/plugins/firebirdmanager/pom.xml trunk/sql12/plugins/graph/pom.xml trunk/sql12/plugins/h2/pom.xml trunk/sql12/plugins/hibernate/pom.xml trunk/sql12/plugins/i18n/pom.xml trunk/sql12/plugins/informix/pom.xml trunk/sql12/plugins/laf/pom.xml trunk/sql12/plugins/macosx/pom.xml trunk/sql12/plugins/mssql/pom.xml trunk/sql12/plugins/mysql/pom.xml trunk/sql12/plugins/netezza/pom.xml trunk/sql12/plugins/oracle/pom.xml trunk/sql12/plugins/pom.xml trunk/sql12/plugins/postgres/pom.xml trunk/sql12/plugins/refactoring/pom.xml trunk/sql12/plugins/sessionscript/pom.xml trunk/sql12/plugins/smarttools/pom.xml trunk/sql12/plugins/sqlbookmark/pom.xml trunk/sql12/plugins/sqlparam/pom.xml trunk/sql12/plugins/sqlreplace/pom.xml trunk/sql12/plugins/sqlscript/pom.xml trunk/sql12/plugins/sqlval/pom.xml trunk/sql12/plugins/squirrelsql-plugins-assembly-descriptor/pom.xml trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml trunk/sql12/plugins/sybase/pom.xml trunk/sql12/plugins/syntax/pom.xml trunk/sql12/plugins/userscript/pom.xml trunk/sql12/pom.xml trunk/sql12/squirrelsql-translations/pom.xml trunk/sql12/web-site/pom.xml Modified: trunk/sql12/app/pom.xml =================================================================== --- trunk/sql12/app/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/app/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -41,9 +41,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/app</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/app</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/app</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/app</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/app</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/app</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/doc/pom.xml =================================================================== --- trunk/sql12/doc/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/doc/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -4,7 +4,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -41,9 +41,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/doc</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/doc</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/doc</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/doc</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/doc</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/doc</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/fw/pom.xml =================================================================== --- trunk/sql12/fw/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/fw/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -4,7 +4,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -45,9 +45,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/fw</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/fw</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/fw</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/fw</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/fw</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/fw</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/pom.xml =================================================================== --- trunk/sql12/installer/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/installer/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -4,7 +4,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -42,9 +42,9 @@ <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/installer</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/squirrelsql-installer-deps/pom.xml =================================================================== --- trunk/sql12/installer/squirrelsql-installer-deps/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/installer/squirrelsql-installer-deps/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -4,7 +4,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -39,9 +39,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-installer-deps</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-installer-deps</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-installer-deps</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-installer-deps</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-installer-deps</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-installer-deps</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml =================================================================== --- trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -4,7 +4,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -43,9 +43,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-java-version-checker</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-java-version-checker</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-java-version-checker</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-java-version-checker</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-java-version-checker</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-java-version-checker</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/squirrelsql-launcher/pom.xml =================================================================== --- trunk/sql12/installer/squirrelsql-launcher/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/installer/squirrelsql-launcher/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -4,7 +4,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -40,9 +40,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-launcher</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-launcher</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-launcher</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-launcher</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-launcher</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-launcher</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml =================================================================== --- trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -4,7 +4,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -39,9 +39,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-macosx-installer</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-macosx-installer</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-macosx-installer</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-macosx-installer</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-macosx-installer</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-macosx-installer</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/squirrelsql-other-installer/pom.xml =================================================================== --- trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -4,7 +4,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -39,9 +39,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-other-installer</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-other-installer</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-other-installer</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-other-installer</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-other-installer</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-other-installer</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/installer/squirrelsql-update-site/pom.xml =================================================================== --- trunk/sql12/installer/squirrelsql-update-site/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/installer/squirrelsql-update-site/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -4,7 +4,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -43,9 +43,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-update-site</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-update-site</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/installer/squirrelsql-update-site</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-update-site</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-update-site</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-update-site</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/codecompletion/pom.xml =================================================================== --- trunk/sql12/plugins/codecompletion/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/codecompletion/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>codecompletion</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/codecompletion</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/codecompletion</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/codecompletion</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/codecompletion</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/codecompletion</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/codecompletion</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/dataimport/pom.xml =================================================================== --- trunk/sql12/plugins/dataimport/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/dataimport/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>dataimport</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/dataimport</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/dataimport</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/dataimport</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dataimport</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dataimport</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/dataimport</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/db2/pom.xml =================================================================== --- trunk/sql12/plugins/db2/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/db2/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> @@ -38,9 +38,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/db2</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/db2</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/db2</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/db2</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/db2</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/db2</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/dbcopy/pom.xml =================================================================== --- trunk/sql12/plugins/dbcopy/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/dbcopy/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>dbcopy</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/dbcopy</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/dbcopy</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/dbcopy</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dbcopy</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dbcopy</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/dbcopy</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/dbdiff/pom.xml =================================================================== --- trunk/sql12/plugins/dbdiff/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/dbdiff/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>dbdiff</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/dbdiff</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/dbdiff</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/dbdiff</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dbdiff</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dbdiff</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/dbdiff</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/derby/pom.xml =================================================================== --- trunk/sql12/plugins/derby/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/derby/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>derby</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/derby</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/derby</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/derby</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/derby</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/derby</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/derby</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/editextras/pom.xml =================================================================== --- trunk/sql12/plugins/editextras/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/editextras/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>editextras</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/editextras</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/editextras</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/editextras</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/editextras</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/editextras</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/editextras</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/example/pom.xml =================================================================== --- trunk/sql12/plugins/example/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/example/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>example</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/example</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/example</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/example</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/example</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/example</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/example</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/exportconfig/pom.xml =================================================================== --- trunk/sql12/plugins/exportconfig/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/exportconfig/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>exportconfig</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/exportconfig</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/exportconfig</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/exportconfig</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/exportconfig</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/exportconfig</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/exportconfig</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/favs/pom.xml =================================================================== --- trunk/sql12/plugins/favs/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/favs/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>favs</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/favs</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/favs</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/favs</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/favs</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/favs</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/favs</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/firebird/pom.xml =================================================================== --- trunk/sql12/plugins/firebird/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/firebird/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>firebird</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/firebird</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/firebird</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/firebird</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/firebird</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/firebird</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/firebird</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/firebirdmanager/pom.xml =================================================================== --- trunk/sql12/plugins/firebirdmanager/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/firebirdmanager/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>firebirdmanager</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/firebirdmanager</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/firebirdmanager</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/firebirdmanager</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/firebirdmanager</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/firebirdmanager</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/firebirdmanager</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/graph/pom.xml =================================================================== --- trunk/sql12/plugins/graph/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/graph/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>graph</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/graph</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/graph</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/graph</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/graph</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/graph</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/graph</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/h2/pom.xml =================================================================== --- trunk/sql12/plugins/h2/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/h2/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>h2</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/h2</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/h2</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/h2</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/h2</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/h2</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/h2</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/hibernate/pom.xml =================================================================== --- trunk/sql12/plugins/hibernate/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/hibernate/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>hibernate</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/hibernate</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/hibernate</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/hibernate</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/hibernate</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/hibernate</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/hibernate</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/i18n/pom.xml =================================================================== --- trunk/sql12/plugins/i18n/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/i18n/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>i18n</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/i18n</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/i18n</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/i18n</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/i18n</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/i18n</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/i18n</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/informix/pom.xml =================================================================== --- trunk/sql12/plugins/informix/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/informix/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>informix</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/informix</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/informix</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/informix</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/informix</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/informix</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/informix</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/laf/pom.xml =================================================================== --- trunk/sql12/plugins/laf/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/laf/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -11,7 +11,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> @@ -56,9 +56,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/laf</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/laf</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/laf</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/laf</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/laf</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/laf</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/macosx/pom.xml =================================================================== --- trunk/sql12/plugins/macosx/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/macosx/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>macosx</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/macosx</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/macosx</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/macosx</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/macosx</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/macosx</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/macosx</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/mssql/pom.xml =================================================================== --- trunk/sql12/plugins/mssql/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/mssql/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>mssql</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/mssql</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/mssql</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/mssql</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/mssql</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/mssql</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/mssql</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/mysql/pom.xml =================================================================== --- trunk/sql12/plugins/mysql/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/mysql/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>mysql</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/mysql</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/mysql</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/mysql</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/mysql</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/mysql</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/mysql</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/netezza/pom.xml =================================================================== --- trunk/sql12/plugins/netezza/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/netezza/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>netezza</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/netezza</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/netezza</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/netezza</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/netezza</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/netezza</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/netezza</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/oracle/pom.xml =================================================================== --- trunk/sql12/plugins/oracle/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/oracle/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>oracle</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/oracle</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/oracle</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/oracle</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/oracle</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/oracle</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/oracle</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/pom.xml =================================================================== --- trunk/sql12/plugins/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -4,7 +4,7 @@ <parent> <groupId>net.sf.squirrel-sql</groupId> <artifactId>squirrel-root-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -47,9 +47,9 @@ <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/postgres/pom.xml =================================================================== --- trunk/sql12/plugins/postgres/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/postgres/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>postgres</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/postgres</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/postgres</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/postgres</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/postgres</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/postgres</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/postgres</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/refactoring/pom.xml =================================================================== --- trunk/sql12/plugins/refactoring/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/refactoring/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>refactoring</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/refactoring</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/refactoring</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/refactoring</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/refactoring</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/refactoring</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/refactoring</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/sessionscript/pom.xml =================================================================== --- trunk/sql12/plugins/sessionscript/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/sessionscript/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>sessionscript</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/sessionscript</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/sessionscript</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/sessionscript</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/sessionscript</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/sessionscript</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/sessionscript</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/smarttools/pom.xml =================================================================== --- trunk/sql12/plugins/smarttools/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/smarttools/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>smarttools</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/smarttools</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/smarttools</developerConnection> - <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.2.0/plugins/smarttools</url> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/smarttools</connection> + <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/smarttools</developerConnection> + <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/smarttools</url> </scm> <issueManagement> <system>SourceForge Tracker</system> Modified: trunk/sql12/plugins/sqlbookmark/pom.xml =================================================================== --- trunk/sql12/plugins/sqlbookmark/pom.xml 2010-11-21 20:22:00 UTC (rev 5983) +++ trunk/sql12/plugins/sqlbookmark/pom.xml 2010-11-21 20:24:14 UTC (rev 5984) @@ -3,7 +3,7 @@ <parent> <groupId>net.sf.squirrel-sql.plugins</groupId> <artifactId>squirrelsql-plugins-parent-pom</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath> </parent> <artifactId>sqlbookmark</artifactId> @@ -36,9 +36,9 @@ </licenses> <url>http://www.squirrelsql.org/</url> <scm> - <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.2.0/plugins/sqlbookmark</connection> - <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squi... [truncated message content] |
From: <ger...@us...> - 2010-12-21 20:19:46
|
Revision: 6041 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6041&view=rev Author: gerdwagner Date: 2010-12-21 20:19:38 +0000 (Tue, 21 Dec 2010) Log Message: ----------- Icons in Object tree for Oracle Modified Paths: -------------- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeNode.java trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.java trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/DatabaseObjectType.java trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.properties trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePlugin.java trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentExpander.java trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentInfo.java trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/DefaultDatabaseExpander.java trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/InstanceParentExpander.java trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/PackageParentExpander.java trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SchemaExpander.java trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SessionParentExpander.java trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TableExpander.java trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TriggerParentExpander.java trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TriggerParentInfo.java trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/oracle.properties Added Paths: ----------- trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/function.png trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/ObjectTypes.java trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePluginResources.java trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/constraint.gif trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/constraints.gif trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/consumergroup.png trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/consumergroups.png trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/datatype.png trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/datatypes.png trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/function.png trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/functions.png trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/indexes.gif trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/instance.png trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/instances.png trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/lob.gif trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/lobs.gif trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/package.gif trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/packages.gif trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/sequences.png trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/session.gif trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/sessions.gif trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/trigger.gif trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/triggers.gif trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/users.png Removed Paths: ------------- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/IObjectTypes.java trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OracleResources.java Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeNode.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeNode.java 2010-12-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeNode.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -25,7 +25,6 @@ import javax.swing.tree.MutableTreeNode; import net.sourceforge.squirrel_sql.fw.id.IIdentifier; -import net.sourceforge.squirrel_sql.fw.resources.LibraryResources; import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType; import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; @@ -58,8 +57,6 @@ /** Collection of <TT>INodeExpander</TT> objects for this node. */ private final List<INodeExpander> _expanders = new ArrayList<INodeExpander>(); - private ImageIcon _icon; - /** * Ctor that assumes node cannot have children. * @@ -86,12 +83,6 @@ _sessionId = session.getIdentifier(); _dboInfo = dboInfo; - if(null != _dboInfo.getDatabaseObjectType().getImageName()) - { - LibraryResources rsrc = new LibraryResources(); - - _icon = rsrc.getIcon(_dboInfo.getDatabaseObjectType().getImageName()); - } } public void add(MutableTreeNode newChild) @@ -194,8 +185,8 @@ return dbinfo.toString(); } - public ImageIcon getIcon() + public Icon getIcon() { - return _icon; + return _dboInfo.getDatabaseObjectType().getIcon(); } } Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.java =================================================================== --- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.java 2010-12-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -44,6 +44,7 @@ String DOT_SEQUENCES = "dot.sequences"; String DOT_TRIGGER = "dot.trigger"; String DOT_TRIGGERS = "dot.triggers"; + String DOT_FUNCTION = "dot.function"; Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/DatabaseObjectType.java =================================================================== --- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/DatabaseObjectType.java 2010-12-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/DatabaseObjectType.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -20,9 +20,12 @@ import net.sourceforge.squirrel_sql.fw.id.IHasIdentifier; import net.sourceforge.squirrel_sql.fw.id.IIdentifier; import net.sourceforge.squirrel_sql.fw.id.IntegerIdentifierFactory; +import net.sourceforge.squirrel_sql.fw.resources.LibraryResources; import net.sourceforge.squirrel_sql.fw.util.StringManager; import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; +import javax.swing.*; + import static net.sourceforge.squirrel_sql.fw.resources.LibraryResources.IImageNames.*; import java.io.Serializable; @@ -75,7 +78,7 @@ public final static DatabaseObjectType FOREIGN_KEY = createNewDatabaseObjectTypeI18n("DatabaseObjectType.foreignkey"); /** Function. */ - public final static DatabaseObjectType FUNCTION = createNewDatabaseObjectTypeI18n("DatabaseObjectType.function"); + public final static DatabaseObjectType FUNCTION = createNewDatabaseObjectTypeI18n("DatabaseObjectType.function", DOT_FUNCTION); /** * Database object type for a "Index Type" node in the object tree. There is @@ -172,15 +175,15 @@ /** Describes this object type. */ private final String _name; private String _keyForSerializationReplace; - private String _imageName; + private Icon _icon; /** * Default ctor. */ - private DatabaseObjectType(String name, String keyForSerializationReplace, String imageName) + private DatabaseObjectType(String name, String keyForSerializationReplace, Icon icon) { _keyForSerializationReplace = keyForSerializationReplace; - _imageName = imageName; + _icon = icon; _id = s_idFactory.createIdentifier(); _name = name != null ? name : _id.toString(); } @@ -211,9 +214,9 @@ return _keyForSerializationReplace; } - public String getImageName() + public Icon getIcon() { - return _imageName; + return _icon; } public String toString() @@ -221,19 +224,31 @@ return getName(); } - public static DatabaseObjectType createNewDatabaseObjectTypeI18n(String key, String imageName) + private static DatabaseObjectType createNewDatabaseObjectTypeI18n(String key, String imageName) { - return new DatabaseObjectType(key, s_stringMgr.getString(key), imageName); + ImageIcon icon = null; + + if (null != imageName) + { + icon = new LibraryResources().getIcon(imageName); + } + + return createNewDatabaseObjectType(s_stringMgr.getString(key), icon); } - public static DatabaseObjectType createNewDatabaseObjectTypeI18n(String key) + private static DatabaseObjectType createNewDatabaseObjectTypeI18n(String key) { return createNewDatabaseObjectTypeI18n(key, null); } public static DatabaseObjectType createNewDatabaseObjectType(String key) { - return new DatabaseObjectType(key, key, null); + return createNewDatabaseObjectType(key, null); } + public static DatabaseObjectType createNewDatabaseObjectType(String key, Icon icon) + { + return new DatabaseObjectType(key, key, icon); + } + } Modified: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.properties =================================================================== --- trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.properties 2010-12-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.properties 2010-12-21 20:19:38 UTC (rev 6041) @@ -50,3 +50,4 @@ dot.sequences.image=dot/sequences.png dot.trigger.image=dot/trigger.gif dot.triggers.image=dot/triggers.gif +dot.function.image=dot/function.png Added: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/function.png =================================================================== (Binary files differ) Property changes on: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/function.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/IObjectTypes.java =================================================================== --- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/IObjectTypes.java 2010-12-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/IObjectTypes.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -1,48 +0,0 @@ -package net.sourceforge.squirrel_sql.plugins.oracle; -/* - * Copyright (C) 2002-2003 Colin Bell - * co...@us... - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType; -/** - * This class contains the different database object types for oracle. - * - * @author <A HREF="mailto:co...@us...">Colin Bell</A> - */ -public interface IObjectTypes -{ - DatabaseObjectType CONSUMER_GROUP_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Consumer Groups"); - DatabaseObjectType FUNCTION_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Functions"); - DatabaseObjectType INDEX_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Indexes"); - DatabaseObjectType INSTANCE_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Instances"); - DatabaseObjectType LOB_PARENT = DatabaseObjectType.createNewDatabaseObjectType("LOBS"); - DatabaseObjectType PACKAGE_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Packages"); - DatabaseObjectType SEQUENCE_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Sequences"); - DatabaseObjectType SESSION_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Sessions"); - DatabaseObjectType TRIGGER_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Triggers"); - DatabaseObjectType TYPE_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Types"); - DatabaseObjectType USER_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Users"); - DatabaseObjectType CONSTRAINT_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Constraints"); - - DatabaseObjectType CONSUMER_GROUP = DatabaseObjectType.createNewDatabaseObjectType("Consumer Group"); - DatabaseObjectType INSTANCE = DatabaseObjectType.createNewDatabaseObjectType("Instance"); - DatabaseObjectType LOB = DatabaseObjectType.createNewDatabaseObjectType("LOB"); - DatabaseObjectType PACKAGE = DatabaseObjectType.createNewDatabaseObjectType("Package"); - DatabaseObjectType SESSION = DatabaseObjectType.createNewDatabaseObjectType("Session"); - DatabaseObjectType TYPE = DatabaseObjectType.createNewDatabaseObjectType("Type"); - DatabaseObjectType CONSTRAINT = DatabaseObjectType.createNewDatabaseObjectType("Constraint"); -} Copied: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/ObjectTypes.java (from rev 6037, trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/IObjectTypes.java) =================================================================== --- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/ObjectTypes.java (rev 0) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/ObjectTypes.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -0,0 +1,168 @@ +package net.sourceforge.squirrel_sql.plugins.oracle; +/* + * Copyright (C) 2002-2003 Colin Bell + * co...@us... + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType; + +/** + * This class contains the different database object types for oracle. + * + * @author <A HREF="mailto:co...@us...">Colin Bell</A> + */ +public class ObjectTypes +{ + private DatabaseObjectType _consumerGroupParent; + private DatabaseObjectType _functionParent; + private DatabaseObjectType _indexParent; + private DatabaseObjectType _instanceParent; + private DatabaseObjectType _lobParent; + private DatabaseObjectType _packageParent; + private DatabaseObjectType _sequenceParent; + private DatabaseObjectType _sessionParent; + private DatabaseObjectType _triggerParent; + private DatabaseObjectType _typeParent; + private DatabaseObjectType _userParent; + private DatabaseObjectType _constraintParent; + + private DatabaseObjectType _consumerGroup; + private DatabaseObjectType _instance; + private DatabaseObjectType _lob; + private DatabaseObjectType _package; + private DatabaseObjectType _session; + private DatabaseObjectType _type; + private DatabaseObjectType _constraint; + + public ObjectTypes(OraclePluginResources resources) + { + _consumerGroupParent = DatabaseObjectType.createNewDatabaseObjectType("Consumer Groups", resources.getIcon(OraclePluginResources.IKeys.CONSUMERGROUPS_IMAGE)); + _functionParent = DatabaseObjectType.createNewDatabaseObjectType("Functions", resources.getIcon(OraclePluginResources.IKeys.FUNCTIONS_IMAGE)); + _indexParent = DatabaseObjectType.createNewDatabaseObjectType("Indexes", resources.getIcon(OraclePluginResources.IKeys.INDEXES_IMAGE)); + _instanceParent = DatabaseObjectType.createNewDatabaseObjectType("Instances", resources.getIcon(OraclePluginResources.IKeys.INSTANCES_IMAGE)); + _lobParent = DatabaseObjectType.createNewDatabaseObjectType("LOBS", resources.getIcon(OraclePluginResources.IKeys.LOBS_IMAGE)); + _packageParent = DatabaseObjectType.createNewDatabaseObjectType("Packages", resources.getIcon(OraclePluginResources.IKeys.PACKAGES_IMAGE)); + _sequenceParent = DatabaseObjectType.createNewDatabaseObjectType("Sequences", resources.getIcon(OraclePluginResources.IKeys.SQUENCES_IMAGE)); + _sessionParent = DatabaseObjectType.createNewDatabaseObjectType("Sessions", resources.getIcon(OraclePluginResources.IKeys.SESSIONS_IMAGE)); + _triggerParent = DatabaseObjectType.createNewDatabaseObjectType("Triggers", resources.getIcon(OraclePluginResources.IKeys.TRIGGERS_IMAGE)); + _typeParent = DatabaseObjectType.createNewDatabaseObjectType("Types", resources.getIcon(OraclePluginResources.IKeys.TYPES_IMAGE)); + _userParent = DatabaseObjectType.createNewDatabaseObjectType("Users", resources.getIcon(OraclePluginResources.IKeys.USERS_IMAGE)); + _constraintParent = DatabaseObjectType.createNewDatabaseObjectType("Constraints", resources.getIcon(OraclePluginResources.IKeys.CONSTRAINTS_IMAGE)); + + _consumerGroup = DatabaseObjectType.createNewDatabaseObjectType("Consumer Group", resources.getIcon(OraclePluginResources.IKeys.CONSUMERGROUP_IMAGE)); + _instance = DatabaseObjectType.createNewDatabaseObjectType("Instance", resources.getIcon(OraclePluginResources.IKeys.INSTANCE_IMAGE)); + _lob = DatabaseObjectType.createNewDatabaseObjectType("LOB", resources.getIcon(OraclePluginResources.IKeys.LOB_IMAGE)); + _package = DatabaseObjectType.createNewDatabaseObjectType("Package", resources.getIcon(OraclePluginResources.IKeys.PACKAGE_IMAGE)); + _session = DatabaseObjectType.createNewDatabaseObjectType("Session", resources.getIcon(OraclePluginResources.IKeys.SESSION_IMAGE)); + _type = DatabaseObjectType.createNewDatabaseObjectType("Type", resources.getIcon(OraclePluginResources.IKeys.TYPE_IMAGE)); + _constraint = DatabaseObjectType.createNewDatabaseObjectType("Constraint", resources.getIcon(OraclePluginResources.IKeys.CONSTRAINT_IMAGE)); + } + + public DatabaseObjectType getConsumerGroupParent() + { + return _consumerGroupParent; + } + + public DatabaseObjectType getFunctionParent() + { + return _functionParent; + } + + public DatabaseObjectType getIndexParent() + { + return _indexParent; + } + + public DatabaseObjectType getInstanceParent() + { + return _instanceParent; + } + + public DatabaseObjectType getLobParent() + { + return _lobParent; + } + + public DatabaseObjectType getPackageParent() + { + return _packageParent; + } + + public DatabaseObjectType getSequenceParent() + { + return _sequenceParent; + } + + public DatabaseObjectType getSessionParent() + { + return _sessionParent; + } + + public DatabaseObjectType getTriggerParent() + { + return _triggerParent; + } + + public DatabaseObjectType getTypeParent() + { + return _typeParent; + } + + public DatabaseObjectType getUserParent() + { + return _userParent; + } + + public DatabaseObjectType getConstraintParent() + { + return _constraintParent; + } + + public DatabaseObjectType getConsumerGroup() + { + return _consumerGroup; + } + + public DatabaseObjectType getInstance() + { + return _instance; + } + + public DatabaseObjectType getLob() + { + return _lob; + } + + public DatabaseObjectType getPackage() + { + return _package; + } + + public DatabaseObjectType getSession() + { + return _session; + } + + public DatabaseObjectType getType() + { + return _type; + } + + public DatabaseObjectType getConstraint() + { + return _constraint; + } +} Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePlugin.java =================================================================== --- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePlugin.java 2010-12-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePlugin.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -45,7 +45,6 @@ import net.sourceforge.squirrel_sql.client.plugin.DefaultSessionPlugin; import net.sourceforge.squirrel_sql.client.plugin.PluginException; import net.sourceforge.squirrel_sql.client.plugin.PluginQueryTokenizerPreferencesManager; -import net.sourceforge.squirrel_sql.client.plugin.PluginResources; import net.sourceforge.squirrel_sql.client.plugin.PluginSessionCallback; import net.sourceforge.squirrel_sql.client.plugin.gui.PluginGlobalPreferencesTab; import net.sourceforge.squirrel_sql.client.plugin.gui.PluginQueryTokenizerPreferencesPanel; @@ -132,7 +131,7 @@ */ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(OraclePlugin.class); - private PluginResources _resources; + private OraclePluginResources _resources; /** * A list of Oracle sessions that are open so we'll know when none are left @@ -157,8 +156,9 @@ private PluginQueryTokenizerPreferencesManager _prefsManager = null; public static final String BUNDLE_BASE_NAME = "net.sourceforge.squirrel_sql.plugins.oracle.oracle"; + private ObjectTypes _objectTypes; - interface i18n + interface i18n { // i18n[OraclePlugin.title=Oracle] String title = s_stringMgr.getString("OraclePlugin.title"); @@ -274,9 +274,10 @@ final IApplication app = getApplication(); - _resources = new OracleResources(OraclePlugin.BUNDLE_BASE_NAME, this); + _resources = new OraclePluginResources(OraclePlugin.BUNDLE_BASE_NAME, this); + _objectTypes = new ObjectTypes(_resources); - ActionCollection coll = app.getActionCollection(); + ActionCollection coll = app.getActionCollection(); coll.add(new NewDBOutputWorksheetAction(app, _resources)); coll.add(new NewInvalidObjectsWorksheetAction(app, _resources)); coll.add(new NewSessionInfoWorksheetAction(app, _resources)); @@ -303,7 +304,8 @@ _oracleAliasPrefsByAliasIdentifier.put(buf.getAliasIdentifier(), buf); } - } else + } + else { _oracleAliasPrefsByAliasIdentifier = new Hashtable<IIdentifier, OracleAliasPrefs>(); } @@ -313,7 +315,8 @@ /* Register custom DataTypeComponent factory for Oracles XMLType */ CellComponentFactory.registerDataTypeFactory( new OracleXmlTypeDataTypeComponentFactory(), 2007, "SYS.XMLTYPE"); - } catch (Exception e) + } + catch (Exception e) { throw new RuntimeException(e); } @@ -584,7 +587,7 @@ } if (type == DatabaseObjectType.DATABASE_TYPE_DBO && isOracle) { - return new DefaultDatabaseExpander(session); + return new DefaultDatabaseExpander(session, _objectTypes); } if (type == DatabaseObjectType.TABLE_TYPE_DBO && isOracleWithFlashBack) { @@ -783,52 +786,52 @@ { ISession session = objTree.getSession(); addDetailTab(objTree, DatabaseObjectType.SESSION, new OptionsTab()); - addDetailTab(objTree, IObjectTypes.CONSUMER_GROUP, new DatabaseObjectInfoTab()); + addDetailTab(objTree, _objectTypes.getConsumerGroup(), new DatabaseObjectInfoTab()); addDetailTab(objTree, DatabaseObjectType.FUNCTION, new DatabaseObjectInfoTab()); addDetailTab(objTree, DatabaseObjectType.INDEX, new DatabaseObjectInfoTab()); addDetailTab(objTree, DatabaseObjectType.INDEX, new IndexColumnInfoTab()); addDetailTab(objTree, DatabaseObjectType.INDEX, new IndexDetailsTab()); - addDetailTab(objTree, IObjectTypes.LOB, new DatabaseObjectInfoTab()); - addDetailTab(objTree, IObjectTypes.LOB, new LobDetailsTab()); + addDetailTab(objTree, _objectTypes.getLob(), new DatabaseObjectInfoTab()); + addDetailTab(objTree, _objectTypes.getLob(), new LobDetailsTab()); addDetailTab(objTree, DatabaseObjectType.SEQUENCE, new DatabaseObjectInfoTab()); addDetailTab(objTree, DatabaseObjectType.TRIGGER, new DatabaseObjectInfoTab()); - addDetailTab(objTree, IObjectTypes.TRIGGER_PARENT, new DatabaseObjectInfoTab()); - addDetailTab(objTree, IObjectTypes.TYPE, new DatabaseObjectInfoTab()); - addDetailTab(objTree, IObjectTypes.CONSTRAINT, new DatabaseObjectInfoTab()); + addDetailTab(objTree, _objectTypes.getTriggerParent(), new DatabaseObjectInfoTab()); + addDetailTab(objTree, _objectTypes.getType(), new DatabaseObjectInfoTab()); + addDetailTab(objTree, _objectTypes.getConstraint(), new DatabaseObjectInfoTab()); // Expanders. - addExpander(objTree, DatabaseObjectType.SCHEMA, new SchemaExpander()); - addExpander(objTree, DatabaseObjectType.TABLE, new TableExpander()); - addExpander(objTree, IObjectTypes.PACKAGE, new PackageExpander()); - addExpander(objTree, IObjectTypes.USER_PARENT, new UserParentExpander(session)); - addExpander(objTree, IObjectTypes.SESSION_PARENT, new SessionParentExpander()); - addExpander(objTree, IObjectTypes.INSTANCE_PARENT, new InstanceParentExpander()); - addExpander(objTree, IObjectTypes.TRIGGER_PARENT, new TriggerParentExpander()); - addExpander(objTree, IObjectTypes.CONSTRAINT_PARENT, new ConstraintParentExpander()); + addExpander(objTree, DatabaseObjectType.SCHEMA, new SchemaExpander(_objectTypes)); + addExpander(objTree, DatabaseObjectType.TABLE, new TableExpander(_objectTypes)); + addExpander(objTree, _objectTypes.getPackage(), new PackageExpander()); + addExpander(objTree, _objectTypes.getUserParent(), new UserParentExpander(session)); + addExpander(objTree, _objectTypes.getSessionParent(), new SessionParentExpander(_objectTypes)); + addExpander(objTree, _objectTypes.getInstanceParent(), new InstanceParentExpander(_objectTypes)); + addExpander(objTree, _objectTypes.getTriggerParent(), new TriggerParentExpander()); + addExpander(objTree, _objectTypes.getConstraintParent(), new ConstraintParentExpander(_objectTypes)); addDetailTab(objTree, DatabaseObjectType.PROCEDURE, new ObjectSourceTab( "PROCEDURE", "Show stored procedure source")); addDetailTab(objTree, DatabaseObjectType.FUNCTION, new ObjectSourceTab( "FUNCTION", "Show function source")); - addDetailTab(objTree, IObjectTypes.PACKAGE, new ObjectSourceTab( + addDetailTab(objTree, _objectTypes.getPackage(), new ObjectSourceTab( "PACKAGE", "Specification", "Show package specification")); - addDetailTab(objTree, IObjectTypes.PACKAGE, new ObjectSourceTab( + addDetailTab(objTree, _objectTypes.getPackage(), new ObjectSourceTab( "PACKAGE BODY", "Body", "Show package body")); - addDetailTab(objTree, IObjectTypes.TYPE, new ObjectSourceTab( + addDetailTab(objTree, _objectTypes.getType(), new ObjectSourceTab( "TYPE", "Specification", "Show type specification")); - addDetailTab(objTree, IObjectTypes.TYPE, new ObjectSourceTab("TYPE BODY", "Body", "Show type body")); - addDetailTab(objTree, IObjectTypes.INSTANCE, new InstanceDetailsTab()); + addDetailTab(objTree, _objectTypes.getType(), new ObjectSourceTab("TYPE BODY", "Body", "Show type body")); + addDetailTab(objTree, _objectTypes.getInstance(), new InstanceDetailsTab()); addDetailTab(objTree, DatabaseObjectType.SEQUENCE, new SequenceDetailsTab()); - addDetailTab(objTree, IObjectTypes.SESSION, new SessionDetailsTab()); - addDetailTab(objTree, IObjectTypes.SESSION, new SessionStatisticsTab()); + addDetailTab(objTree, _objectTypes.getSession(), new SessionDetailsTab()); + addDetailTab(objTree, _objectTypes.getSession(), new SessionStatisticsTab()); addDetailTab(objTree, DatabaseObjectType.TRIGGER, new TriggerDetailsTab()); addDetailTab(objTree, DatabaseObjectType.TRIGGER, new TriggerSourceTab()); addDetailTab(objTree, DatabaseObjectType.TRIGGER, new TriggerColumnInfoTab()); addDetailTab(objTree, DatabaseObjectType.USER, new UserDetailsTab(session)); - addDetailTab(objTree, IObjectTypes.CONSTRAINT, new ConstraintDetailsTab()); - addDetailTab(objTree, IObjectTypes.CONSTRAINT, new ConstraintColumnInfoTab()); - addDetailTab(objTree, IObjectTypes.CONSTRAINT, new ConstraintSourceTab()); + addDetailTab(objTree, _objectTypes.getConstraint(), new ConstraintDetailsTab()); + addDetailTab(objTree, _objectTypes.getConstraint(), new ConstraintColumnInfoTab()); + addDetailTab(objTree, _objectTypes.getConstraint(), new ConstraintSourceTab()); addDetailTab(objTree, DatabaseObjectType.VIEW, new ViewSourceTab()); addDetailTab(objTree, DatabaseObjectType.TABLE, new SnapshotSourceTab()); Copied: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePluginResources.java (from rev 6037, trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OracleResources.java) =================================================================== --- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePluginResources.java (rev 0) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePluginResources.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -0,0 +1,55 @@ +package net.sourceforge.squirrel_sql.plugins.oracle; +/* + * Copyright (C) 2004 Jason Height + * jmh...@us... + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +import net.sourceforge.squirrel_sql.client.plugin.IPlugin; +import net.sourceforge.squirrel_sql.client.plugin.PluginResources; + +public final class OraclePluginResources extends PluginResources +{ + OraclePluginResources(String rsrcBundleBaseName, IPlugin plugin) + { + super(rsrcBundleBaseName, plugin); + } + + public interface IKeys + { + String USERS_IMAGE = "users"; + String FUNCTION_IMAGE = "function"; + String FUNCTIONS_IMAGE = "functions"; + String PACKAGE_IMAGE = "package"; + String PACKAGES_IMAGE = "packages"; + String SESSION_IMAGE = "session"; + String SESSIONS_IMAGE = "sessions"; + + String INSTANCE_IMAGE = "instance"; + String INSTANCES_IMAGE = "instances"; + + String TYPE_IMAGE = "datatype"; + String TYPES_IMAGE = "datatypes"; + String CONSUMERGROUPS_IMAGE = "consumergroups"; + String INDEXES_IMAGE = "indexes"; + String LOBS_IMAGE = "lobs"; + String SQUENCES_IMAGE = "sequences"; + String TRIGGERS_IMAGE = "triggers"; + String CONSTRAINTS_IMAGE = "constraints"; + String CONSUMERGROUP_IMAGE = "consumergroup"; + String LOB_IMAGE = "lob"; + String CONSTRAINT_IMAGE = "constraint"; + } +} Property changes on: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePluginResources.java ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OracleResources.java =================================================================== --- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OracleResources.java 2010-12-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OracleResources.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -1,29 +0,0 @@ -package net.sourceforge.squirrel_sql.plugins.oracle; -/* - * Copyright (C) 2004 Jason Height - * jmh...@us... - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -import net.sourceforge.squirrel_sql.client.plugin.IPlugin; -import net.sourceforge.squirrel_sql.client.plugin.PluginResources; - -public final class OracleResources extends PluginResources -{ - OracleResources(String rsrcBundleBaseName, IPlugin plugin) - { - super(rsrcBundleBaseName, plugin); - } -} Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentExpander.java =================================================================== --- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentExpander.java 2010-12-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentExpander.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -30,7 +30,7 @@ import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection; import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData; -import net.sourceforge.squirrel_sql.plugins.oracle.IObjectTypes; +import net.sourceforge.squirrel_sql.plugins.oracle.ObjectTypes; /** * This class handles the expanding of the Constraint node. It will @@ -45,10 +45,12 @@ + " where owner = ?" + " and table_name = ?" + " order by constraint_name asc"; - - public ConstraintParentExpander() { + private ObjectTypes _objectTypes; + + public ConstraintParentExpander(ObjectTypes objectTypes) { super(); - } + _objectTypes = objectTypes; + } public List<ObjectTreeNode> createChildren(ISession session, ObjectTreeNode parentNode) throws SQLException { @@ -70,7 +72,7 @@ DatabaseObjectInfo doi = new DatabaseObjectInfo(null, schemaName, rs.getString(1), - IObjectTypes.CONSTRAINT, + _objectTypes.getConstraint(), md); childNodes.add(new ObjectTreeNode(session, doi)); } Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentInfo.java =================================================================== --- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentInfo.java 2010-12-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentInfo.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -25,7 +25,7 @@ import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectInfo; import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData; -import net.sourceforge.squirrel_sql.plugins.oracle.IObjectTypes; +import net.sourceforge.squirrel_sql.plugins.oracle.ObjectTypes; public class ConstraintParentInfo extends DatabaseObjectInfo { @@ -34,9 +34,9 @@ private final IDatabaseObjectInfo _tableInfo; public ConstraintParentInfo(IDatabaseObjectInfo tableInfo, String schema, - SQLDatabaseMetaData md) + SQLDatabaseMetaData md, ObjectTypes objectTypes) { - super(null, schema, "CONSTRAINT", IObjectTypes.CONSTRAINT_PARENT, md); + super(null, schema, "CONSTRAINT", objectTypes.getConstraintParent(), md); _tableInfo = tableInfo; } Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/DefaultDatabaseExpander.java =================================================================== --- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/DefaultDatabaseExpander.java 2010-12-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/DefaultDatabaseExpander.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -26,7 +26,7 @@ import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.expanders.DatabaseExpander; import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectInfo; import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData; -import net.sourceforge.squirrel_sql.plugins.oracle.IObjectTypes; +import net.sourceforge.squirrel_sql.plugins.oracle.ObjectTypes; import net.sourceforge.squirrel_sql.plugins.oracle.tab.InstanceDetailsTab; import net.sourceforge.squirrel_sql.plugins.oracle.tab.SessionDetailsTab; @@ -40,9 +40,12 @@ { - public DefaultDatabaseExpander(ISession session) + private ObjectTypes _objectTypes; + + public DefaultDatabaseExpander(ISession session, ObjectTypes objectTypes) { super(session); + _objectTypes = objectTypes; } public List<ObjectTreeNode> createChildren(ISession session, ObjectTreeNode parentNode) @@ -55,7 +58,7 @@ // Users. DatabaseObjectInfo dboInfo = new DatabaseObjectInfo(null, null, "USERS", - IObjectTypes.USER_PARENT, md); + _objectTypes.getUserParent(), md); ObjectTreeNode node = new ObjectTreeNode(session, dboInfo); childNodes.add(node); @@ -63,7 +66,7 @@ { // Instances. dboInfo = new DatabaseObjectInfo(null, null, "INSTANCES", - IObjectTypes.INSTANCE_PARENT, md); + _objectTypes.getInstanceParent(), md); node = new ObjectTreeNode(session, dboInfo); childNodes.add(node); } @@ -72,7 +75,7 @@ { // Sessions. dboInfo = new DatabaseObjectInfo(null, null, "SESSIONS", - IObjectTypes.SESSION_PARENT, md); + _objectTypes.getSessionParent(), md); node = new ObjectTreeNode(session, dboInfo); childNodes.add(node); } Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/InstanceParentExpander.java =================================================================== --- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/InstanceParentExpander.java 2010-12-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/InstanceParentExpander.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -34,7 +34,7 @@ import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.INodeExpander; import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.ObjectTreeNode; -import net.sourceforge.squirrel_sql.plugins.oracle.IObjectTypes; +import net.sourceforge.squirrel_sql.plugins.oracle.ObjectTypes; /** * This class handles the expanding of the "Instance Parent" node. It will give a list of all the instances. @@ -47,13 +47,16 @@ private static String SQL = "select instance_number, instance_name, host_name, version," + " startup_time, status, parallel, thread#, archiver, log_switch_wait," + " logins, shutdown_pending, database_status, instance_role" + " from sys.v_$instance"; + private ObjectTypes _objectTypes; - /** + /** * Default ctor. - */ - public InstanceParentExpander() { + * @param objectTypes + */ + public InstanceParentExpander(ObjectTypes objectTypes) { super(); - } + _objectTypes = objectTypes; + } /** * Create the child nodes for the passed parent node and return them. Note that this method should @@ -82,7 +85,7 @@ while (rs.next()) { IDatabaseObjectInfo doi = new DatabaseObjectInfo( - null, null, rs.getString(1), IObjectTypes.INSTANCE, md); + null, null, rs.getString(1), _objectTypes.getInstance(), md); // final Map map = new HashMap(); // map.put("Instance Number", new Integer(rs.getInt(1))); // map.put("Name", rs.getString(2)); Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/PackageParentExpander.java =================================================================== --- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/PackageParentExpander.java 2010-12-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/PackageParentExpander.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -29,7 +29,7 @@ import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.INodeExpander; import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.ObjectTreeNode; -import net.sourceforge.squirrel_sql.plugins.oracle.IObjectTypes; +import net.sourceforge.squirrel_sql.plugins.oracle.ObjectTypes; /** * This class handles the expanding of the "Package Type" or "Package Heading" * node. It will give a list of all the packages available in the schema. @@ -38,16 +38,20 @@ */ public class PackageParentExpander implements INodeExpander { - /** + private ObjectTypes _objectTypes; + + /** * Default ctor. * * @throws IllegalArgumentException * Thrown if <TT>null</TT> <TT>OraclePlugin</TT> passed. + * @param objectTypes */ - PackageParentExpander() + PackageParentExpander(ObjectTypes objectTypes) { super(); - } + _objectTypes = objectTypes; + } /** * Create the child nodes for the passed parent node and return them. Note @@ -70,14 +74,14 @@ // Add package node to contain standalone procedures. IDatabaseObjectInfo dbinfo = new DatabaseObjectInfo(null, schemaName, - "", IObjectTypes.PACKAGE, md); + "", _objectTypes.getPackage(), md); ObjectTreeNode child = new ObjectTreeNode(session, dbinfo); child.setUserObject("Standalone"); childNodes.add(child); // Add packages. - ObjectType objType = new ObjectType(IObjectTypes.PACKAGE, "PACKAGE", - IObjectTypes.PACKAGE); + ObjectType objType = new ObjectType(_objectTypes.getPackage(), "PACKAGE", + _objectTypes.getPackage()); INodeExpander exp = new ObjectTypeExpander(objType); childNodes.addAll(exp.createChildren(session, parentNode)); Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SchemaExpander.java =================================================================== --- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SchemaExpander.java 2010-12-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SchemaExpander.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -27,7 +27,8 @@ import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType; import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData; -import net.sourceforge.squirrel_sql.plugins.oracle.IObjectTypes; +import net.sourceforge.squirrel_sql.plugins.oracle.ObjectTypes; + /** * This class is an expander for the schema nodes. It will add various Object Type * nodes to the schema node. @@ -37,13 +38,17 @@ public class SchemaExpander implements INodeExpander { - /** + private ObjectTypes _objectTypes; + + /** * Ctor. - */ - public SchemaExpander() + * @param objectTypes + */ + public SchemaExpander(ObjectTypes objectTypes) { super(); - } + _objectTypes = objectTypes; + } /** * Create the child nodes for the passed parent node and return them. Note @@ -66,38 +71,38 @@ IDatabaseObjectInfo dbinfo = new DatabaseObjectInfo(catalogName, schemaName, "PACKAGE", - IObjectTypes.PACKAGE_PARENT, md); + _objectTypes.getPackageParent(), md); ObjectTreeNode child = new ObjectTreeNode(session, dbinfo); - child.addExpander(new PackageParentExpander()); + child.addExpander(new PackageParentExpander(_objectTypes)); childNodes.add(child); ObjectType objType; - objType = new ObjectType(IObjectTypes.CONSUMER_GROUP_PARENT, "CONSUMER GROUP", - IObjectTypes.CONSUMER_GROUP); + objType = new ObjectType(_objectTypes.getConsumerGroupParent(), "CONSUMER GROUP", + _objectTypes.getConsumerGroup()); childNodes.add(createObjectTypeNode(session, catalogName, schemaName, md, objType)); - objType = new ObjectType(IObjectTypes.FUNCTION_PARENT, "FUNCTION", + objType = new ObjectType(_objectTypes.getFunctionParent(), "FUNCTION", DatabaseObjectType.FUNCTION); childNodes.add(createObjectTypeNode(session, catalogName, schemaName, md, objType)); - objType = new ObjectType(IObjectTypes.INDEX_PARENT, "INDEX", DatabaseObjectType.INDEX); + objType = new ObjectType(_objectTypes.getIndexParent(), "INDEX", DatabaseObjectType.INDEX); childNodes.add(createObjectTypeNode(session, catalogName, schemaName, md, objType)); - objType = new ObjectType(IObjectTypes.LOB_PARENT, "LOB", IObjectTypes.LOB); + objType = new ObjectType(_objectTypes.getLobParent(), "LOB", _objectTypes.getLob()); childNodes.add(createObjectTypeNode(session, catalogName, schemaName, md, objType)); IDatabaseObjectInfo seqInfo = new DatabaseObjectInfo(catalogName, schemaName, "SEQUENCE", - IObjectTypes.SEQUENCE_PARENT, md); + _objectTypes.getSequenceParent(), md); ObjectTreeNode node = new ObjectTreeNode(session, seqInfo); node.addExpander(new SequenceParentExpander()); childNodes.add(node); - objType = new ObjectType(IObjectTypes.TYPE_PARENT, "TYPE", IObjectTypes.TYPE); + objType = new ObjectType(_objectTypes.getTypeParent(), "TYPE", _objectTypes.getType()); childNodes.add(createObjectTypeNode(session, catalogName, schemaName, md, objType)); Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SessionParentExpander.java =================================================================== --- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SessionParentExpander.java 2010-12-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SessionParentExpander.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -32,7 +32,7 @@ import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection; import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData; import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities; -import net.sourceforge.squirrel_sql.plugins.oracle.IObjectTypes; +import net.sourceforge.squirrel_sql.plugins.oracle.ObjectTypes; /** * This class handles the expanding of the "Session Parent" node. It will give a list of all the sessions. @@ -44,14 +44,17 @@ /** SQL that retrieves the data. */ private static String SQL = "select sid||' ('||schemaname||')' from sys.v_$session"; + private ObjectTypes _objectTypes; - /** + /** * Default ctor. - */ - public SessionParentExpander() + * @param objectTypes + */ + public SessionParentExpander(ObjectTypes objectTypes) { super(); - } + _objectTypes = objectTypes; + } /** * Create the child nodes for the passed parent node and return them. Note that this method should @@ -86,7 +89,7 @@ // must not use DatabaseObjectType.SESSION, or else these nodes get expanded with the database // DefaultdatabasExpander. IDatabaseObjectInfo doi = - new DatabaseObjectInfo(null, schemaName, rs.getString(1), IObjectTypes.SESSION, md); + new DatabaseObjectInfo(null, schemaName, rs.getString(1), _objectTypes.getSession(), md); childNodes.add(new ObjectTreeNode(session, doi)); } } Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TableExpander.java =================================================================== --- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TableExpander.java 2010-12-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TableExpander.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -25,6 +25,8 @@ import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.ObjectTreeNode; import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData; +import net.sourceforge.squirrel_sql.plugins.oracle.ObjectTypes; + /** * This class is an expander for the table nodes. It will add various Object Type * nodes to the table node. @@ -33,13 +35,17 @@ */ public class TableExpander implements INodeExpander { - /** + private ObjectTypes _objectTypes; + + /** * Default ctor. - */ - public TableExpander() + * @param objectTypes + */ + public TableExpander(ObjectTypes objectTypes) { super(); - } + _objectTypes = objectTypes; + } /** * Create the child nodes for the passed parent node and return them. Note @@ -60,13 +66,13 @@ final String schemaName = parentDbinfo.getSchemaName(); IDatabaseObjectInfo dbinfo = new TriggerParentInfo(parentDbinfo, - schemaName, md); + schemaName, md, _objectTypes); ObjectTreeNode child = new ObjectTreeNode(session, dbinfo); childNodes.add(child); IDatabaseObjectInfo cstrinfo = new ConstraintParentInfo(parentDbinfo, - schemaName, md); + schemaName, md, _objectTypes); child = new ObjectTreeNode(session, cstrinfo); childNodes.add(child); Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TriggerParentExpander.java =================================================================== --- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TriggerParentExpander.java 2010-12-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TriggerParentExpander.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -31,6 +31,7 @@ import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection; import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData; + /** * This class handles the expanding of the "Trigger Parent" * node. It will give a list of all the triggers available for the table. @@ -43,13 +44,13 @@ "select owner, trigger_name from sys.all_triggers where table_owner = ?" + " and table_name = ?"; - /** + /** * Default ctor. - */ + */ public TriggerParentExpander() { super(); - } + } /** * Create the child nodes for the passed parent node and return them. Note Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TriggerParentInfo.java =================================================================== --- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TriggerParentInfo.java 2010-12-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TriggerParentInfo.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -21,7 +21,7 @@ import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData; -import net.sourceforge.squirrel_sql.plugins.oracle.IObjectTypes; +import net.sourceforge.squirrel_sql.plugins.oracle.ObjectTypes; /** * This class stores information about an Oracle Trigger parent. This just * stores info about the table that the trigger relates to. @@ -33,9 +33,9 @@ private final IDatabaseObjectInfo _tableInfo; public TriggerParentInfo(IDatabaseObjectInfo tableInfo, String schema, - SQLDatabaseMetaData md) + SQLDatabaseMetaData md, ObjectTypes objectTypes) { - super(null, schema, "TRIGGER", IObjectTypes.TRIGGER_PARENT, md); + super(null, schema, "TRIGGER", objectTypes.getTriggerParent(), md); _tableInfo = tableInfo; } Added: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/constraint.gif =================================================================== (Binary files differ) Property changes on: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/constraint.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/constraints.gif =================================================================== (Binary files differ) Property changes on: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/constraints.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/consumergroup.png =================================================================== (Binary files differ) Property changes on: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/consumergroup.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/consumergroups.png =================================================================== (Binary files differ) Property changes on: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/consumergroups.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/datatype.png (from rev 6037, trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/datatype.png) =================================================================== (Binary files differ) Copied: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/datatypes.png (from rev 6037, trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/datatypes.png) =================================================================== (Binary files differ) Added: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/function.png =================================================================== (Binary files differ) Property changes on: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/function.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/functions.png =================================================================== (Binary files differ) Property changes on: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/functions.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/indexes.gif (from rev 6037, trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/indexes.gif) =================================================================== (Binary files differ) Added: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/instance.png =================================================================== (Binary files differ) Property changes on: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/instance.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/instances.png =================================================================== (Binary files differ) Property changes on: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/instances.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/lob.gif =================================================================== (Binary files differ) Property changes on: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/lob.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added... [truncated message content] |
From: <man...@us...> - 2010-12-26 22:01:21
|
Revision: 6060 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6060&view=rev Author: manningr Date: 2010-12-26 22:01:14 +0000 (Sun, 26 Dec 2010) Log Message: ----------- Replaced the use of EasyMock with Mockito for session plugin testing as it takes less code in a test to say the same thing. Also, Mockito is more forgiving when it comes to missed expectations, so tests are a little less fragile in the face of code changes. This is done in preparation for releasing the SQuirreL plugin maven archetype. Modified Paths: -------------- trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/plugin/AbstractPluginTest.java trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/plugin/AbstractSessionPluginTest.java trunk/sql12/plugins/db2/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/DB2PluginTest.java trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPlugin.java trunk/sql12/plugins/derby/src/test/java/net/sourceforge/squirrel_sql/plugins/derby/DerbyPluginTest.java trunk/sql12/plugins/example/src/main/java/net/sourceforge/squirrel_sql/plugins/example/ExamplePlugin.java trunk/sql12/plugins/example/src/main/java/net/sourceforge/squirrel_sql/plugins/example/ExampleSqlExecutionListener.java trunk/sql12/plugins/firebird/src/test/java/net/sourceforge/squirrel_sql/plugins/firebird/FirebirdPluginTest.java trunk/sql12/plugins/h2/src/test/java/net/sourceforge/squirrel_sql/plugins/h2/H2PluginTest.java trunk/sql12/plugins/informix/src/test/java/net/sourceforge/squirrel_sql/plugins/informix/InformixPluginTest.java trunk/sql12/plugins/mssql/src/test/java/net/sourceforge/squirrel_sql/plugins/mssql/MssqlPluginTest.java trunk/sql12/plugins/mysql/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/MysqlPluginTest.java trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePluginTest.java trunk/sql12/plugins/postgres/src/test/java/net/sourceforge/squirrel_sql/plugins/postgres/PostgresPluginTest.java trunk/sql12/plugins/sqlparam/src/test/java/net/sourceforge/squirrel_sql/plugins/sqlparam/SQLParamPluginTest.java Added Paths: ----------- trunk/sql12/plugins/example/src/test/ trunk/sql12/plugins/example/src/test/java/ trunk/sql12/plugins/example/src/test/java/net/ trunk/sql12/plugins/example/src/test/java/net/sourceforge/ trunk/sql12/plugins/example/src/test/java/net/sourceforge/squirrel_sql/ trunk/sql12/plugins/example/src/test/java/net/sourceforge/squirrel_sql/plugins/ trunk/sql12/plugins/example/src/test/java/net/sourceforge/squirrel_sql/plugins/example/ trunk/sql12/plugins/example/src/test/java/net/sourceforge/squirrel_sql/plugins/example/ExamplePluginTest.java trunk/sql12/plugins/example/src/test/java/net/sourceforge/squirrel_sql/plugins/example/ExampleSqlExecutionListenerTest.java Modified: trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/plugin/AbstractPluginTest.java =================================================================== --- trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/plugin/AbstractPluginTest.java 2010-12-26 21:56:42 UTC (rev 6059) +++ trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/plugin/AbstractPluginTest.java 2010-12-26 22:01:14 UTC (rev 6060) @@ -18,29 +18,20 @@ */ package net.sourceforge.squirrel_sql.client.plugin; -import static org.easymock.EasyMock.expect; import static org.junit.Assert.assertNotNull; -import org.easymock.EasyMock; -import org.junit.Assert; import org.junit.Test; +import org.junit.runner.RunWith; -import utils.EasyMockHelper; -import net.sourceforge.squirrel_sql.BaseSQuirreLJUnit4TestCase; -import net.sourceforge.squirrel_sql.client.plugin.DefaultSessionPlugin; -import net.sourceforge.squirrel_sql.client.plugin.IPlugin; -import net.sourceforge.squirrel_sql.client.session.ISession; -import net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData; - /** * This class provides common tests for plugins. Each plugin test should simply extend this class to * pickup the common tests. * */ -public abstract class AbstractPluginTest extends BaseSQuirreLJUnit4TestCase +@RunWith(org.mockito.runners.MockitoJUnitRunner.class) +public abstract class AbstractPluginTest { protected IPlugin classUnderTest = null; - protected EasyMockHelper mockHelper = new EasyMockHelper(); @Test Modified: trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/plugin/AbstractSessionPluginTest.java =================================================================== --- trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/plugin/AbstractSessionPluginTest.java 2010-12-26 21:56:42 UTC (rev 6059) +++ trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/plugin/AbstractSessionPluginTest.java 2010-12-26 22:01:14 UTC (rev 6060) @@ -18,43 +18,88 @@ */ package net.sourceforge.squirrel_sql.client.plugin; -import static org.easymock.EasyMock.expect; +import static org.mockito.Mockito.when; +import net.sourceforge.squirrel_sql.client.IApplication; +import net.sourceforge.squirrel_sql.client.gui.session.SessionInternalFrame; +import net.sourceforge.squirrel_sql.client.gui.session.SessionPanel; +import net.sourceforge.squirrel_sql.client.preferences.SquirrelPreferences; +import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI; +import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI; import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData; +import net.sourceforge.squirrel_sql.fw.util.IMessageHandler; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; +import org.mockito.Mock; -public abstract class AbstractSessionPluginTest extends AbstractPluginTest implements DatabaseProductVersionData +public abstract class AbstractSessionPluginTest extends AbstractPluginTest implements + DatabaseProductVersionData { + @Mock + protected ISession mockSession; + + @Mock + protected ISQLDatabaseMetaData mockSQLDatabaseMetaData; + + @Mock + protected IApplication mockApplication; + + @Mock + protected IMessageHandler mockMessageHandler; + @Mock + protected SessionInternalFrame mockSessionInternalFrame; + + @Mock + protected SquirrelPreferences mockSquirrelPreferences; + + @Mock + protected IObjectTreeAPI mockObjectTreeAPI; + + @Mock + protected SessionPanel mockSessionPanel; + + @Mock + protected ISQLPanelAPI mockPanelAPI; + + + @Before + public void setUp() throws Exception { + when(mockApplication.getMessageHandler()).thenReturn(mockMessageHandler); + when(mockApplication.getSquirrelPreferences()).thenReturn(mockSquirrelPreferences); + when(mockSession.getApplication()).thenReturn(mockApplication); + when(mockSession.getMetaData()).thenReturn(mockSQLDatabaseMetaData); + when(mockSession.getSessionInternalFrame()).thenReturn(mockSessionInternalFrame); + when(mockSession.getSessionSheet()).thenReturn(mockSessionPanel); + when(mockSQLDatabaseMetaData.getDatabaseProductName()).thenReturn(getDatabaseProductName()); + when(mockSQLDatabaseMetaData.getDatabaseProductVersion()).thenReturn(getDatabaseProductVersion()); + when(mockSessionInternalFrame.getObjectTreeAPI()).thenReturn(mockObjectTreeAPI); + when(mockSessionPanel.getSQLPaneAPI()).thenReturn(mockPanelAPI); + } + @Test - public void testIsPluginSession() throws Exception { - ISession mockSession = mockHelper.createMock(ISession.class); - ISQLDatabaseMetaData mockSQLDatabaseMetaData = mockHelper.createMock(ISQLDatabaseMetaData.class); - expect(mockSession.getMetaData()).andStubReturn(mockSQLDatabaseMetaData); - expect(mockSQLDatabaseMetaData.getDatabaseProductName()).andStubReturn(getDatabaseProductName()); - expect(mockSQLDatabaseMetaData.getDatabaseProductVersion()).andStubReturn(getDatabaseProductVersion()); - - mockHelper.replayAll(); - if (classUnderTest instanceof DefaultSessionPlugin) { - DefaultSessionPlugin plugin = (DefaultSessionPlugin)classUnderTest; + public void testIsPluginSession() throws Exception + { + if (classUnderTest instanceof DefaultSessionPlugin) + { + DefaultSessionPlugin plugin = (DefaultSessionPlugin) classUnderTest; Assert.assertTrue(plugin.isPluginSession(mockSession)); } - mockHelper.verifyAll(); } - + /** * Subclass tests should provide a database product name for a session that corresponds to the plugin being - * tested by overriding this method + * tested by overriding this method */ protected abstract String getDatabaseProductName(); /** - * Subclass tests should provide a database product version for a session that corresponds to the plugin being - * tested by overriding this method - */ + * Subclass tests should provide a database product version for a session that corresponds to the plugin + * being tested by overriding this method + */ protected abstract String getDatabaseProductVersion(); - + } Modified: trunk/sql12/plugins/db2/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/DB2PluginTest.java =================================================================== --- trunk/sql12/plugins/db2/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/DB2PluginTest.java 2010-12-26 21:56:42 UTC (rev 6059) +++ trunk/sql12/plugins/db2/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/DB2PluginTest.java 2010-12-26 22:01:14 UTC (rev 6060) @@ -30,6 +30,7 @@ @Before public void setUp() throws Exception { + super.setUp(); classUnderTest = new DB2Plugin(); } Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPlugin.java =================================================================== --- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPlugin.java 2010-12-26 21:56:42 UTC (rev 6059) +++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPlugin.java 2010-12-26 22:01:14 UTC (rev 6060) @@ -172,8 +172,12 @@ IApplication app = getApplication(); ActionCollection coll = app.getActionCollection(); + + PasteTableAction pasteTableAction = new PasteTableAction(app, _resources, this); + pasteTableAction.setDbCopyPreferenceBean(PreferencesManager.getPreferences()); + coll.add(new CopyTableAction(app, _resources, this)); - coll.add(new PasteTableAction(app, _resources, this)); + coll.add(pasteTableAction); setPasteMenuEnabled(false); } Modified: trunk/sql12/plugins/derby/src/test/java/net/sourceforge/squirrel_sql/plugins/derby/DerbyPluginTest.java =================================================================== --- trunk/sql12/plugins/derby/src/test/java/net/sourceforge/squirrel_sql/plugins/derby/DerbyPluginTest.java 2010-12-26 21:56:42 UTC (rev 6059) +++ trunk/sql12/plugins/derby/src/test/java/net/sourceforge/squirrel_sql/plugins/derby/DerbyPluginTest.java 2010-12-26 22:01:14 UTC (rev 6060) @@ -29,6 +29,7 @@ @Before public void setUp() throws Exception { + super.setUp(); classUnderTest = new DerbyPlugin(); } Modified: trunk/sql12/plugins/example/src/main/java/net/sourceforge/squirrel_sql/plugins/example/ExamplePlugin.java =================================================================== --- trunk/sql12/plugins/example/src/main/java/net/sourceforge/squirrel_sql/plugins/example/ExamplePlugin.java 2010-12-26 21:56:42 UTC (rev 6059) +++ trunk/sql12/plugins/example/src/main/java/net/sourceforge/squirrel_sql/plugins/example/ExamplePlugin.java 2010-12-26 22:01:14 UTC (rev 6060) @@ -13,16 +13,19 @@ import net.sourceforge.squirrel_sql.fw.util.IMessageHandler; /** - * The Example plugin class. This plugin does the following: 1. If the database types is DB2, it registers a - * menu action in the popup menu for view and procedure nodes in the ObjectTree. For detailed information and - * usage of the Plugin API see the following: + * <pre> + * The Example plugin class. If the database session's type is DB2, this plugin registers a menu action in + * the popup menu for view and procedure nodes in the ObjectTree. + * + * For detailed information and usage of the Plugin API see the following: + * * https://sourceforge.net/apps/trac/squirrel-sql/wiki/SQuirreLSQLClientPluginAPI + * </pre> */ public class ExamplePlugin extends DefaultSessionPlugin { private PluginResources _resources; - /** * Return the internal name of this plugin. * @@ -127,20 +130,20 @@ * * @param session * The session that is starting. - * @return An implementation of PluginSessionCallback or null to indicate the plugin does not work with this - * session + * @return An implementation of PluginSessionCallback or null to indicate the plugin does not work with + * this session */ public PluginSessionCallback sessionStarted(ISession session) { // Adds the view and procedure script actions if the session is DB2. addTreeNodeMenuActionsForDB2(session); - + // Register a custom ISQLExecutionListener implementation that simply prints all SQL being executed to // the message panel. IMessageHandler messageHandler = session.getApplication().getMessageHandler(); ExampleSqlExecutionListener sqlExecutionListener = new ExampleSqlExecutionListener(messageHandler); session.getSessionSheet().getSQLPaneAPI().addSQLExecutionListener(sqlExecutionListener); - + return new PluginSessionCallbackAdaptor(this); } @@ -155,10 +158,10 @@ // Add context menu items to the object tree's view and procedure nodes. IObjectTreeAPI otApi = session.getSessionInternalFrame().getObjectTreeAPI(); - otApi.addToPopup(DatabaseObjectType.VIEW, new ScriptDB2ViewAction(getApplication(), _resources, - session)); - otApi.addToPopup(DatabaseObjectType.PROCEDURE, new ScriptDB2ProcedureAction(getApplication(), + otApi.addToPopup(DatabaseObjectType.VIEW, new ScriptDB2ViewAction(session.getApplication(), _resources, session)); + otApi.addToPopup(DatabaseObjectType.PROCEDURE, new ScriptDB2ProcedureAction( + session.getApplication(), _resources, session)); } } catch (Exception e) Modified: trunk/sql12/plugins/example/src/main/java/net/sourceforge/squirrel_sql/plugins/example/ExampleSqlExecutionListener.java =================================================================== --- trunk/sql12/plugins/example/src/main/java/net/sourceforge/squirrel_sql/plugins/example/ExampleSqlExecutionListener.java 2010-12-26 21:56:42 UTC (rev 6059) +++ trunk/sql12/plugins/example/src/main/java/net/sourceforge/squirrel_sql/plugins/example/ExampleSqlExecutionListener.java 2010-12-26 22:01:14 UTC (rev 6060) @@ -28,6 +28,7 @@ */ public class ExampleSqlExecutionListener implements ISQLExecutionListener { + /** This is what gives the ability to print a message to the message panel */ private final IMessageHandler _messageHandler; public ExampleSqlExecutionListener(IMessageHandler messageHandler) { @@ -45,7 +46,8 @@ { _messageHandler.showMessage("statementExecuting: "+sql); - // We don't modify the SQL in this example. We could veto it's execution be returned null. + // We don't modify the SQL in this example. in addition to modifying it, we could veto it's execution + // by returning null. return sql; } Added: trunk/sql12/plugins/example/src/test/java/net/sourceforge/squirrel_sql/plugins/example/ExamplePluginTest.java =================================================================== --- trunk/sql12/plugins/example/src/test/java/net/sourceforge/squirrel_sql/plugins/example/ExamplePluginTest.java (rev 0) +++ trunk/sql12/plugins/example/src/test/java/net/sourceforge/squirrel_sql/plugins/example/ExamplePluginTest.java 2010-12-26 22:01:14 UTC (rev 6060) @@ -0,0 +1,99 @@ +package net.sourceforge.squirrel_sql.plugins.example; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.when; +import net.sourceforge.squirrel_sql.client.plugin.AbstractSessionPluginTest; + +import org.junit.Before; +import org.junit.Test; + +/* + * Copyright (C) 2010 Rob Manning + * man...@us... + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/** + * This test extends AbstractSessionPluginTest which provides testing for many of the methods in the + * ISessionPlugin interface that are implemented by such a plugin. Run this test through a code coverage tool + * such as Emma and you will find that many of the simpler methods in the interface are covered. + */ +public class ExamplePluginTest extends AbstractSessionPluginTest +{ + + /** + * getDatabaseProductName returns "DB2" because that is the product name for sessions that the example + * plugin is interested in. This value will be returned by the SQLDatabaseMetaData for the method called + * getDatabaseProductName() that is associated with Session that is used when testing methods that on the + * ISessionPlugin interface that require a Session. + * + * @see net.sourceforge.squirrel_sql.client.plugin.AbstractSessionPluginTest#getDatabaseProductName() + */ + @Override + protected String getDatabaseProductName() + { + return "DB2"; + } + + /** + * No version is given here, because it is not required to distinguish dialects, since there is only one + * DB2 dialect at the current time. + * + * @see net.sourceforge.squirrel_sql.client.plugin.AbstractSessionPluginTest#getDatabaseProductVersion() + */ + @Override + protected String getDatabaseProductVersion() + { + return null; + } + + @Before + public void setUp() throws Exception + { + super.setUp(); + classUnderTest = new ExamplePlugin(); + } + + @Test + public void testSessionStarted() throws Exception + { + classUnderTest.initialize(); + ((ExamplePlugin) classUnderTest).sessionStarted(mockSession); + } + + @Test + public void testSessionStartedNullApplication() throws Exception + { + try + { + when(mockSession.getApplication()).thenReturn(null); + classUnderTest.initialize(); + ((ExamplePlugin) classUnderTest).sessionStarted(mockSession); + fail("Exception to get an exception for null IApplication returned from Session.getApplication"); + } + catch (Exception e) + { + // This is expected. + } + } + + @Test + public void testGetGlobalPreferencePanels() { + assertNotNull(classUnderTest.getGlobalPreferencePanels()); + } + +} Added: trunk/sql12/plugins/example/src/test/java/net/sourceforge/squirrel_sql/plugins/example/ExampleSqlExecutionListenerTest.java =================================================================== --- trunk/sql12/plugins/example/src/test/java/net/sourceforge/squirrel_sql/plugins/example/ExampleSqlExecutionListenerTest.java (rev 0) +++ trunk/sql12/plugins/example/src/test/java/net/sourceforge/squirrel_sql/plugins/example/ExampleSqlExecutionListenerTest.java 2010-12-26 22:01:14 UTC (rev 6060) @@ -0,0 +1,78 @@ +package net.sourceforge.squirrel_sql.plugins.example; + +import static org.junit.Assert.*; + +import net.sourceforge.squirrel_sql.fw.util.IMessageHandler; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.Mockito; + +/* + * Copyright (C) 2010 Rob Manning + * man...@us... + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/** + * A simple test that uses Mockito to create a mock (IMessageHandler) that is required to construct the + * class that is being tested (ExampleSqlExecutionListener). + */ +@RunWith(org.mockito.runners.MockitoJUnitRunner.class) +public class ExampleSqlExecutionListenerTest +{ + + /** + * Class that is being tested. This should always be called classUnderTest to distinguish it as the + * thing being tested. + */ + private ExampleSqlExecutionListener classUnderTest = null; + + /** + * The @Mock annotation in conjunction with the MockitoJUnitRunner is pure magic. This creates the mock + * automatically and injects it into this test class. To the naked eye, mockMessageHandler appears to be + * uninitialized here. However, because it's annotated with @Mock, it actually is set to a Mockito + * mock implementation of IMessageHandler. + */ + @Mock + private IMessageHandler mockMessageHandler; + + @Before + public void setUp() { + classUnderTest = new ExampleSqlExecutionListener(mockMessageHandler); + } + + @Test + public void testStatementExecuted() + { + final String sqlToTest = "select * from testtable"; + classUnderTest.statementExecuted(sqlToTest); + + // We just want to verify that the message handler's showMessage method was called. + Mockito.verify(mockMessageHandler).showMessage("statementExecuted: "+sqlToTest); + } + + @Test + public void testStatementExecuting() + { + final String sqlToTest = "select * from testtable"; + String result = classUnderTest.statementExecuting(sqlToTest); + assertEquals(sqlToTest, result); + } + +} Modified: trunk/sql12/plugins/firebird/src/test/java/net/sourceforge/squirrel_sql/plugins/firebird/FirebirdPluginTest.java =================================================================== --- trunk/sql12/plugins/firebird/src/test/java/net/sourceforge/squirrel_sql/plugins/firebird/FirebirdPluginTest.java 2010-12-26 21:56:42 UTC (rev 6059) +++ trunk/sql12/plugins/firebird/src/test/java/net/sourceforge/squirrel_sql/plugins/firebird/FirebirdPluginTest.java 2010-12-26 22:01:14 UTC (rev 6060) @@ -30,6 +30,7 @@ @Before public void setUp() throws Exception { + super.setUp(); classUnderTest = new FirebirdPlugin(); } Modified: trunk/sql12/plugins/h2/src/test/java/net/sourceforge/squirrel_sql/plugins/h2/H2PluginTest.java =================================================================== --- trunk/sql12/plugins/h2/src/test/java/net/sourceforge/squirrel_sql/plugins/h2/H2PluginTest.java 2010-12-26 21:56:42 UTC (rev 6059) +++ trunk/sql12/plugins/h2/src/test/java/net/sourceforge/squirrel_sql/plugins/h2/H2PluginTest.java 2010-12-26 22:01:14 UTC (rev 6060) @@ -29,6 +29,7 @@ @Before public void setUp() throws Exception { + super.setUp(); classUnderTest = new H2Plugin(); } Modified: trunk/sql12/plugins/informix/src/test/java/net/sourceforge/squirrel_sql/plugins/informix/InformixPluginTest.java =================================================================== --- trunk/sql12/plugins/informix/src/test/java/net/sourceforge/squirrel_sql/plugins/informix/InformixPluginTest.java 2010-12-26 21:56:42 UTC (rev 6059) +++ trunk/sql12/plugins/informix/src/test/java/net/sourceforge/squirrel_sql/plugins/informix/InformixPluginTest.java 2010-12-26 22:01:14 UTC (rev 6060) @@ -29,6 +29,7 @@ @Before public void setUp() throws Exception { + super.setUp(); classUnderTest = new InformixPlugin(); } Modified: trunk/sql12/plugins/mssql/src/test/java/net/sourceforge/squirrel_sql/plugins/mssql/MssqlPluginTest.java =================================================================== --- trunk/sql12/plugins/mssql/src/test/java/net/sourceforge/squirrel_sql/plugins/mssql/MssqlPluginTest.java 2010-12-26 21:56:42 UTC (rev 6059) +++ trunk/sql12/plugins/mssql/src/test/java/net/sourceforge/squirrel_sql/plugins/mssql/MssqlPluginTest.java 2010-12-26 22:01:14 UTC (rev 6060) @@ -29,6 +29,7 @@ @Before public void setUp() throws Exception { + super.setUp(); classUnderTest = new MssqlPlugin(); } Modified: trunk/sql12/plugins/mysql/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/MysqlPluginTest.java =================================================================== --- trunk/sql12/plugins/mysql/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/MysqlPluginTest.java 2010-12-26 21:56:42 UTC (rev 6059) +++ trunk/sql12/plugins/mysql/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/MysqlPluginTest.java 2010-12-26 22:01:14 UTC (rev 6060) @@ -18,11 +18,9 @@ */ package net.sourceforge.squirrel_sql.plugins.mysql; -import static org.easymock.EasyMock.expect; import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.when; import net.sourceforge.squirrel_sql.client.plugin.AbstractSessionPluginTest; -import net.sourceforge.squirrel_sql.client.session.ISession; -import net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData; import org.junit.After; import org.junit.Before; @@ -31,16 +29,11 @@ public class MysqlPluginTest extends AbstractSessionPluginTest { - // Common mocks - private ISQLDatabaseMetaData mockMetaData = mockHelper.createMock(ISQLDatabaseMetaData.class); - private ISession mockSession = mockHelper.createMock(ISession.class); - - @Before public void setUp() throws Exception { - expect(mockSession.getMetaData()).andStubReturn(mockMetaData); + super.setUp(); classUnderTest = new MysqlPlugin(); } @@ -72,17 +65,14 @@ private void testIsPluginSession(String productName, String productVersion, boolean isPluginSession) throws Exception { - expect(mockMetaData.getDatabaseProductName()).andReturn(productName).anyTimes(); - expect(mockMetaData.getDatabaseProductVersion()).andReturn(productVersion).anyTimes(); - - mockHelper.replayAll(); - + when(super.mockSQLDatabaseMetaData.getDatabaseProductName()).thenReturn(productName); + when(super.mockSQLDatabaseMetaData.getDatabaseProductVersion()).thenReturn(productVersion); + boolean result = ((MysqlPlugin)classUnderTest).isPluginSession(mockSession); assertEquals("isPluginSession() != expected value: ", isPluginSession, result); - mockHelper.verifyAll(); } @Override Modified: trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePluginTest.java =================================================================== --- trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePluginTest.java 2010-12-26 21:56:42 UTC (rev 6059) +++ trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePluginTest.java 2010-12-26 22:01:14 UTC (rev 6060) @@ -64,6 +64,7 @@ @Before public void setUp() throws Exception { + super.setUp(); pluginUnderTest = new OraclePlugin(); md = FwTestUtil.getEasyMockSQLMetaData("oracle", "jdbc:oracle:thin:@host:1521:sid", false, false); String[] functions = new String[] { OracleExceptionFormatter.OFFSET_FUNCTION_NAME }; Modified: trunk/sql12/plugins/postgres/src/test/java/net/sourceforge/squirrel_sql/plugins/postgres/PostgresPluginTest.java =================================================================== --- trunk/sql12/plugins/postgres/src/test/java/net/sourceforge/squirrel_sql/plugins/postgres/PostgresPluginTest.java 2010-12-26 21:56:42 UTC (rev 6059) +++ trunk/sql12/plugins/postgres/src/test/java/net/sourceforge/squirrel_sql/plugins/postgres/PostgresPluginTest.java 2010-12-26 22:01:14 UTC (rev 6060) @@ -29,6 +29,7 @@ @Before public void setUp() throws Exception { + super.setUp(); classUnderTest = new PostgresPlugin(); } Modified: trunk/sql12/plugins/sqlparam/src/test/java/net/sourceforge/squirrel_sql/plugins/sqlparam/SQLParamPluginTest.java =================================================================== --- trunk/sql12/plugins/sqlparam/src/test/java/net/sourceforge/squirrel_sql/plugins/sqlparam/SQLParamPluginTest.java 2010-12-26 21:56:42 UTC (rev 6059) +++ trunk/sql12/plugins/sqlparam/src/test/java/net/sourceforge/squirrel_sql/plugins/sqlparam/SQLParamPluginTest.java 2010-12-26 22:01:14 UTC (rev 6060) @@ -18,28 +18,21 @@ */ package net.sourceforge.squirrel_sql.plugins.sqlparam; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.expectLastCall; -import static org.easymock.EasyMock.isA; -import net.sourceforge.squirrel_sql.client.gui.session.SessionPanel; -import net.sourceforge.squirrel_sql.client.plugin.AbstractPluginTest; +import net.sourceforge.squirrel_sql.client.plugin.AbstractSessionPluginTest; import net.sourceforge.squirrel_sql.client.plugin.DatabaseProductVersionData; import net.sourceforge.squirrel_sql.client.plugin.ISessionPlugin; -import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI; -import net.sourceforge.squirrel_sql.client.session.ISession; -import net.sourceforge.squirrel_sql.client.session.event.ISQLExecutionListener; -import org.easymock.EasyMock; import org.junit.After; import org.junit.Before; import org.junit.Test; -public class SQLParamPluginTest extends AbstractPluginTest implements DatabaseProductVersionData +public class SQLParamPluginTest extends AbstractSessionPluginTest implements DatabaseProductVersionData { @Before public void setUp() throws Exception { + super.setUp(); classUnderTest = new SQLParamPlugin(); } @@ -56,21 +49,6 @@ // close events on shutdown. @Test public void testMultipleSessionEndings() { - - ISession mockSession = mockHelper.createMock("mockSession", ISession.class); - SessionPanel mockSessionPanel = mockHelper.createMock("mockSessionPanel", SessionPanel.class); - ISQLPanelAPI mockSQLPanelAPI = mockHelper.createMock("mockSQLPanelAPI", ISQLPanelAPI.class); - EasyMock.makeThreadSafe(mockSQLPanelAPI, true); - - expect(mockSession.getSessionSheet()).andStubReturn(mockSessionPanel); - expect(mockSessionPanel.getSQLPaneAPI()).andStubReturn(mockSQLPanelAPI); - mockSQLPanelAPI.addSQLExecutionListener(isA(ISQLExecutionListener.class)); - expectLastCall().anyTimes(); - mockSQLPanelAPI.removeSQLExecutionListener(isA(ISQLExecutionListener.class)); - expectLastCall().anyTimes(); - - mockHelper.replayAll(); - ((ISessionPlugin)classUnderTest).sessionCreated(mockSession); ((ISessionPlugin)classUnderTest).sessionStarted(mockSession); // Give the AWT thread time to finish processing the event. @@ -78,9 +56,28 @@ ((ISessionPlugin)classUnderTest).sessionEnding(mockSession); ((ISessionPlugin)classUnderTest).sessionEnding(mockSession); + } - - mockHelper.verifyAll(); + /** + * @see net.sourceforge.squirrel_sql.client.plugin.AbstractSessionPluginTest#getDatabaseProductName() + */ + @Override + protected String getDatabaseProductName() + { + // This plugin is not really database-specific. SQL execution listener API is tied to sessions, so this + // plugin needs to be notified when they are started. + return null; } + + /** + * @see net.sourceforge.squirrel_sql.client.plugin.AbstractSessionPluginTest#getDatabaseProductVersion() + */ + @Override + protected String getDatabaseProductVersion() + { + // This plugin is not really database-specific. SQL execution listener API is tied to sessions, so this + // plugin needs to be notified when they are started. + return null; + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-12-29 20:27:05
|
Revision: 6075 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6075&view=rev Author: manningr Date: 2010-12-29 20:26:57 +0000 (Wed, 29 Dec 2010) Log Message: ----------- Switched to using a more reliable way of resolving the plugin assembly descriptor file in the plugin projects. This should hopefully remove any reliance on a particular version of maven, the dependency/assembly plugin or any combination thereof. Modified Paths: -------------- trunk/sql12/plugins/cache/pom.xml trunk/sql12/plugins/codecompletion/pom.xml trunk/sql12/plugins/dataimport/pom.xml trunk/sql12/plugins/db2/pom.xml trunk/sql12/plugins/dbcopy/pom.xml trunk/sql12/plugins/dbdiff/pom.xml trunk/sql12/plugins/derby/pom.xml trunk/sql12/plugins/editextras/pom.xml trunk/sql12/plugins/exportconfig/pom.xml trunk/sql12/plugins/favs/pom.xml trunk/sql12/plugins/firebird/pom.xml trunk/sql12/plugins/firebirdmanager/pom.xml trunk/sql12/plugins/graph/pom.xml trunk/sql12/plugins/h2/pom.xml trunk/sql12/plugins/hibernate/pom.xml trunk/sql12/plugins/i18n/pom.xml trunk/sql12/plugins/informix/pom.xml trunk/sql12/plugins/macosx/pom.xml trunk/sql12/plugins/mssql/pom.xml trunk/sql12/plugins/mysql/pom.xml trunk/sql12/plugins/netezza/pom.xml trunk/sql12/plugins/oracle/pom.xml trunk/sql12/plugins/postgres/pom.xml trunk/sql12/plugins/refactoring/pom.xml trunk/sql12/plugins/sessionscript/pom.xml trunk/sql12/plugins/smarttools/pom.xml trunk/sql12/plugins/sqlbookmark/pom.xml trunk/sql12/plugins/sqlparam/pom.xml trunk/sql12/plugins/sqlreplace/pom.xml trunk/sql12/plugins/sqlscript/pom.xml trunk/sql12/plugins/sqlval/pom.xml trunk/sql12/plugins/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml trunk/sql12/plugins/sybase/pom.xml trunk/sql12/plugins/syntax/pom.xml trunk/sql12/plugins/userscript/pom.xml trunk/sql12/pom.xml Modified: trunk/sql12/plugins/cache/pom.xml =================================================================== --- trunk/sql12/plugins/cache/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/cache/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -1,6 +1,4 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<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> @@ -87,16 +85,20 @@ <artifactId>mockito-all</artifactId> </dependency> <dependency> - <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> - <artifactId>CacheDB</artifactId> - <version>2008.2.0.526.0</version> - </dependency> + <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> + <artifactId>CacheDB</artifactId> + <version>2008.2.0.526.0</version> + </dependency> </dependencies> <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/codecompletion/pom.xml =================================================================== --- trunk/sql12/plugins/codecompletion/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/codecompletion/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/dataimport/pom.xml =================================================================== --- trunk/sql12/plugins/dataimport/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/dataimport/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/db2/pom.xml =================================================================== --- trunk/sql12/plugins/db2/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/db2/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -99,6 +99,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/dbcopy/pom.xml =================================================================== --- trunk/sql12/plugins/dbcopy/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/dbcopy/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/dbdiff/pom.xml =================================================================== --- trunk/sql12/plugins/dbdiff/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/dbdiff/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/derby/pom.xml =================================================================== --- trunk/sql12/plugins/derby/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/derby/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/editextras/pom.xml =================================================================== --- trunk/sql12/plugins/editextras/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/editextras/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/exportconfig/pom.xml =================================================================== --- trunk/sql12/plugins/exportconfig/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/exportconfig/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/favs/pom.xml =================================================================== --- trunk/sql12/plugins/favs/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/favs/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/firebird/pom.xml =================================================================== --- trunk/sql12/plugins/firebird/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/firebird/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/firebirdmanager/pom.xml =================================================================== --- trunk/sql12/plugins/firebirdmanager/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/firebirdmanager/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -106,6 +106,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/graph/pom.xml =================================================================== --- trunk/sql12/plugins/graph/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/graph/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/h2/pom.xml =================================================================== --- trunk/sql12/plugins/h2/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/h2/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/hibernate/pom.xml =================================================================== --- trunk/sql12/plugins/hibernate/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/hibernate/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/i18n/pom.xml =================================================================== --- trunk/sql12/plugins/i18n/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/i18n/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/informix/pom.xml =================================================================== --- trunk/sql12/plugins/informix/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/informix/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -1,4 +1,5 @@ -<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"> +<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>net.sf.squirrel-sql.plugins</groupId> @@ -91,6 +92,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/macosx/pom.xml =================================================================== --- trunk/sql12/plugins/macosx/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/macosx/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/mssql/pom.xml =================================================================== --- trunk/sql12/plugins/mssql/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/mssql/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/mysql/pom.xml =================================================================== --- trunk/sql12/plugins/mysql/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/mysql/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/netezza/pom.xml =================================================================== --- trunk/sql12/plugins/netezza/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/netezza/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/oracle/pom.xml =================================================================== --- trunk/sql12/plugins/oracle/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/oracle/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -96,6 +96,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/postgres/pom.xml =================================================================== --- trunk/sql12/plugins/postgres/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/postgres/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/refactoring/pom.xml =================================================================== --- trunk/sql12/plugins/refactoring/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/refactoring/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/sessionscript/pom.xml =================================================================== --- trunk/sql12/plugins/sessionscript/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/sessionscript/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/smarttools/pom.xml =================================================================== --- trunk/sql12/plugins/smarttools/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/smarttools/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/sqlbookmark/pom.xml =================================================================== --- trunk/sql12/plugins/sqlbookmark/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/sqlbookmark/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/sqlparam/pom.xml =================================================================== --- trunk/sql12/plugins/sqlparam/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/sqlparam/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/sqlreplace/pom.xml =================================================================== --- trunk/sql12/plugins/sqlreplace/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/sqlreplace/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/sqlscript/pom.xml =================================================================== --- trunk/sql12/plugins/sqlscript/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/sqlscript/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/sqlval/pom.xml =================================================================== --- trunk/sql12/plugins/sqlval/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/sqlval/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -111,6 +111,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml =================================================================== --- trunk/sql12/plugins/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -99,6 +99,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml =================================================================== --- trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -207,15 +207,33 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>${dependency-plugin-version}</version> + <executions> + <execution> + <id>copy-assembly-descriptor-file</id> + <goals> + <goal>unpack</goal> + </goals> + <phase>generate-resources</phase> + <configuration> + <artifactItems> + <artifactItem> + <groupId>net.sf.squirrel-sql.plugins</groupId> + <artifactId>squirrelsql-plugins-assembly-descriptor</artifactId> + <version>3.3.0-SNAPSHOT</version> + </artifactItem> + </artifactItems> + <outputDirectory>${project.build.directory}</outputDirectory> + <includes>**\/*.xml</includes> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <version>${assembly-plugin-version}</version> - <dependencies> - <dependency> - <groupId>net.sf.squirrel-sql.plugins</groupId> - <artifactId>squirrelsql-plugins-assembly-descriptor</artifactId> - <version>3.3.0-SNAPSHOT</version> - </dependency> - </dependencies> <executions> <execution> <id>create-plugin-archives</id> @@ -224,9 +242,9 @@ <goal>single</goal> </goals> <configuration> - <descriptorRefs> - <descriptorRef>squirrelsql-plugin-assembly</descriptorRef> - </descriptorRefs> + <descriptors> + <descriptor>${project.build.directory}/assemblies/squirrelsql-plugin-assembly.xml</descriptor> + </descriptors> <!-- This must be true, or else it will cause this to become the main artifact for each plugin project Modified: trunk/sql12/plugins/sybase/pom.xml =================================================================== --- trunk/sql12/plugins/sybase/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/sybase/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/syntax/pom.xml =================================================================== --- trunk/sql12/plugins/syntax/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/syntax/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -141,6 +141,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/plugins/userscript/pom.xml =================================================================== --- trunk/sql12/plugins/userscript/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/plugins/userscript/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -91,6 +91,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> Modified: trunk/sql12/pom.xml =================================================================== --- trunk/sql12/pom.xml 2010-12-29 19:01:10 UTC (rev 6074) +++ trunk/sql12/pom.xml 2010-12-29 20:26:57 UTC (rev 6075) @@ -60,12 +60,7 @@ <assembly-plugin-version>2.2</assembly-plugin-version> <checkstyle-plugin-version>2.2</checkstyle-plugin-version> <compiler-plugin-version>2.3.2</compiler-plugin-version> - <!-- The following build error is encountered in each plugin project when using 2.1 version of this - plugin with Maven 2.2.1: - Error reading assemblies: Descriptor with ID 'squirrelsql-plugin-assembly' not found - So, until everyone is using Maven 3, keep this version at 2.0. - --> - <dependency-plugin-version>2.0</dependency-plugin-version> + <dependency-plugin-version>2.1</dependency-plugin-version> <exec-plugin-version>1.2</exec-plugin-version> <findbugs-plugin-version>2.1</findbugs-plugin-version> <gpg-plugin-version>1.1</gpg-plugin-version> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-12-31 20:23:31
|
Revision: 6097 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6097&view=rev Author: manningr Date: 2010-12-31 20:23:24 +0000 (Fri, 31 Dec 2010) Log Message: ----------- Handle edge case of null Throwable. New test to verify behavior. Allowed getExceptionFormatter method to throw exception in sub-class implementations. Modified Paths: -------------- trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/util/AbstractExceptionFormatterTest.java trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/exception/OracleExceptionFormatter.java Added Paths: ----------- trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/exception/ trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/exception/OracleExceptionFormatterTest.java Modified: trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/util/AbstractExceptionFormatterTest.java =================================================================== --- trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/util/AbstractExceptionFormatterTest.java 2010-12-31 20:04:42 UTC (rev 6096) +++ trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/util/AbstractExceptionFormatterTest.java 2010-12-31 20:23:24 UTC (rev 6097) @@ -38,7 +38,7 @@ * * @return an instance of ExceptionFormatter to test */ - protected abstract ExceptionFormatter getExceptionFormatterToTest(); + protected abstract ExceptionFormatter getExceptionFormatterToTest() throws Exception; public AbstractExceptionFormatterTest() { @@ -46,7 +46,7 @@ } @Before - public void setUp() + public void setUp() throws Exception { classUnderTest = getExceptionFormatterToTest(); } Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/exception/OracleExceptionFormatter.java =================================================================== --- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/exception/OracleExceptionFormatter.java 2010-12-31 20:04:42 UTC (rev 6096) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/exception/OracleExceptionFormatter.java 2010-12-31 20:23:24 UTC (rev 6097) @@ -18,6 +18,8 @@ */ package net.sourceforge.squirrel_sql.plugins.oracle.exception; +import static net.sourceforge.squirrel_sql.fw.util.Utilities.checkNull; + import java.sql.CallableStatement; import java.sql.Connection; import java.sql.SQLException; @@ -35,254 +37,283 @@ import net.sourceforge.squirrel_sql.fw.util.ExceptionFormatter; import net.sourceforge.squirrel_sql.fw.util.StringManager; import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; +import net.sourceforge.squirrel_sql.fw.util.Utilities; import net.sourceforge.squirrel_sql.fw.util.log.ILogger; import net.sourceforge.squirrel_sql.fw.util.log.LoggerController; /** - * An ExceptionFormatter for Oracle which adds the position of the syntax error - * and moves the caret position to that error position. It does nothing else - * to format the exception, beyond what the default formatter does. + * An ExceptionFormatter for Oracle which adds the position of the syntax error and moves the caret position + * to that error position. It does nothing else to format the exception, beyond what the default formatter + * does. * * @author manningr */ -public class OracleExceptionFormatter extends SessionAdapter - implements ISessionListener, ExceptionFormatter { +public class OracleExceptionFormatter extends SessionAdapter implements ISessionListener, ExceptionFormatter +{ - /** - * Logger for this class. - */ - private final static ILogger s_log = - LoggerController.createLogger(OracleExceptionFormatter.class); + /** + * Logger for this class. + */ + private final static ILogger s_log = LoggerController.createLogger(OracleExceptionFormatter.class); - /** - * Internationalized strings for this class. - */ - private static final StringManager s_stringMgr = - StringManagerFactory.getStringManager(OracleExceptionFormatter.class); - - private static interface i18n { - //i18n[OracleExceptionFormatter.positionLabel=Position: ] - String POSITION_LABEL = - s_stringMgr.getString("OracleExceptionFormatter.positionLabel"); - } - - /** The session that this formatter is associated with */ - private ISession _session = null; - - private DefaultExceptionFormatter formatter = new DefaultExceptionFormatter(); - - private boolean offsetFunctionAvailable = false; - - /** Interface to allow us to set the caret position in the SQL editor */ - private ISQLEntryPanel sqlEntryPanel = null; - - - public OracleExceptionFormatter() { - } - - /** - * Sets the Oracle session that this formatter is associated with. - * - * @param session the session - */ - public void setSession(ISession session) { - _session = session; - this.sqlEntryPanel = - session.getSQLPanelAPIOfActiveSessionWindow().getSQLEntryPanel(); - - try { - if (!isOffsetFunctionAvailable()) { - if (initOffsetFunction()) { - offsetFunctionAvailable = true; - } - } - } catch (SQLException e) { - s_log.error("setSession: Unexpected exception - "+ - e.getMessage(), e); - } - } - - /** - * The name to give to our function. Oracle doesn't support anonymous - * function blocks. - */ - public static final String OFFSET_FUNCTION_NAME = - "SQUIRREL_GET_ERROR_OFFSET"; - - /** - * The syntax error offset function to use to determine where the error - * occurred in a SQL statement. - */ - private static final String OFFSET_FUNCTION = - "create or replace function "+OFFSET_FUNCTION_NAME+ - " (query IN varchar2) " + - "return number authid current_user " + - "is " + - " l_theCursor integer default dbms_sql.open_cursor; " + - " l_status integer; " + - "begin " + - " begin " + - " dbms_sql.parse( l_theCursor, query, dbms_sql.native ); " + - " exception " + - " when others then l_status := dbms_sql.last_error_position; " + - " end; " + - " dbms_sql.close_cursor( l_theCursor ); " + - " return l_status; " + - "end; "; - - /** - * Pass through to default formatter, detecting the error position and - * setting the caret position appropriately. - * - * @see net.sourceforge.squirrel_sql.fw.util.ExceptionFormatter#format(java.lang.Throwable) - */ - public String format(Throwable t) throws Exception { - StringBuilder result = new StringBuilder(formatter.format(t)); - String sql = getCurrentSql(); - if (sql != null) { - int position = getErrorPosition(sql); - if (position != -1) { - result.append("\n"); - result.append(i18n.POSITION_LABEL); - result.append(position); - - int[] bounds = sqlEntryPanel.getBoundsOfSQLToBeExecuted(); - int start = bounds[0]; - int newPosition = start + position; - sqlEntryPanel.setCaretPosition(newPosition); - - } - } - return result.toString(); - } + /** + * Internationalized strings for this class. + */ + private static final StringManager s_stringMgr = + StringManagerFactory.getStringManager(OracleExceptionFormatter.class); - /** - * @see net.sourceforge.squirrel_sql.fw.util.ExceptionFormatter#formatsException(java.lang.Throwable) - */ - public boolean formatsException(Throwable t) { - return true; - } - - private String getCurrentSql() { - String result = null; - ISQLPanelAPI api = _session.getSQLPanelAPIOfActiveSessionWindow(); - result = api.getSQLEntryPanel().getSQLToBeExecuted(); - return result; - } - - private int getErrorPosition(String sql) throws SQLException { - int result = -1; - ISQLConnection sqlcon = _session.getSQLConnection(); - Connection con = sqlcon.getConnection(); - CallableStatement cstmt = null; + private static interface i18n + { + // i18n[OracleExceptionFormatter.positionLabel=Position: ] + String POSITION_LABEL = s_stringMgr.getString("OracleExceptionFormatter.positionLabel"); + } - try { - String callSql = "{?=call "+OFFSET_FUNCTION_NAME+"(?)}"; - if (s_log.isDebugEnabled()) { - s_log.debug("getErrorPosition: Executing sql: "+callSql); - s_log.debug("getErrorPosition: errant SQL was: "+sql); - } - cstmt = con.prepareCall(callSql); - cstmt.registerOutParameter(1, java.sql.Types.INTEGER); - cstmt.setString(2, sql); - cstmt.execute(); - result = cstmt.getInt(1); - } catch (SQLException e ) { - s_log.error("getErrorPosition: Unexpected exception - "+ - e.getMessage(), e); - } finally { - SQLUtilities.closeStatement(cstmt); - } - return result; - } - - private boolean initOffsetFunction() throws SQLException { - ISQLConnection sqlcon = _session.getSQLConnection(); - Connection con = sqlcon.getConnection(); - CallableStatement cstmt = null; - Statement stmt = null; - boolean result = true; - try { - stmt = con.createStatement(); - if (s_log.isDebugEnabled()) { - s_log.debug("initOffsetFunction: Executing sql: "+ - OFFSET_FUNCTION); - } - - stmt.executeUpdate(OFFSET_FUNCTION); - } catch (SQLException e ) { - result = false; - s_log.error("initOffsetFunction: Unexpected exception - "+ - e.getMessage(), e); - - - } finally { - SQLUtilities.closeStatement(cstmt); - SQLUtilities.closeStatement(stmt); - } - return result; - } - - private boolean isOffsetFunctionAvailable() throws SQLException { - // Don't try to find it if we have already created it. - if (offsetFunctionAvailable) { - return true; - } - boolean result = false; - String[] functionNames = _session.getMetaData().getStringFunctions(); - for (String functionName : functionNames) { - if (OFFSET_FUNCTION_NAME.equals(functionName)) { - if (s_log.isDebugEnabled()) { - s_log.debug("isOffsetFunctionAvailable: Found offset " + - "function: "+OFFSET_FUNCTION_NAME); - } - result = true; - break; - } - } - if (s_log.isDebugEnabled()) { - s_log.debug("isOffsetFunctionAvailable: Couldn't locate offset " + - "function: "+OFFSET_FUNCTION_NAME); - } - return result; - } - - // ISessionListener interface methods - - /* - * Since we depend upon the Connection class associated with the ISession, - * we need to keep a reference to the ISession we are associated with. - * However, this session could be closed, at which time we want to give up - * our reference so that it can be garbage collected. - */ - - /** - * @see net.sourceforge.squirrel_sql.client.session.event.ISessionListener#allSessionsClosed() - */ - public void allSessionsClosed() { - _session.getApplication().getSessionManager().removeSessionListener(this); - _session = null; - } + /** The session that this formatter is associated with */ + private ISession _session = null; - /** - * @see net.sourceforge.squirrel_sql.client.session.event.ISessionListener#sessionClosed(net.sourceforge.squirrel_sql.client.session.event.SessionEvent) - */ - public void sessionClosed(SessionEvent evt) { - if (evt.getSession() == _session) { - _session.getApplication().getSessionManager().removeSessionListener(this); - _session = null; - } - } + private DefaultExceptionFormatter formatter = new DefaultExceptionFormatter(); - /** - * @see net.sourceforge.squirrel_sql.client.session.event.ISessionListener#sessionClosing(net.sourceforge.squirrel_sql.client.session.event.SessionEvent) - */ - public void sessionClosing(SessionEvent evt) { - if (evt.getSession() == _session) { - _session.getApplication().getSessionManager().removeSessionListener(this); - _session = null; - } - } - + private boolean offsetFunctionAvailable = false; + /** Interface to allow us to set the caret position in the SQL editor */ + private ISQLEntryPanel sqlEntryPanel = null; + + public OracleExceptionFormatter() + { + } + + /** + * Sets the Oracle session that this formatter is associated with. + * + * @param session + * the session + */ + public void setSession(ISession session) + { + _session = session; + this.sqlEntryPanel = session.getSQLPanelAPIOfActiveSessionWindow().getSQLEntryPanel(); + + try + { + if (!isOffsetFunctionAvailable()) + { + if (initOffsetFunction()) + { + offsetFunctionAvailable = true; + } + } + } + catch (SQLException e) + { + s_log.error("setSession: Unexpected exception - " + e.getMessage(), e); + } + } + + /** + * The name to give to our function. Oracle doesn't support anonymous function blocks. + */ + public static final String OFFSET_FUNCTION_NAME = "SQUIRREL_GET_ERROR_OFFSET"; + + /** + * The syntax error offset function to use to determine where the error occurred in a SQL statement. + */ + private static final String OFFSET_FUNCTION = + "create or replace function "+OFFSET_FUNCTION_NAME+ + " (query IN varchar2) " + + "return number authid current_user " + + "is " + + " l_theCursor integer default dbms_sql.open_cursor; " + + " l_status integer; " + + "begin " + + " begin " + + " dbms_sql.parse( l_theCursor, query, dbms_sql.native ); " + + " exception " + + " when others then l_status := dbms_sql.last_error_position; " + + " end; " + + " dbms_sql.close_cursor( l_theCursor ); " + + " return l_status; " + + "end; "; + + /** + * Pass through to default formatter, detecting the error position and setting the caret position + * appropriately. + * + * @see net.sourceforge.squirrel_sql.fw.util.ExceptionFormatter#format(java.lang.Throwable) + */ + public String format(Throwable t) throws Exception + { + Utilities.checkNull("format", "t", t); + + StringBuilder result = new StringBuilder(formatter.format(t)); + String sql = getCurrentSql(); + if (sql != null) + { + int position = getErrorPosition(sql); + if (position != -1) + { + result.append("\n"); + result.append(i18n.POSITION_LABEL); + result.append(position); + + int[] bounds = sqlEntryPanel.getBoundsOfSQLToBeExecuted(); + int start = bounds[0]; + int newPosition = start + position; + sqlEntryPanel.setCaretPosition(newPosition); + + } + } + return result.toString(); + } + + /** + * @see net.sourceforge.squirrel_sql.fw.util.ExceptionFormatter#formatsException(java.lang.Throwable) + */ + public boolean formatsException(Throwable t) + { + checkNull("formatsException", "t", t); + return true; + } + + private String getCurrentSql() + { + String result = null; + ISQLPanelAPI api = _session.getSQLPanelAPIOfActiveSessionWindow(); + result = api.getSQLEntryPanel().getSQLToBeExecuted(); + return result; + } + + private int getErrorPosition(String sql) throws SQLException + { + int result = -1; + ISQLConnection sqlcon = _session.getSQLConnection(); + Connection con = sqlcon.getConnection(); + CallableStatement cstmt = null; + + try + { + String callSql = "{?=call " + OFFSET_FUNCTION_NAME + "(?)}"; + if (s_log.isDebugEnabled()) + { + s_log.debug("getErrorPosition: Executing sql: " + callSql); + s_log.debug("getErrorPosition: errant SQL was: " + sql); + } + cstmt = con.prepareCall(callSql); + cstmt.registerOutParameter(1, java.sql.Types.INTEGER); + cstmt.setString(2, sql); + cstmt.execute(); + result = cstmt.getInt(1); + } + catch (SQLException e) + { + s_log.error("getErrorPosition: Unexpected exception - " + e.getMessage(), e); + } + finally + { + SQLUtilities.closeStatement(cstmt); + } + return result; + } + + private boolean initOffsetFunction() throws SQLException + { + ISQLConnection sqlcon = _session.getSQLConnection(); + Connection con = sqlcon.getConnection(); + CallableStatement cstmt = null; + Statement stmt = null; + boolean result = true; + try + { + stmt = con.createStatement(); + if (s_log.isDebugEnabled()) + { + s_log.debug("initOffsetFunction: Executing sql: " + OFFSET_FUNCTION); + } + + stmt.executeUpdate(OFFSET_FUNCTION); + } + catch (SQLException e) + { + result = false; + s_log.error("initOffsetFunction: Unexpected exception - " + e.getMessage(), e); + + } + finally + { + SQLUtilities.closeStatement(cstmt); + SQLUtilities.closeStatement(stmt); + } + return result; + } + + private boolean isOffsetFunctionAvailable() throws SQLException + { + // Don't try to find it if we have already created it. + if (offsetFunctionAvailable) + { + return true; + } + boolean result = false; + String[] functionNames = _session.getMetaData().getStringFunctions(); + for (String functionName : functionNames) + { + if (OFFSET_FUNCTION_NAME.equals(functionName)) + { + if (s_log.isDebugEnabled()) + { + s_log.debug("isOffsetFunctionAvailable: Found offset " + "function: " + OFFSET_FUNCTION_NAME); + } + result = true; + break; + } + } + if (s_log.isDebugEnabled()) + { + s_log.debug("isOffsetFunctionAvailable: Couldn't locate offset " + "function: " + + OFFSET_FUNCTION_NAME); + } + return result; + } + + // ISessionListener interface methods + + /* + * Since we depend upon the Connection class associated with the ISession, + * we need to keep a reference to the ISession we are associated with. + * However, this session could be closed, at which time we want to give up + * our reference so that it can be garbage collected. + */ + + /** + * @see net.sourceforge.squirrel_sql.client.session.event.ISessionListener#allSessionsClosed() + */ + public void allSessionsClosed() + { + _session.getApplication().getSessionManager().removeSessionListener(this); + _session = null; + } + + /** + * @see net.sourceforge.squirrel_sql.client.session.event.ISessionListener#sessionClosed(net.sourceforge.squirrel_sql.client.session.event.SessionEvent) + */ + public void sessionClosed(SessionEvent evt) + { + if (evt.getSession() == _session) + { + _session.getApplication().getSessionManager().removeSessionListener(this); + _session = null; + } + } + + /** + * @see net.sourceforge.squirrel_sql.client.session.event.ISessionListener#sessionClosing(net.sourceforge.squirrel_sql.client.session.event.SessionEvent) + */ + public void sessionClosing(SessionEvent evt) + { + if (evt.getSession() == _session) + { + _session.getApplication().getSessionManager().removeSessionListener(this); + _session = null; + } + } + } Added: trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/exception/OracleExceptionFormatterTest.java =================================================================== --- trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/exception/OracleExceptionFormatterTest.java (rev 0) +++ trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/exception/OracleExceptionFormatterTest.java 2010-12-31 20:23:24 UTC (rev 6097) @@ -0,0 +1,86 @@ +package net.sourceforge.squirrel_sql.plugins.oracle.exception; + +import static org.mockito.Mockito.when; + +import java.sql.CallableStatement; +import java.sql.Connection; + +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.runners.MockitoJUnitRunner; + +import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel; +import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI; +import net.sourceforge.squirrel_sql.client.session.ISession; +import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection; +import net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData; +import net.sourceforge.squirrel_sql.fw.util.AbstractExceptionFormatterTest; +import net.sourceforge.squirrel_sql.fw.util.ExceptionFormatter; + + +/* + * Copyright (C) 2010 Rob Manning + * man...@us... + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +@RunWith(MockitoJUnitRunner.class) +public class OracleExceptionFormatterTest extends AbstractExceptionFormatterTest +{ + + @Mock + private ISession mockSession; + + @Mock + private ISQLPanelAPI mockPanelAPI; + + @Mock + private ISQLDatabaseMetaData mockIsqlDatabaseMetaData; + + @Mock + private ISQLEntryPanel mockIsqlEntryPanel; + + @Mock + private ISQLConnection mockIsqlConnection; + + @Mock + private Connection mockConnection; + + @Mock + private CallableStatement mockCallableStatement; + + @Override + protected ExceptionFormatter getExceptionFormatterToTest() throws Exception + { + final String sql = "select 'X' from dual"; + OracleExceptionFormatter result = new OracleExceptionFormatter(); + when(mockSession.getSQLPanelAPIOfActiveSessionWindow()).thenReturn(mockPanelAPI); + when(mockSession.getMetaData()).thenReturn(mockIsqlDatabaseMetaData); + when(mockSession.getSQLConnection()).thenReturn(mockIsqlConnection); + when(mockIsqlConnection.getConnection()).thenReturn(mockConnection); + when(mockIsqlDatabaseMetaData.getStringFunctions()).thenReturn(new String[] { OracleExceptionFormatter.OFFSET_FUNCTION_NAME }); + when(mockPanelAPI.getSQLEntryPanel()).thenReturn(mockIsqlEntryPanel); + when(mockConnection.prepareCall(Mockito.anyString())).thenReturn(mockCallableStatement); + + when(mockIsqlEntryPanel.getSQLToBeExecuted()).thenReturn(sql); + when(mockIsqlEntryPanel.getBoundsOfSQLToBeExecuted()).thenReturn(new int[] { 0, 20 }); + + result.setSession(mockSession); + return result; + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ger...@us...> - 2011-01-08 14:38:37
|
Revision: 6134 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6134&view=rev Author: gerdwagner Date: 2011-01-08 14:38:28 +0000 (Sat, 08 Jan 2011) Log Message: ----------- Display errors in result tab Modified Paths: -------------- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrame.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/DefaultSQLExecuterHandler.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISQLExecuterHandler.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/MessagePanel.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecuterTask.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultFrame.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLHistoryController.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SessionProperties.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SessionPropertiesBeanInfo.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SessionSQLPropertiesPanel.java trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/I18NStrings.properties trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/properties/I18NStrings.properties trunk/sql12/doc/src/main/resources/changes.txt trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/StringManager.java trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/StringUtilities.java trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/Utilities.java trunk/sql12/plugins/laf/src/main/resources/net/sourceforge/squirrel_sql/plugins/laf/I18NStrings.properties trunk/sql12/plugins/postgres/src/main/java/net/sourceforge/squirrel_sql/plugins/postgres/commands/handler/MessageSQLExecuterHandler.java trunk/sql12/plugins/postgres/src/main/java/net/sourceforge/squirrel_sql/plugins/postgres/commands/handler/ProgressSQLExecuterHandler.java trunk/sql12/plugins/postgres/src/main/java/net/sourceforge/squirrel_sql/plugins/postgres/explain/ExplainExecuterPanel.java trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AbstractRefactoringCommand.java trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddLookupTableCommand.java Added Paths: ----------- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanel.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelListener.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ErrorPanel.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ErrorPanelListener.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ISQLExecutionHandlerListener.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrame.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrame.java 2011-01-03 01:58:23 UTC (rev 6133) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrame.java 2011-01-08 14:38:28 UTC (rev 6134) @@ -345,6 +345,7 @@ _splitPn.add(new JScrollPane(_msgPnl)); _splitPn.setResizeWeight(1); + _splitPn.setOneTouchExpandable(true); //i18n[MainFrame.saveSize=Save size] String key = s_stringMgr.getString("MainFrame.saveSize"); Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/DefaultSQLExecuterHandler.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/DefaultSQLExecuterHandler.java 2011-01-03 01:58:23 UTC (rev 6133) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/DefaultSQLExecuterHandler.java 2011-01-08 14:38:28 UTC (rev 6134) @@ -19,9 +19,9 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.SQLWarning; +import java.util.ArrayList; import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSetUpdateableTableModel; -import net.sourceforge.squirrel_sql.fw.util.ExceptionFormatter; /** * This default implementation of the sql executer handler simply notifies the @@ -59,7 +59,7 @@ { } - public void sqlExecutionException(Throwable th, String postErrorString) + public String sqlExecutionException(Throwable th, String postErrorString) { String msg = "Error: "; @@ -82,7 +82,8 @@ } _session.showErrorMessage(msg); - } + return msg; + } public void sqlExecutionWarning(SQLWarning warn) { @@ -93,7 +94,7 @@ { } - public void sqlCloseExecutionHandler() + public void sqlCloseExecutionHandler(ArrayList<String> sqlExecErrorMsgs, String lastExecutedStatement) { } } \ No newline at end of file Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISQLExecuterHandler.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISQLExecuterHandler.java 2011-01-03 01:58:23 UTC (rev 6133) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISQLExecuterHandler.java 2011-01-08 14:38:28 UTC (rev 6134) @@ -19,6 +19,7 @@ */ import java.sql.ResultSet; import java.sql.SQLWarning; +import java.util.ArrayList; import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException; import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSetUpdateableTableModel; @@ -70,7 +71,7 @@ /** Called when the SQLExecutor terminates due to an exception */ - public void sqlExecutionException(Throwable ex, String postErrorString); + public String sqlExecutionException(Throwable th, String postErrorString); /** Called when a SQLWarning is received during execuion of the sql*/ public void sqlExecutionWarning(SQLWarning warn); @@ -84,6 +85,8 @@ * Tell the execution handler that we don't need it anymore * In SQLExecutionHandler this will close the cancel panel. * + * @param sqlExecErrorMsgs null if no error occurred + * @param lastExecutedStatement */ - public void sqlCloseExecutionHandler(); + public void sqlCloseExecutionHandler(ArrayList<String> sqlExecErrorMsgs, String lastExecutedStatement); } \ No newline at end of file Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/MessagePanel.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/MessagePanel.java 2011-01-03 01:58:23 UTC (rev 6133) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/MessagePanel.java 2011-01-08 14:38:28 UTC (rev 6134) @@ -56,8 +56,9 @@ /** Internationalized strings for this class. */ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(MessagePanel.class); + public static final Color ERROR_MESSAGE_FG = new Color(255,102,102); - /** Popup menu for this component. */ + /** Popup menu for this component. */ private final TextPopupMenu _popupMenu = new MessagePanelPopupMenu(); /** @@ -150,7 +151,7 @@ SimpleAttributeSet saSetErrorHistory = new SimpleAttributeSet(); //StyleConstants.setBackground(saSetErrorHistory, Color.pink); - StyleConstants.setForeground(saSetErrorHistory, new Color(255,102,102)); + StyleConstants.setForeground(saSetErrorHistory, ERROR_MESSAGE_FG); _saSetHistoryBySaSet.put(_saSetError, saSetErrorHistory); // ////////////////////////////////////////////////////////////////// Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecuterTask.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecuterTask.java 2011-01-03 01:58:23 UTC (rev 6133) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecuterTask.java 2011-01-08 14:38:28 UTC (rev 6134) @@ -31,6 +31,7 @@ import java.sql.SQLException; import java.sql.SQLWarning; import java.sql.Statement; +import java.util.ArrayList; import javax.swing.SwingUtilities; @@ -143,6 +144,9 @@ String lastExecutedStatement = null; int statementCount = 0; final SessionProperties props = _session.getProperties(); + + ArrayList<String> sqlExecErrorMsgs = new ArrayList<String>(); + try { final ISQLConnection conn = _session.getSQLConnection(); @@ -237,11 +241,11 @@ { if(1 < statementCount) { - handleError(ex, "Error occured in:\n" + lastExecutedStatement); + sqlExecErrorMsgs.add(handleError(ex, "Error occured in:\n" + lastExecutedStatement)); } else { - handleError(ex, null); + sqlExecErrorMsgs.add(handleError(ex, null)); } } } @@ -266,11 +270,11 @@ { if(props.getAbortOnError() && 1 < statementCount) { - handleError(ex, "Error occured in:\n" + lastExecutedStatement); + sqlExecErrorMsgs.add(handleError(ex, "Error occured in:\n" + lastExecutedStatement)); } else { - handleError(ex, null); + sqlExecErrorMsgs.add(handleError(ex, null)); } if(false == ex instanceof SQLException) @@ -301,7 +305,7 @@ } if (_handler != null) { - _handler.sqlCloseExecutionHandler(); + _handler.sqlCloseExecutionHandler(sqlExecErrorMsgs, lastExecutedStatement); } if (schemaCheck) { @@ -646,10 +650,14 @@ } } - private void handleError(Throwable th, String postErrorString) + private String handleError(Throwable th, String postErrorString) { if (_handler != null) - _handler.sqlExecutionException(th, postErrorString); + { + return _handler.sqlExecutionException(th, postErrorString); + } + + return null; } Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanel.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanel.java (rev 0) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanel.java 2011-01-08 14:38:28 UTC (rev 6134) @@ -0,0 +1,58 @@ +package net.sourceforge.squirrel_sql.client.session.mainpanel; + +import net.sourceforge.squirrel_sql.fw.util.StringManager; +import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; + +import javax.swing.*; +import java.awt.*; + +public class CancelPanel extends JPanel +{ + private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(CancelPanel.class); + + JLabel sqlLbl = new JLabel(); + JLabel currentStatusLbl = new JLabel(); + JButton cancelBtn; + + + public CancelPanel() + { + super(new GridBagLayout()); + + // i18n[SQLResultExecuterPanel.cancelButtonLabel=Cancel] + String label = s_stringMgr.getString("SQLResultExecuterPanel.cancelButtonLabel"); + cancelBtn = new JButton(label); + + GridBagConstraints gbc = new GridBagConstraints(); + + gbc.anchor = GridBagConstraints.WEST; + gbc.insets = new Insets(5, 10, 5, 10); + + gbc.gridx = 0; + gbc.gridy = 0; + + // i18n[SQLResultExecuterPanel.sqlLabel=SQL:] + label = s_stringMgr.getString("SQLResultExecuterPanel.sqlLabel"); + add(new JLabel(label), gbc); + + gbc.weightx = 1; + ++gbc.gridx; + add(sqlLbl, gbc); + + gbc.weightx = 0; + gbc.gridx = 0; + ++gbc.gridy; + // i18n[SQLResultExecuterPanel.statusLabel=Status:] + label = + s_stringMgr.getString("SQLResultExecuterPanel.statusLabel"); + add(new JLabel(label), gbc); + + ++gbc.gridx; + add(currentStatusLbl, gbc); + + gbc.gridx = 0; + ++gbc.gridy; + gbc.fill = GridBagConstraints.NONE; + add(cancelBtn, gbc); + } +} Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java (rev 0) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java 2011-01-08 14:38:28 UTC (rev 6134) @@ -0,0 +1,112 @@ +package net.sourceforge.squirrel_sql.client.session.mainpanel; + +import net.sourceforge.squirrel_sql.fw.gui.GUIUtils; +import net.sourceforge.squirrel_sql.fw.util.StringManager; +import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; + +import javax.swing.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +class CancelPanelCtrl +{ + private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(CancelPanelCtrl.class); + + private CancelPanel _panel; + + + /** + * Total number of queries that will be executed. + */ + private int _queryCount; + + /** + * Number of the query currently being executed (starts from 1). + */ + private int _currentQueryIndex = 0; + private CancelPanelListener _listener; + + CancelPanelCtrl(CancelPanelListener listener) + { + _listener = listener; + _panel = new CancelPanel(); + + _panel.cancelBtn.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + onCancel(); + } + }); + + + } + + void incCurrentQueryIndex() + { + ++_currentQueryIndex; + } + + void setSQL(final String sql) + { + Runnable runnable = new Runnable() + { + public void run() + { + // i18n[SQLResultExecuterPanel.currentSQLLabel={0} of {1} - {2}] + String label = + s_stringMgr.getString("SQLResultExecuterPanel.currentSQLLabel", + new Object[]{String.valueOf(_currentQueryIndex), + String.valueOf(_queryCount), + sql}); + + _panel.sqlLbl.setText(label); + } + }; + + GUIUtils.processOnSwingEventThread(runnable); + + } + + void setStatusLabel(final String text) + { + Runnable runnable = new Runnable() + { + public void run() + { + _panel.currentStatusLbl.setText(text); + } + }; + + GUIUtils.processOnSwingEventThread(runnable); + } + + void setQueryCount(int value) + { + _queryCount = value; + _currentQueryIndex = 0; + } + + int getTotalCount() + { + return _queryCount; + } + + int getCurrentQueryIndex() + { + return _currentQueryIndex; + } + + + private void onCancel() + { + _listener.cancelRequested(); + } + + + CancelPanel getPanel() + { + return _panel; + } +} Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelListener.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelListener.java (rev 0) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelListener.java 2011-01-08 14:38:28 UTC (rev 6134) @@ -0,0 +1,6 @@ +package net.sourceforge.squirrel_sql.client.session.mainpanel; + +public interface CancelPanelListener +{ + void cancelRequested(); +} Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ErrorPanel.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ErrorPanel.java (rev 0) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ErrorPanel.java 2011-01-08 14:38:28 UTC (rev 6134) @@ -0,0 +1,206 @@ +package net.sourceforge.squirrel_sql.client.session.mainpanel; + +import net.sourceforge.squirrel_sql.client.action.SquirrelAction; +import net.sourceforge.squirrel_sql.client.session.ISession; +import net.sourceforge.squirrel_sql.client.session.MessagePanel; +import net.sourceforge.squirrel_sql.fw.util.StringManager; +import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; +import net.sourceforge.squirrel_sql.fw.util.StringUtilities; +import net.sourceforge.squirrel_sql.fw.util.Utilities; + +import javax.swing.*; +import java.awt.*; +import java.awt.datatransfer.Clipboard; +import java.awt.datatransfer.StringSelection; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.ArrayList; + +public class ErrorPanel extends JPanel +{ + private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(ErrorPanel.class); + private ErrorPanelListener _errorPanelListener; + + private JPopupMenu _popUp = new JPopupMenu(); + private JTextArea _txtArea; + + + public ErrorPanel(ISession session, ArrayList<String> sqlExecErrorMsgs, String lastExecutedStatement) + { + super(new BorderLayout()); + + _txtArea = new JTextArea(); + + _txtArea.setFont(_txtArea.getFont().deriveFont(Font.BOLD)); + _txtArea.setForeground(Color.red); + _txtArea.setSelectedTextColor(Color.red); + _txtArea.setEditable(false); + + + + for (int i = 0; i < sqlExecErrorMsgs.size(); i++) + { + _txtArea.append(sqlExecErrorMsgs.get(i)); + + if(i < sqlExecErrorMsgs.size() - 1) + { + _txtArea.append("\n\n"); + } + } + + JScrollPane scrp = new JScrollPane(_txtArea); + + + add(createNorthPanel(session, sqlExecErrorMsgs, lastExecutedStatement), BorderLayout.NORTH); + add(scrp, BorderLayout.CENTER); + + initPopup(); + + scrp.scrollRectToVisible(new Rectangle(0,0,1,1)); + } + + private void initPopup() + { + JMenuItem mnuCopyAll = new JMenuItem(s_stringMgr.getString("ErrorPanel.copyAll")); + mnuCopyAll.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + onCopyAll(); + } + }); + _popUp.add(mnuCopyAll); + + JMenuItem mnuCopySelection = new JMenuItem(s_stringMgr.getString("ErrorPanel.copySelection")); + mnuCopySelection.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + onCopySelection(); + } + }); + _popUp.add(mnuCopySelection); + + + _txtArea.addMouseListener(new MouseAdapter() + { + public void mousePressed(MouseEvent evt) + { + maybeShowPopup(evt); + } + + public void mouseReleased(MouseEvent evt) + { + maybeShowPopup(evt); + } + + }); + + + } + + private void onCopyAll() + { + if(null == _txtArea.getText()) + { + return; + } + + Clipboard clip = Toolkit.getDefaultToolkit().getSystemClipboard(); + StringSelection data = new StringSelection(_txtArea.getText().trim()); + clip.setContents(data, data); + } + + private void onCopySelection() + { + if(null == _txtArea.getSelectedText()) + { + return; + } + + Clipboard clip = Toolkit.getDefaultToolkit().getSystemClipboard(); + StringSelection data = new StringSelection(_txtArea.getSelectedText().trim()); + clip.setContents(data, data); + } + + private JPanel createNorthPanel(ISession session, ArrayList<String> sqlExecErrorMsgs, String lastExecutedStatement) + { + JPanel ret = new JPanel(new GridBagLayout()); + + + String msg = s_stringMgr.getString("ErrorPanel.NoErrorStatement") ; + if(1 < sqlExecErrorMsgs.size() && false == session.getProperties().getAbortOnError()) + { + msg = s_stringMgr.getString("ErrorPanel.MultibleStatements") ; + } + else if(null != lastExecutedStatement && 0 < lastExecutedStatement.trim().length()) + { + msg = s_stringMgr.getString("ErrorPanel.occuredIn", StringUtilities.cleanString(lastExecutedStatement.trim())) ; + } + + String escapedMsg = Utilities.escapeHtmlChars(msg); + String htmlMsg = "<html><pre> " + escapedMsg + "</pre></html>"; + + + GridBagConstraints gbc; + + gbc = new GridBagConstraints(0,0,1,1,1,1, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(0,0,0,5),0,0 ); + ret.add(new JLabel(htmlMsg), gbc); + + + + gbc = new GridBagConstraints(1,0,1,1,0,0, GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,0,0,0),0,0 ); + ret.add(new TabButton(new CloseAction(session)), gbc); + + return ret; + } + + public void setErrorPanelListener(ErrorPanelListener errorPanelListener) + { + _errorPanelListener = errorPanelListener; + } + + private class CloseAction extends SquirrelAction + { + CloseAction(ISession session) + { + super( + session.getApplication(), + session.getApplication().getResources()); + } + + public void actionPerformed(ActionEvent evt) + { + closeTab(); + } + } + + private void closeTab() + { + _errorPanelListener.removeErrorPanel(this); + } + + private final class TabButton extends JButton + { + TabButton(Action action) + { + super(action); + setMargin(new Insets(0, 0, 0, 0)); + setBorderPainted(false); + setText(""); + } + } + + + private void maybeShowPopup(MouseEvent evt) + { + if (evt.isPopupTrigger()) + { + _popUp.show(evt.getComponent(), evt.getX(), evt.getY()); + } + } + + +} Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ErrorPanelListener.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ErrorPanelListener.java (rev 0) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ErrorPanelListener.java 2011-01-08 14:38:28 UTC (rev 6134) @@ -0,0 +1,6 @@ +package net.sourceforge.squirrel_sql.client.session.mainpanel; + +public interface ErrorPanelListener +{ + public void removeErrorPanel(ErrorPanel errorPanel); +} Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ISQLExecutionHandlerListener.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ISQLExecutionHandlerListener.java (rev 0) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ISQLExecutionHandlerListener.java 2011-01-08 14:38:28 UTC (rev 6134) @@ -0,0 +1,22 @@ +package net.sourceforge.squirrel_sql.client.session.mainpanel; + +import net.sourceforge.squirrel_sql.client.session.SQLExecutionInfo; +import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSetUpdateableTableModel; +import net.sourceforge.squirrel_sql.fw.datasetviewer.ResultSetDataSet; +import net.sourceforge.squirrel_sql.fw.datasetviewer.ResultSetMetaDataDataSet; + +public interface ISQLExecutionHandlerListener +{ + void addResultsTab(SQLExecutionInfo info, + ResultSetDataSet rsds, + ResultSetMetaDataDataSet rsmdds, + IDataSetUpdateableTableModel model, + IResultTab resultTabToReplace); + + + void removeCancelPanel(CancelPanelCtrl cancelPanelCtrl, IResultTab resultTabToReplace); + + void setCancelPanel(CancelPanelCtrl cancelPanelCtrl); + + void addErrorPanel(ErrorPanel errorPanel); +} Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultFrame.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultFrame.java 2011-01-03 01:58:23 UTC (rev 6133) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultFrame.java 2011-01-08 14:38:28 UTC (rev 6134) @@ -159,4 +159,9 @@ return session.getTitle() + " - " + tab.getViewableSqlString(); } + + public IResultTab getTab() + { + return _tab; + } } Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java 2011-01-03 01:58:23 UTC (rev 6133) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java 2011-01-08 14:38:28 UTC (rev 6134) @@ -53,6 +53,7 @@ import net.sourceforge.squirrel_sql.client.session.SQLExecutionInfo; import net.sourceforge.squirrel_sql.client.session.EditableSqlCheck; import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties; +import net.sourceforge.squirrel_sql.fw.util.Utilities; public class ResultTab extends JPanel implements IHasIdentifier, IResultTab { @@ -143,7 +144,7 @@ _session = session; _sqlPanel = sqlPanel; _id = id; - reInit(creator, exInfo); + init(creator, exInfo); createGUI(); @@ -153,7 +154,7 @@ /** * @see net.sourceforge.squirrel_sql.client.session.mainpanel.IResultTab#reInit(net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSetUpdateableTableModel, net.sourceforge.squirrel_sql.client.session.SQLExecutionInfo) */ - private void reInit(IDataSetUpdateableTableModel creator, SQLExecutionInfo exInfo) + private void init(IDataSetUpdateableTableModel creator, SQLExecutionInfo exInfo) { _creator = creator; _creator.addListener(new DataSetUpdateableTableModelListener() @@ -245,7 +246,7 @@ final int rowCount = _resultSetOutput.getRowCount(); final int maxRows =_exInfo.getMaxRows(); - String escapedSql = escapeHtmlChars(_sql); + String escapedSql = Utilities.escapeHtmlChars(_sql); if (maxRows > 0 && rowCount >= maxRows) { @@ -272,15 +273,6 @@ _queryInfoPanel.load(rsds, rowCount, exInfo); } - private String escapeHtmlChars(String sql) - { - String buf = sql.replaceAll("&", "&"); - buf = buf.replaceAll("<", "<"); - buf = buf.replaceAll("<", ">"); - buf = buf.replaceAll("\"", """); - return buf; - } - /** * @see net.sourceforge.squirrel_sql.client.session.mainpanel.IResultTab#clear() */ @@ -334,7 +326,7 @@ public void closeTab() { add(_tp, BorderLayout.CENTER); - _sqlPanel.closeTab(this); + _sqlPanel.closeResultTab(this); } /** @@ -518,7 +510,7 @@ public void actionPerformed(ActionEvent evt) { - _sqlPanel.createWindow(ResultTab.this); + _sqlPanel.createSQLResultFrame(ResultTab.this); } } Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java (rev 0) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java 2011-01-08 14:38:28 UTC (rev 6134) @@ -0,0 +1,457 @@ +package net.sourceforge.squirrel_sql.client.session.mainpanel; + +import net.sourceforge.squirrel_sql.client.preferences.SquirrelPreferences; +import net.sourceforge.squirrel_sql.client.session.ISQLExecuterHandler; +import net.sourceforge.squirrel_sql.client.session.ISession; +import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask; +import net.sourceforge.squirrel_sql.client.session.SQLExecutionInfo; +import net.sourceforge.squirrel_sql.client.session.event.ISQLExecutionListener; +import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties; +import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException; +import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSetUpdateableTableModel; +import net.sourceforge.squirrel_sql.fw.datasetviewer.ResultSetDataSet; +import net.sourceforge.squirrel_sql.fw.datasetviewer.ResultSetMetaDataDataSet; +import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory; +import net.sourceforge.squirrel_sql.fw.dialects.DialectType; +import net.sourceforge.squirrel_sql.fw.sql.SQLExecutionException; +import net.sourceforge.squirrel_sql.fw.util.StringManager; +import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; +import net.sourceforge.squirrel_sql.fw.util.StringUtilities; +import net.sourceforge.squirrel_sql.fw.util.log.ILogger; +import net.sourceforge.squirrel_sql.fw.util.log.LoggerController; + +import java.sql.ResultSet; +import java.sql.SQLWarning; +import java.text.NumberFormat; +import java.util.ArrayList; + +/** + * This class is the handler for the execution of sql against the SQLExecuterPanel + */ +class SQLExecutionHandler implements ISQLExecuterHandler +{ + private static final ILogger s_log = + LoggerController.createLogger(SQLExecutionHandler.class); + + private static final StringManager s_stringMgr = + StringManagerFactory.getStringManager(SQLExecutionHandler.class); + + + private CancelPanelCtrl _cancelPanelCtrl; + private SQLExecuterTask _executer; + private ISession _session; + private ISQLExecutionHandlerListener _executionHandlerListener; + + private static enum SQLType + { + INSERT, SELECT, UPDATE, DELETE, UNKNOWN + } + + + + /** + * Hold onto the current ResultDataSet so if the execution is + * cancelled then this can be cancelled. + */ + private ResultSetDataSet rsds = null; + + private String sqlToBeExecuted = null; + private SQLType sqlType = null; + private IResultTab _resultTabToReplace; + private boolean _largeScript = false; + private double _scriptTotalTime = 0; + private double _scriptQueryTime = 0; + private double _scriptOutptutTime = 0; + private int _scriptRowsInserted = 0; + private int _scriptRowsSelected = 0; + private int _scriptRowsUpdated = 0; + private int _scriptRowsDeleted = 0; + + public SQLExecutionHandler(IResultTab resultTabToReplace, + ISession session, + String sql, + ISQLExecutionHandlerListener executionHandlerListener, + ISQLExecutionListener[] executionListeners) + { + _session = session; + _executionHandlerListener = executionHandlerListener; + + + _executer = new SQLExecuterTask(_session, sql, this, executionListeners); + SquirrelPreferences prefs = _session.getApplication().getSquirrelPreferences(); + + if (prefs.getLargeScriptStmtCount() > 0 + && _executer.getQueryCount() > prefs.getLargeScriptStmtCount()) + { + _executer.setExecutionListeners(new ISQLExecutionListener[0]); + setLargeScript(true); + } + + + + _resultTabToReplace = resultTabToReplace; + _cancelPanelCtrl = new CancelPanelCtrl(new CancelPanelListener() + { + @Override + public void cancelRequested() + { + onCancelRequested(); + } + }); + _executionHandlerListener.setCancelPanel(_cancelPanelCtrl); + + + + + _session.getApplication().getThreadPool().addTask(_executer); + } + + private void onCancelRequested() + { + try + { + if (_executer != null) + { + _executer.cancel(); + } + } + catch (Throwable th) + { + s_log.error("Error occured cancelling SQL", th); + } + } + + /** + * Set whether or not the script is large. If the script is large, then + * do some performance optimizations with the GUI so that it remains + * responsive. If the UI is not responsive, then the user is not able + * to see what is happening, nor are they able to control it (cancelling + * becomes ineffective) + * + * @param aBoolean whether or not the script is large. + */ + public void setLargeScript(boolean aBoolean) + { + _largeScript = aBoolean; + } + + /** + * Determines whether or not the current statement SQL should be rendered. + * Since too many statements can cause the UI to stop rendering the + * statements, we back off rendering after many statements so that the UI + * can continue to provide feedback to the user. + * + * @param current + * @param total + * @return + */ + private boolean shouldRenderSQL(int current, int total) + { + if (!_largeScript) + { + return true; + } + boolean result = true; + // Back-off a bit after a hundred updates to allow the UI to update + if (total > 200 && current > 100 && current % 10 != 0) + { + result = false; + } + if (total > 1000 && current > 500 && current % 50 != 0) + { + result = false; + } + if (total > 2000 && current > 1000 && current % 100 != 0) + { + result = false; + } + return result; + } + + public void sqlToBeExecuted(final String sql) + { + _cancelPanelCtrl.incCurrentQueryIndex(); + int currentStmtCount = _cancelPanelCtrl.getCurrentQueryIndex(); + if (!shouldRenderSQL(currentStmtCount, _cancelPanelCtrl.getTotalCount())) + { + return; + } + final String cleanSQL = StringUtilities.cleanString(sql); + sqlToBeExecuted = cleanSQL; + sqlType = getSQLType(cleanSQL); + + _cancelPanelCtrl.setSQL(sqlToBeExecuted); + + // i18n[SQLResultExecuterPanel.execStatus=Executing SQL...] + String status = s_stringMgr.getString("SQLResultExecuterPanel.execStatus"); + _cancelPanelCtrl.setStatusLabel(status); + } + + private SQLType getSQLType(String sql) + { + SQLType result = SQLType.UNKNOWN; + if (sql.toLowerCase().startsWith("insert")) + { + result = SQLType.INSERT; + } + if (sql.toLowerCase().startsWith("update")) + { + result = SQLType.UPDATE; + } + if (sql.toLowerCase().startsWith("select")) + { + result = SQLType.SELECT; + } + if (sql.toLowerCase().startsWith("delete")) + { + result = SQLType.DELETE; + } + return result; + } + + + /** + * This will - depending on the size of the script - print a message + * indicating the time that it took to execute one or more queries. + * When executing a large script (as defined by the user, but default is + * > 200 statements) we don't want to keep sending messages to the + * message panel, otherwise the UI will get behind and slow the execution + * of the script and prevent the user from cancelling the operation. So + * this method will track the total time when executing a large script, + * otherwise for small scripts it puts out a message for every statement. + */ + public void sqlExecutionComplete(SQLExecutionInfo exInfo, + int processedStatementCount, + int statementCount) + { + double executionLength = ((double) exInfo.getSQLExecutionElapsedMillis()) / 1000; + double outputLength = ((double) exInfo.getResultsProcessingElapsedMillis()) / 1000; + double totalLength = executionLength + outputLength; + Integer numberResultRowsRead = exInfo.getNumberResultRowsRead(); + + if (_largeScript) + { + // Track the time in aggregate for the script. + _scriptQueryTime += executionLength; + _scriptOutptutTime += outputLength; + _scriptTotalTime += totalLength; + + // When we get to the last statement, if the script is large, + // show the user the total execution time. + if (statementCount == processedStatementCount) + { + printScriptExecDetails(statementCount, + _scriptQueryTime, + _scriptOutptutTime, + _scriptTotalTime); + } + } + else + { + printStatementExecTime( + processedStatementCount, + statementCount, + numberResultRowsRead, + executionLength, + outputLength, + totalLength); + } + } + + private void printScriptExecDetails(int statementCount, + double executionLength, + double outputLength, + double totalLength) + { + final NumberFormat nbrFmt = NumberFormat.getNumberInstance(); + + Object[] args = new Object[]{ + Integer.valueOf(statementCount), + nbrFmt.format(totalLength), + nbrFmt.format(executionLength), + nbrFmt.format(outputLength) + }; + + //i18n[SQLResultExecuterPanel.scriptQueryStatistics=Executed {0} + //queries; elapsed time (seconds) - Total: {1}, SQL query: {2}, + //Building output: {3}] + String stats = s_stringMgr.getString("SQLResultExecuterPanel.scriptQueryStatistics", args); + + String[] counts = + new String[]{Integer.toString(_scriptRowsInserted), + Integer.toString(_scriptRowsSelected), + Integer.toString(_scriptRowsUpdated), + Integer.toString(_scriptRowsDeleted)}; + + //i18n[SQLResultExecuterPanel.scriptStmtCounts=Row update + //counts: {0} Inserts, {1} Selects, {2} Updates, {3} Deletes + String msg = + s_stringMgr.getString("SQLResultExecuterPanel.scriptStmtCounts", counts); + + _session.showMessage(msg); + _session.showMessage(stats); + } + + private void printStatementExecTime( + int processedStatementCount, + int statementCount, + Integer numberResultRowsRead, + double executionLength, + double outputLength, + double totalLength) + { + final NumberFormat nbrFmt = NumberFormat.getNumberInstance(); + + Object[] args = new Object[]{ + Integer.valueOf(processedStatementCount), + Integer.valueOf(statementCount), + numberResultRowsRead == null ? 0 : numberResultRowsRead, + nbrFmt.format(totalLength), + nbrFmt.format(executionLength), + nbrFmt.format(outputLength) + }; + + //i18n[SQLResultExecuterPanel.queryStatistics=Query {0} of {1} + //elapsed time (seconds) - Total: {2}, SQL query: {3}, + //Building output: {4}] + String stats = s_stringMgr.getString("SQLResultExecuterPanel.queryStatistics", args); + + _session.showMessage(stats); + } + + public void sqlExecutionCancelled() + { + if (rsds != null) + { + rsds.cancelProcessing(); + } + // i18n[SQLResultExecuterPanel.canceleRequested=Query execution cancel requested by user.] +// String canc = +// s_stringMgr.getString("SQLResultExecuterPanel.canceleRequested"); +// getSession().getMessageHandler().showMessage(canc); + } + + public void sqlDataUpdated(int updateCount) + { + + Integer count = Integer.valueOf(updateCount); + String msg = ""; + + switch (sqlType) + { + case INSERT: + if (_largeScript) + { + _scriptRowsInserted++; + } + else + { + // i18n[SQLResultExecuterPanel.rowsUpdated={0} Row(s) Inserted] + msg = s_stringMgr.getString("SQLResultExecuterPanel.rowsInserted", count); + } + break; + case SELECT: + if (_largeScript) + { + _scriptRowsSelected++; + } + else + { + // i18n[SQLResultExecuterPanel.rowsSelected={0} Row(s) Selected] + msg = s_stringMgr.getString("SQLResultExecuterPanel.rowsSelected", count); + } + break; + case UPDATE: + if (_largeScript) + { + _scriptRowsUpdated++; + } + else + { + // i18n[SQLResultExecuterPanel.rowsUpdated={0} Row(s) Updated] + msg = s_stringMgr.getString("SQLResultExecuterPanel.rowsUpdated", count); + } + break; + case DELETE: + if (_largeScript) + { + _scriptRowsDeleted++; + } + else + { + // i18n[SQLResultExecuterPanel.rowsDeleted={0} Row(s) Deleted] + msg = s_stringMgr.getString("SQLResultExecuterPanel.rowsDeleted", count); + } + break; + } + if (_largeScript) + { + return; + } + _session.showMessage(msg); + } + + public void sqlResultSetAvailable(ResultSet rs, SQLExecutionInfo info, IDataSetUpdateableTableModel model) + throws DataSetException + { + // i18n[SQLResultExecuterPanel.outputStatus=Building output...] + String outputStatus = s_stringMgr.getString("SQLResultExecuterPanel.outputStatus"); + + _cancelPanelCtrl.setStatusLabel(outputStatus); + rsds = new ResultSetDataSet(); + + SessionProperties props = _session.getProperties(); + + ResultSetMetaDataDataSet rsmdds = null; + if (props.getShowResultsMetaData()) + { + rsmdds = new ResultSetMetaDataDataSet(rs); + } + DialectType dialectType = + DialectFactory.getDialectType(_session.getMetaData()); + info.setNumberResultRowsRead(rsds.setResultSet(rs, dialectType)); + + _executionHandlerListener.addResultsTab(info, rsds, rsmdds, model, _resultTabToReplace); + rsds = null; + } + + public void sqlExecutionWarning(SQLWarning warn) + { + _session.showMessage(warn); + } + + public void sqlStatementCount(int statementCount) + { + _cancelPanelCtrl.setQueryCount(statementCount); + } + + public void sqlCloseExecutionHandler(ArrayList<String> sqlExecErrorMsgs, String lastExecutedStatement) + { + _executionHandlerListener.removeCancelPanel(_cancelPanelCtrl, _resultTabToReplace); + + if (null != sqlExecErrorMsgs && 0 < sqlExecErrorMsgs.size() && _session.getProperties().getShowSQLErrorsInTab()) + { + _executionHandlerListener.addErrorPanel(new ErrorPanel(_session, sqlExecErrorMsgs, lastExecutedStatement)); + } + + _executer = null; + } + + public String sqlExecutionException(Throwable th, String postErrorString) + { + SQLExecutionException ex = + new SQLExecutionException(th, postErrorString); + + String message = _session.formatException(ex); + + _session.showErrorMessage(message); + + if (_session.getProperties().getWriteSQLErrorsToLog()) + { + s_log.info(message); + } + + return message; + } + +} Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLHistoryController.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLHistoryController.java 2011-01-03 01:58:23 UTC (rev 6133) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLHistoryController.java 2011-01-08 14:38:28 UTC (rev 6134) @@ -36,7 +36,7 @@ @SuppressWarnings("serial") -public SQLHistoryController(ISession session, ISQLPanelAPI sqlPanelAPI, ArrayList<SQLHistoryItem> items) + public SQLHistoryController(ISession session, ISQLPanelAPI sqlPanelAPI, ArrayList<SQLHistoryItem> items) { _sqlPanelAPI = sqlPanelAPI; _sqlHistoryItemWrappers = SQLHistoryItemWrapper.wrap(items); @@ -94,7 +94,7 @@ // i18n[SQLHistoryController.mnuAppendSelectionToEditor=Append selected statements to SQL editor] - JMenuItem mnuAppendSelectionToEditor = new JMenuItem("Append selected statements to SQL editor"); + JMenuItem mnuAppendSelectionToEditor = new JMenuItem(s_stringMgr.getString("SQLHistoryController.mnuAppendSelectionToEditor")); mnuAppendSelectionToEditor.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java 2011-01-03 01:58:23 UTC (rev 6133) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java 2011-01-08 14:38:28 UTC (rev 6134) @@ -19,30 +19,18 @@ */ import java.awt.BorderLayout; import java.awt.Component; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.SQLWarning; -import java.text.NumberFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; import javax.swing.Action; import javax.swing.ImageIcon; -import javax.swing.JButton; import javax.swing.JComponent; -import javax.swing.JLabel; import javax.swing.JLayeredPane; import javax.swing.JMenuItem; import javax.swing.JOptionPane; @@ -58,9 +46,7 @@ import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.DialogWidget; import net.sourceforge.squirrel_sql.client.preferences.SquirrelPreferences; import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel; -import net.sourceforge.squirrel_sql.client.session.ISQLExecuterHandler; import net.sourceforge.squirrel_sql.client.session.ISession; -import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask; import net.sourceforge.squirrel_sql.client.session.SQLExecutionInfo; import net.sourceforge.squirrel_sql.client.session.action.CloseAllSQLResultTabsAction; import net.sourceforge.squirrel_sql.client.session.action.CloseAllSQLResultTabsButCurrentAction; @@ -72,16 +58,11 @@ import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties; import net.sourceforge.squirrel_sql.fw.datasetviewer.*; import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypeClob; -import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory; -import net.sourceforge.squirrel_sql.fw.dialects.DialectType; -import net.sourceforge.squirrel_sql.fw.id.IIdentifier; import net.sourceforge.squirrel_sql.fw.id.IntegerIdentifierFactory; import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection; -import net.sourceforge.squirrel_sql.fw.sql.SQLExecutionException; import net.sourceforge.squirrel_sql.fw.util.Resources; import net.sourceforge.squirrel_sql.fw.util.StringManager; import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; -import net.sourceforge.squirrel_sql.fw.util.StringUtilities; import net.sourceforge.squirrel_sql.fw.util.log.ILogger; import net.sourceforge.squirrel_sql.fw.util.log.LoggerController; /** @@ -91,17 +72,15 @@ public class SQLResultExecuterPanel extends JPanel implements ISQLResultExecuter { - static final long serialVersionUID = 6961615570741567740L; - /** Logger for this class. */ private static final ILogger s_log = LoggerController.createLogger(SQLResultExecuterPanel.class); /** Internationalized strings for this class. */ - private static final StringManager s_stringMgr = + private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(SQLResultExecuterPanel.class); - - static interface i18n { + + static interface i18n { // i18n[SQLResultExecuterPanel.exec=Executing SQL] String EXEC_SQL_MSG = s_stringMgr.getString("SQLResultExecuterPanel.exec"); @@ -118,20 +97,9 @@ /** Each tab is a <TT>ResultTab</TT> showing the results of a query. */ private JTabbedPane _tabbedExecutionsPanel; - /** - * Collection of <TT>ResultTabInfo</TT> objects for all - * <TT>ResultTab</TT> objects that have been created. Keyed - * by <TT>ResultTab.getIdentifier()</TT>. - */ - private Map<IIdentifier,ResultTabInfo> _allTabs = - new HashMap<IIdentifier,ResultTabInfo>(); + private ArrayList<ResultFrame>_sqlResultFrames = new ArrayList<ResultFrame>(); - /** - * Pool of <TT>ResultTabInfo</TT> objects currently being used. - */ - private ArrayList<ResultTabInfo> _usedTabs = new ArrayList<ResultTabInfo>(); - /** Listeners */ private EventListenerList _listeners = new EventListenerList(); @@ -141,10 +109,6 @@ private SquirrelPreferences _prefs = null; - /** Reference to the executor so that it can be called from the CancelPanel*/ - private SQLExecuterTask _executer; - - private static enum SQLType { INSERT, SELECT, UPDATE, DELETE, UNKNOWN }; /** * Ctor. * @@ -269,6 +233,8 @@ public void execute(ISQLEntryPanel sqlPanel) { + removeErrorPanels(); + String sql = sqlPanel.getSQLToBeExecuted(); if (sql != null && sql.length() > 0) { @@ -283,42 +249,108 @@ } } - public void executeSQL(String sql) + private void removeErrorPanels() + { + ArrayList<ErrorPanel> toRemove = new ArrayList<ErrorPanel>(); + + for (int i = 0; i < _tabbedExecutionsPanel.getTabCount(); i++) + { + Component tab = _tabbedExecutionsPanel.getComponentAt(i); + if(tab instanceof ErrorPanel) + { + toRemove.add((ErrorPanel) tab); + } + } + + for (ErrorPanel errorPanel : toRemove) + { + closeTab(errorPanel); + } + } + + public void executeSQL(String sql) { - if (sql != null && sql.trim().length() > 0) - { - String origSQL = sql; - sql = fireSQLToBeExecutedEvent(sql); - - // This can happen if an impl of ISQLExecutionListener returns null - // from the statementExecuting API method, to indicate that the SQL - // shouldn't be executed. - if (sql == null) { - s_log.info( - "executeSQL: An ISQLExecutionListener veto'd execution of "+ - "the following SQL: "+origSQL); - return; + if (sql != null && sql.trim().length() > 0) + { + String origSQL = sql; + sql = fireSQLToBeExecutedEvent(sql); + + // This can happen if an impl of ISQLExecutionListener returns null + // from the statementExecuting API method, to indicate that the SQL + // shouldn't be executed. + if (sql == null) + { + s_log.info( + "executeSQL: An ISQLExecutionListener veto'd execution of " + + "the following SQL: " + origSQL); + return; + } + + ISQLExecutionListener[] executionListeners = + _listeners.getListeners(ISQLExecutionListener.class); + + ISQLExecutionHandlerListener executionHandlerListener = createSQLExecutionHandlerListener(); + + new SQLExecutionHandler((IResultTab)null, _session, sql, executionHandlerListener, executionListeners); + } + } + + private ISQLExecutionHandlerListener createSQLExecutionHandlerListener() + { + return + new ISQLExecutionHandlerListener() + { + @Override + public void addResultsTab(SQLExecutionInfo info, ResultSetDataSet rsds, ResultSetMetaDataDataSet rsmdds, IDataSetUpdateableTableModel model, IResultTab resultTabToReplace) + { + onAddResultsTab(info, rsds, rsmdds, model, resultTabToReplace); } - - ISQLExecutionListener[] executionListeners = - _listeners.getListeners(ISQLExecutionListener.class); - SQLExecutionHandler handler = new SQLExecutionHandler(null); - _executer = new SQLExecuterTask(_session, sql, handler, executionListeners); - - if (_prefs.getLargeScriptStmtCount() > 0 - && _executer.getQueryCount() > _prefs.getLargeScriptStmtCount()) { - _executer.setExecutionListeners(new ISQLExecutionListener[0]); - handler.setLargeScript(true); + + @Override + public void removeCancelPanel(CancelPanelCtrl cancelPanelCtrl, IResultTab resultTabToReplace) + { + onRemoveCancelPanel(cancelPanelCtrl, resultTabToReplace); } - - _session.getApplication().getThreadPool().addTask(_executer); - } - } + @Override + public void setCancelPanel(CancelPanelCtrl cancelPanelCtrl) + { + onSetCancelPanel(cancelPanelCtrl); + } + + @Override + public void addErrorPanel(ErrorPanel errorPanel) + { + onAddErrorPanel(errorPanel); + } + }; + } + + private void onAddErrorPanel(final ErrorPanel errorPanel) + { + Runnable runnable = new Runnable() + { + public void run() + { + _tabbedExecutionsPanel.add(s_stringMgr.getString("SQLResultExecuterPanel.ErrorTabHeader"), errorPanel); + _tabbedExecutionsPanel.setSelectedComponent(errorPanel); + errorPanel.setErrorPanelListener(new ErrorPanelListener() + { + @Override + public void removeErrorPanel(ErrorPanel errorPanel) + { + _tabbedExecutionsPanel.remove(errorPanel); + } + }); + } + }; + + SwingUtilities.invokeLater(runnable); + } + private void onRerunSQL(String sql, IResultTab resultTab) { - _executer = new SQLExecuterTask(_session, sql, new SQLExecutionHandler(resultTab), new ISQLExecutionListener[0]); - _session.getApplication().getThreadPool().addTask(_executer); + new SQLExecutionHandler(resultTab, _session, sql, createSQLExecutionHandlerListener(), new ISQLExecutionListener[0]); } @@ -327,16 +359,10 @@ */ public synchronized void closeAllSQLResultFrames() { - List<ResultTabInfo> tabs = new ArrayList<ResultTabInfo>(_usedTabs); - for (Iterator<ResultTabInfo> it = tabs.iterator(); it.hasNext();) - { - ResultTabInfo ti = it.next(); - if (ti._resultFrame != null) - { - ti._resultFrame.dispose(); - ti._resultFrame = null; - } - } + for (ResultFrame sqlResultFrame : _sqlResultFrames) + { + sqlResultFrame.dispose(); + } } /** @@ -344,32 +370,43 @@ */ public synchronized void closeAllSQLResultTabs() { - List<ResultTabInfo> tabs = new ArrayList<ResultTabInfo>(_usedTabs); - for (Iterator<ResultTabInfo> it = tabs.iterator(); it.hasNext();) - { - ResultTabInfo ti = it.next(); - if (ti._resultFrame == null) - { - closeTab(ti._tab); - } - } + ArrayList<Component> allTabs = getAllTabs(); + + for (Component tab : allTabs) + { + closeTab(tab); + } + } + private ArrayList<Component> getAllTabs() + { + ArrayList<Component> allTabs = new ArrayList<Component>(); + for (int i = 0; i < _tabbedExecutionsPanel.getTabCount(); i++) + { + Component component = _tabbedExecutionsPanel.getComponentAt(i); + if (false == component instanceof CancelPanel) + { + allTabs.add(component); + } + } + return allTabs; + } + public synchronized void closeAllButCurrentResultTabs() { Component selectedTab = _tabbedExecutionsPanel.getSelectedComponent(); - List<ResultTabInfo> tabs = new ArrayList<ResultTabInfo>(_usedTabs); - for (Iterator<ResultTabInfo> it = tabs.iterator(); it.hasNext();) + ArrayList<Component> allTabs = getAllTabs(); + + + for (Component tab : allTabs) { - ResultTabInfo ti = it.next(); - if(false == ti._tab.equals(selectedTab)) + if(tab != selectedTab) { - if (ti._resultFrame == null) - { - closeTab(ti._tab); - } + closeTab(tab); } + } } @@ -426,14 +463,20 @@ private int getIndexOfTab(IResultTab resultTab) { - if(null == resultTab) + return getIndexOfTab((JComponent)resultTab); + } + + + private int getIndexOfTab(JComponent tab) + { + if(null == tab) { return -1; } for (int i = 0; i < _tabbedExecutionsPanel.getTabCount(); i++) { - if (resultTab.equals(_tabbedExecutionsPanel.getComponentAt(i))) + if (tab == _tabbedExecutionsPanel.getComponentAt(i)) { return i; } @@ -446,19 +489,7 @@ public synchronized void closeCurrentResultTab() { Component selectedTab = _tabbedExecutionsPanel.getSelectedComponent(); - - List<ResultTabInfo> tabs = new ArrayList<ResultTabInfo>(_usedTabs); - for (Iterator<ResultTabInfo> it = tabs.iterator(); it.hasNext();) - { - ResultTabInfo ti = it.next(); - if(ti._tab.equals(selectedTab)) - { - if (ti._resultFrame == null) - { - closeTab(ti._tab); - } - } - } + closeTab(selectedTab); } /** @@ -478,6 +509,19 @@ closeAllSQLResultFrames(); } + private void closeTab(Component tab) + { + if(tab instanceof ErrorPanel) + { + _tabbedExecutionsPanel.remove(tab); + } + else if(tab instanceof ResultTab) + { + closeResultTab((ResultTab) tab); + } + } + + /** * Close the passed <TT>ResultTab</TT>. This is done by clearing * all data from the tab, removing it from the tabbed panel @@ -486,20 +530,17 @@ * @throws IllegalArgumentException * Thrown if a <TT>null</TT> <TT>ResultTab</TT> passed. */ - public void closeTab(ResultTab tab) + public void closeResultTab(ResultTab tab) { if (tab == null) { throw new IllegalArgumentException("Null ResultTab passed"); } s_log - .debug("SQLPanel.closeTab(" + tab.getIdentifier().toString() + .debug("SQLPanel.closeResultTab(" + tab.g... [truncated message content] |
From: <ger...@us...> - 2011-01-27 02:30:26
|
Revision: 6146 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6146&view=rev Author: gerdwagner Date: 2011-01-27 02:30:19 +0000 (Thu, 27 Jan 2011) Log Message: ----------- Fixed NullPointerException in Hibernate Plugin when executing HQL with 'view objects' switched on Modified Paths: -------------- trunk/sql12/doc/src/main/resources/changes.txt trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HQLCompletionInfoCollection.java trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HqlAliasParser.java trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/MappingInfoProvider.java trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/MappedClassInfo.java trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/HibernatePropertyReader.java Modified: trunk/sql12/doc/src/main/resources/changes.txt =================================================================== --- trunk/sql12/doc/src/main/resources/changes.txt 2011-01-13 20:55:17 UTC (rev 6145) +++ trunk/sql12/doc/src/main/resources/changes.txt 2011-01-27 02:30:19 UTC (rev 6146) @@ -18,6 +18,7 @@ 3148653: Missing App Icon on Mac OS X (Fix is available in the Mac OS X 3.2.1 installer file) +Fixed NullPointerException in Hibernate Plugin when executing HQL with 'view objects' switched on. 3.2.1 (12/29/2010) ================== Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HQLCompletionInfoCollection.java =================================================================== --- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HQLCompletionInfoCollection.java 2011-01-13 20:55:17 UTC (rev 6145) +++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HQLCompletionInfoCollection.java 2011-01-27 02:30:19 UTC (rev 6146) @@ -74,7 +74,7 @@ public CompletionCandidates getInfosStartingWith(CompletionParser parser) { - // Tricky alias and chaining completion examples + // Tricky alias and chaining completion examples // // au to auftr in // from Kv auftr where au @@ -194,17 +194,17 @@ _currentAliasInfos = aliasInfos; } - public MappedClassInfo getMappedClassInfoFor(String token, boolean matchNameExact, boolean stateless) + public MappedClassInfo getMappedClassInfoFor(String token) { // Example for this code: - // Completion should + // Completion should // from Kv k inner join fetch k.positionen as posses where posses.artNr = 'sdfsdf' CompletionParser cp = new CompletionParser(token); if(2 > cp.size()) { - return getMappedClassInfoForNonAliasedToken(cp, matchNameExact, stateless); + return getMappedClassInfoForNonAliasedToken(cp, true); } String aliasCandidate = cp.getToken(0); @@ -229,14 +229,14 @@ } } - return getMappedClassInfoForNonAliasedToken(cp, false, stateless); + return getMappedClassInfoForNonAliasedToken(cp, false); } - private MappedClassInfo getMappedClassInfoForNonAliasedToken(CompletionParser cp, boolean matchNameExact, boolean stateless) + private MappedClassInfo getMappedClassInfoForNonAliasedToken(CompletionParser cp, boolean matchNameExact) { for (MappedClassInfo mappedClassInfo : _mappedClassInfos) { - if(mappedClassInfo.matches(cp, matchNameExact, stateless)) + if(mappedClassInfo.matches(cp, matchNameExact, true)) { return mappedClassInfo; } @@ -291,6 +291,12 @@ } + @Override + public MappedClassInfo getExactMappedClassInfoFor(String className) + { + return _mappedClassInfoByClassName.get(className); + } + public ISyntaxHighlightTokenMatcher getHqlSyntaxHighlightTokenMatcher() { return _hqlSyntaxHighlightTokenMatcher; Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HqlAliasParser.java =================================================================== --- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HqlAliasParser.java 2011-01-13 20:55:17 UTC (rev 6145) +++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HqlAliasParser.java 2011-01-27 02:30:19 UTC (rev 6146) @@ -36,7 +36,7 @@ } else { - lastMappedClass = mappingInfoProvider.getMappedClassInfoFor(token, true, true); + lastMappedClass = mappingInfoProvider.getMappedClassInfoFor(token); } } else Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/MappingInfoProvider.java =================================================================== --- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/MappingInfoProvider.java 2011-01-13 20:55:17 UTC (rev 6145) +++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/MappingInfoProvider.java 2011-01-27 02:30:19 UTC (rev 6146) @@ -5,7 +5,9 @@ public interface MappingInfoProvider { // Will be called asynchronously to the event dispatch thread - MappedClassInfo getMappedClassInfoFor(String token, boolean matchNameExact, boolean stateless); + MappedClassInfo getMappedClassInfoFor(String token); boolean mayBeClassOrAliasName(String token); + + MappedClassInfo getExactMappedClassInfoFor(String className); } Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/MappedClassInfo.java =================================================================== --- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/MappedClassInfo.java 2011-01-13 20:55:17 UTC (rev 6145) +++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/MappedClassInfo.java 2011-01-27 02:30:19 UTC (rev 6146) @@ -19,12 +19,12 @@ { _mappedClassInfoData = mappedClassInfoData; - setPropertyInfos(new PropertyInfo[_mappedClassInfoData.getHibernatePropertyInfos().length + 1]); + _propertyInfos = new PropertyInfo[_mappedClassInfoData.getHibernatePropertyInfos().length + 1]; - getPropertyInfos()[0] = new PropertyInfo(_mappedClassInfoData.getIndentifierHibernatePropertyInfo(), _mappedClassInfoData.getMappedClassName()); + _propertyInfos[0] = new PropertyInfo(_mappedClassInfoData.getIndentifierHibernatePropertyInfo(), _mappedClassInfoData.getMappedClassName()); for (int i = 0; i < _mappedClassInfoData.getHibernatePropertyInfos().length; i++) { - getPropertyInfos()[i+1] = new PropertyInfo(_mappedClassInfoData.getHibernatePropertyInfos()[i], _mappedClassInfoData.getMappedClassName()); + _propertyInfos[i+1] = new PropertyInfo(_mappedClassInfoData.getHibernatePropertyInfos()[i], _mappedClassInfoData.getMappedClassName()); } } @@ -84,7 +84,7 @@ ArrayList<String> props = getArrayFormChain(propertyChainBegin); - PropertyInfo[] propInfoBuf = getPropertyInfos(); + PropertyInfo[] propInfoBuf = _propertyInfos; for (int i = 0; i < props.size(); i++) { @@ -136,7 +136,7 @@ { ArrayList<CompletionInfo> ret = new ArrayList<CompletionInfo>(); - for (PropertyInfo propertyInfo : getPropertyInfos()) + for (PropertyInfo propertyInfo : _propertyInfos ) { if(propertyInfo.matchesUnQualified(parser.getLastToken())) { @@ -165,11 +165,11 @@ public String[] getAttributeNames() { - String[] ret = new String[getPropertyInfos().length]; + String[] ret = new String[_propertyInfos.length]; - for (int i = 0; i < getPropertyInfos().length; i++) + for (int i = 0; i < _propertyInfos.length; i++) { - ret[i] = getPropertyInfos()[i].getCompareString(); + ret[i] = _propertyInfos[i].getCompareString(); } @@ -178,7 +178,7 @@ public PropertyInfo getAttributeByName(String attrName) { - for (PropertyInfo propertyInfo : getPropertyInfos()) + for (PropertyInfo propertyInfo : _propertyInfos ) { if(propertyInfo.getCompareString().equals(attrName)) { @@ -193,7 +193,7 @@ public PropertyInfo[] getAttributes() { - return getPropertyInfos(); + return _propertyInfos; } @@ -204,21 +204,11 @@ public void initAttributesWithClassInfo(MappingInfoProvider mappingInfoProvider) { - for (PropertyInfo propertyInfo : getPropertyInfos()) + for (PropertyInfo propertyInfo : _propertyInfos ) { - propertyInfo.setMappedClassInfo(mappingInfoProvider.getMappedClassInfoFor(propertyInfo.getHibernatePropertyInfo().getClassName(), false, false)); + propertyInfo.setMappedClassInfo(mappingInfoProvider.getExactMappedClassInfoFor(propertyInfo.getHibernatePropertyInfo().getClassName())); } } - public PropertyInfo[] getPropertyInfos() - { - return _propertyInfos; - } - - public void setPropertyInfos(PropertyInfo[] propertyInfos) - { - _propertyInfos = propertyInfos; - } - } Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/HibernatePropertyReader.java =================================================================== --- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/HibernatePropertyReader.java 2011-01-13 20:55:17 UTC (rev 6145) +++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/HibernatePropertyReader.java 2011-01-27 02:30:19 UTC (rev 6146) @@ -32,7 +32,7 @@ } catch (Exception e) { - throw new RuntimeException(e); + throw new RuntimeException("Cannot access property: " + _obj.getClass().getName() + "." + _propertyName, e); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ger...@us...> - 2011-01-31 23:31:32
|
Revision: 6149 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6149&view=rev Author: gerdwagner Date: 2011-01-31 23:31:25 +0000 (Mon, 31 Jan 2011) Log Message: ----------- Message Panel right mouse menu "Save size 0" Modified Paths: -------------- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrame.java trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/mainframe/I18NStrings.properties trunk/sql12/doc/src/main/resources/changes.txt Added Paths: ----------- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/SplitPnResizeHandler.java Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrame.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrame.java 2011-01-27 22:17:41 UTC (rev 6148) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrame.java 2011-01-31 23:31:25 UTC (rev 6149) @@ -84,14 +84,10 @@ private IDesktopContainer _desktop; - - private static final String PREFS_KEY_MESSAGEPANEL_HEIGHT = "squirrelSql_msgPanel_height"; - - - private boolean m_hasBeenVisible; - private JSplitPane _splitPn; + private SplitPnResizeHandler _splitPnResizeHandler; + /** * Ctor. * @@ -332,7 +328,7 @@ // had not height = 0. If someone knows a better way // please tell me I'll apreciate any advice. // ger...@us... - resizeSplitOnStartup(); + _splitPnResizeHandler.resizeSplitOnStartup(); } } }; @@ -346,40 +342,11 @@ _splitPn.setResizeWeight(1); _splitPn.setOneTouchExpandable(true); + _splitPnResizeHandler = new SplitPnResizeHandler(_splitPn, _msgPnl); - //i18n[MainFrame.saveSize=Save size] - String key = s_stringMgr.getString("MainFrame.saveSize"); - Action splitDividerLocAction = new AbstractAction(key) - { - public void actionPerformed(ActionEvent e) - { - int msgPanelHeight = _splitPn.getBottomComponent().getSize().height; - Preferences.userRoot().putInt(PREFS_KEY_MESSAGEPANEL_HEIGHT, msgPanelHeight); - } - }; - _msgPnl.addToMessagePanelPopup(splitDividerLocAction); - //i18n[MainFrame.restoreSize=Restore saved size] - key = s_stringMgr.getString("MainFrame.restoreSize"); - - Action setSplitDividerLocAction = new AbstractAction(key) - { - public void actionPerformed(ActionEvent e) - { - int prefMsgPanelHeight = Preferences.userRoot().getInt(PREFS_KEY_MESSAGEPANEL_HEIGHT, -1); - if(-1 != prefMsgPanelHeight) - { - int divLoc = getDividerLocation(prefMsgPanelHeight, _splitPn); - _splitPn.setDividerLocation(divLoc); - } - } - }; - _msgPnl.addToMessagePanelPopup(setSplitDividerLocAction); + content.add(_splitPn, BorderLayout.CENTER); - - - content.add(_splitPn, BorderLayout.CENTER); - _statusBar = new MainFrameStatusBar(_app); final Font fn = _app.getFontInfoStore().getStatusBarFontInfo().createFont(); _statusBar.setFont(fn); @@ -417,48 +384,6 @@ }); } - - public void resizeSplitOnStartup() - { - - if(false == m_hasBeenVisible) - { - m_hasBeenVisible = true; - final int prefMsgPanelHeight = Preferences.userRoot().getInt(PREFS_KEY_MESSAGEPANEL_HEIGHT, -1); - - SwingUtilities.invokeLater(new Runnable() - { - public void run() - { - if (-1 == prefMsgPanelHeight) - { - int divLoc = getDividerLocation(50, _splitPn); - _splitPn.setDividerLocation(divLoc); - } - else - { - int divLoc = getDividerLocation(prefMsgPanelHeight, _splitPn); - _splitPn.setDividerLocation(divLoc); - - } - } - }); - - } - } - - private int getDividerLocation(int wantedBottomComponentHeight, JSplitPane splitPn) - { - int splitBarSize = - splitPn.getSize().height - - splitPn.getBottomComponent().getSize().height - - splitPn.getTopComponent().getSize().height - 1; - - int divLoc = splitPn.getSize().height - wantedBottomComponentHeight - splitBarSize; - return divLoc; - } - - private void setupFromPreferences() { final SquirrelPreferences prefs = _app.getSquirrelPreferences(); Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/SplitPnResizeHandler.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/SplitPnResizeHandler.java (rev 0) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/SplitPnResizeHandler.java 2011-01-31 23:31:25 UTC (rev 6149) @@ -0,0 +1,130 @@ +package net.sourceforge.squirrel_sql.client.gui.mainframe; + +import net.sourceforge.squirrel_sql.client.session.MessagePanel; +import net.sourceforge.squirrel_sql.fw.util.StringManager; +import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; + +import javax.swing.*; +import java.awt.event.ActionEvent; +import java.util.prefs.Preferences; + +public class SplitPnResizeHandler +{ + private static final StringManager s_stringMgr = + StringManagerFactory.getStringManager(SplitPnResizeHandler.class); + + private static final String PREFS_KEY_MESSAGEPANEL_HEIGHT = "squirrelSql_msgPanel_height"; + + private boolean m_hasBeenVisible; + + private JSplitPane _splitPn; + private MessagePanel _msgPnl; + + public SplitPnResizeHandler(JSplitPane splitPn, MessagePanel msgPnl) + { + _splitPn = splitPn; + _msgPnl = msgPnl; + + String key; + + //i18n[MainFrame.saveSize=Save size] + key = s_stringMgr.getString("MainFrame.saveSize"); + Action saveSplitDividerLocAction = new AbstractAction(key) + { + public void actionPerformed(ActionEvent e) + { + int msgPanelHeight = _splitPn.getBottomComponent().getSize().height; + Preferences.userRoot().putInt(PREFS_KEY_MESSAGEPANEL_HEIGHT, msgPanelHeight); + } + }; + _msgPnl.addToMessagePanelPopup(saveSplitDividerLocAction); + + //i18n[MainFrame.saveSize0=Save size 0] + key = s_stringMgr.getString("MainFrame.saveSize0"); + Action save0SplitDividerLocAction = new AbstractAction(key) + { + public void actionPerformed(ActionEvent e) + { + Preferences.userRoot().putInt(PREFS_KEY_MESSAGEPANEL_HEIGHT, 0); + setUnexpanded(); + } + }; + _msgPnl.addToMessagePanelPopup(save0SplitDividerLocAction); + + + key = s_stringMgr.getString("MainFrame.restoreSize"); + Action setSplitDividerLocAction = new AbstractAction(key) + { + public void actionPerformed(ActionEvent e) + { + int prefMsgPanelHeight = Preferences.userRoot().getInt(PREFS_KEY_MESSAGEPANEL_HEIGHT, -1); + if(-1 != prefMsgPanelHeight) + { + if (0 == prefMsgPanelHeight) + { + setUnexpanded(); + } + else + { + int divLoc = getDividerLocation(prefMsgPanelHeight, _splitPn); + _splitPn.setDividerLocation(divLoc); + } + } + } + }; + _msgPnl.addToMessagePanelPopup(setSplitDividerLocAction); + + } + + private void setUnexpanded() + { + _splitPn.setDividerLocation(_splitPn.getMaximumDividerLocation() + 100); + } + + void resizeSplitOnStartup() + { + + if(false == m_hasBeenVisible) + { + m_hasBeenVisible = true; + final int prefMsgPanelHeight = Preferences.userRoot().getInt(PREFS_KEY_MESSAGEPANEL_HEIGHT, -1); + + SwingUtilities.invokeLater(new Runnable() + { + public void run() + { + if (-1 == prefMsgPanelHeight) + { + int divLoc = getDividerLocation(50, _splitPn); + _splitPn.setDividerLocation(divLoc); + } + else + { + if (0 == prefMsgPanelHeight) + { + setUnexpanded(); + } + else + { + int divLoc = getDividerLocation(prefMsgPanelHeight, _splitPn); + _splitPn.setDividerLocation(divLoc); + } + + } + } + }); + + } + } + + private int getDividerLocation(int wantedBottomComponentHeight, JSplitPane splitPn) + { + int splitBarSize = + splitPn.getSize().height - + splitPn.getBottomComponent().getSize().height - + splitPn.getTopComponent().getSize().height - 1; + + int divLoc = splitPn.getSize().height - wantedBottomComponentHeight - splitBarSize; + return divLoc; + } +} Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/mainframe/I18NStrings.properties =================================================================== --- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/mainframe/I18NStrings.properties 2011-01-27 22:17:41 UTC (rev 6148) +++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/mainframe/I18NStrings.properties 2011-01-31 23:31:25 UTC (rev 6149) @@ -20,6 +20,7 @@ MainFrame.errorOnClose=Couldn't close all sessions. Exit anyway? MainFrame.restoreSize=Restore saved size MainFrame.saveSize=Save size +MainFrame.saveSize0=Save size 0 MainFrameStatusBar.gc=Garbage collection requested Modified: trunk/sql12/doc/src/main/resources/changes.txt =================================================================== --- trunk/sql12/doc/src/main/resources/changes.txt 2011-01-27 22:17:41 UTC (rev 6148) +++ trunk/sql12/doc/src/main/resources/changes.txt 2011-01-31 23:31:25 UTC (rev 6149) @@ -11,8 +11,10 @@ Display errors in result tab: SQL execution errors are now additionally displayed in a temporary result tab. - This new feature is switched on by default and can be switched off in - Menu File --> New Session Properties --> Tab SQL --> Show SQL execution errors in result tab + - This new feature is switched on by default and can be switched off in + Menu File --> New Session Properties --> Tab SQL --> Show SQL execution errors in result tab. + - Along with this feature comes a new Message Panel right mouse menu "Save size 0" that allows + to hide the Message panel at application start up. Bug-fixes: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ger...@us...> - 2011-02-03 03:27:55
|
Revision: 6150 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6150&view=rev Author: gerdwagner Date: 2011-02-03 03:27:49 +0000 (Thu, 03 Feb 2011) Log Message: ----------- Hibernate Plugin: Removed unused imports to regain compile independence from Hibernate API changes, see patch ID 3168381 Modified Paths: -------------- trunk/sql12/doc/src/main/resources/changes.txt trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateUtil.java Modified: trunk/sql12/doc/src/main/resources/changes.txt =================================================================== --- trunk/sql12/doc/src/main/resources/changes.txt 2011-01-31 23:31:25 UTC (rev 6149) +++ trunk/sql12/doc/src/main/resources/changes.txt 2011-02-03 03:27:49 UTC (rev 6150) @@ -24,6 +24,7 @@ Hibernate Plugin: Made HQL code completion work more exact. +Hibernate Plugin: Removed unused imports to regain compile independence from Hibernate API changes, see patch ID 3168381 3.2.1 (12/29/2010) ================== Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateUtil.java =================================================================== --- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateUtil.java 2011-01-31 23:31:25 UTC (rev 6149) +++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateUtil.java 2011-02-03 03:27:49 UTC (rev 6150) @@ -18,26 +18,15 @@ */ package net.sourceforge.squirrel_sql.plugins.hibernate.util; -import java.io.*; -import java.sql.SQLException; - -import net.sourceforge.squirrel_sql.client.gui.db.ISQLAliasExt; -import net.sourceforge.squirrel_sql.client.session.ISession; -import net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData; -import net.sourceforge.squirrel_sql.fw.sql.ISQLDriver; import net.sourceforge.squirrel_sql.fw.util.log.ILogger; import net.sourceforge.squirrel_sql.fw.util.log.LoggerController; - import net.sourceforge.squirrel_sql.fw.xml.XMLBeanReader; import net.sourceforge.squirrel_sql.fw.xml.XMLException; import net.sourceforge.squirrel_sql.plugins.hibernate.HibernatePlugin; import net.sourceforge.squirrel_sql.plugins.hibernate.configuration.HibernateConfigController; -import org.hibernate.SessionFactory; -import org.hibernate.cfg.Configuration; -import org.hibernate.cfg.Environment; -import org.hibernate.dialect.Dialect; -import org.hibernate.dialect.DialectFactory; +import java.io.*; + /** * Class that provides utility methods for obtaining SessionFactory objects. * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2011-02-21 21:25:24
|
Revision: 6161 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6161&view=rev Author: manningr Date: 2011-02-21 21:25:17 +0000 (Mon, 21 Feb 2011) Log Message: ----------- Added support and preference setting for sorting the column names of a table when generating the create statement for comparison purposes. It may be that the table was created and later altered in a difference order than in another schema and this might not be considered important for comparison purposes. This sort columns setting will eliminate this from appearing as a difference. Modified Paths: -------------- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/CommonHibernateDialect.java trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DialectUtils.java trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/HibernateDialect.java trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/AbstractSideBySideDiffPresentation.java trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/ExternalToolSideBySideDiffPresentation.java trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/prefs/DBDiffPreferenceBean.java trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/prefs/DBDiffPreferencesPanel.java trunk/sql12/plugins/dbdiff/src/main/resources/net/sourceforge/squirrel_sql/plugins/dbdiff/prefs/I18NStrings.properties Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/CommonHibernateDialect.java =================================================================== --- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/CommonHibernateDialect.java 2011-02-17 19:01:06 UTC (rev 6160) +++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/CommonHibernateDialect.java 2011-02-21 21:25:17 UTC (rev 6161) @@ -291,6 +291,17 @@ /** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getCreateTableSQL(java.util.List, * net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData, + * net.sourceforge.squirrel_sql.fw.dialects.CreateScriptPreferences, boolean, boolean) + */ + public List<String> getCreateTableSQL(List<ITableInfo> tables, ISQLDatabaseMetaData md, + CreateScriptPreferences prefs, boolean isJdbcOdbc, boolean sortColumns) throws SQLException + { + return DialectUtils.getCreateTableSQL(tables, md, this, prefs, isJdbcOdbc, sortColumns); + } + + /** + * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getCreateTableSQL(java.util.List, + * net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData, * net.sourceforge.squirrel_sql.fw.dialects.CreateScriptPreferences, boolean) */ public List<String> getCreateTableSQL(List<ITableInfo> tables, ISQLDatabaseMetaData md, @@ -298,7 +309,7 @@ { return DialectUtils.getCreateTableSQL(tables, md, this, prefs, isJdbcOdbc); } - + /** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getCreateTableSQL(java.lang.String, * java.util.List, java.util.List, net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences, Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DialectUtils.java =================================================================== --- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DialectUtils.java 2011-02-17 19:01:06 UTC (rev 6160) +++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DialectUtils.java 2011-02-21 21:25:17 UTC (rev 6161) @@ -1780,6 +1780,13 @@ public static List<String> getCreateTableSQL(List<ITableInfo> tables, ISQLDatabaseMetaData md, HibernateDialect dialect, CreateScriptPreferences prefs, boolean isJdbcOdbc) throws SQLException { + return getCreateTableSQL(tables, md, dialect, prefs, isJdbcOdbc, false); + } + + public static List<String> getCreateTableSQL(List<ITableInfo> tables, ISQLDatabaseMetaData md, + HibernateDialect dialect, CreateScriptPreferences prefs, boolean isJdbcOdbc, boolean sortColumns) + throws SQLException + { final List<String> sqls = new ArrayList<String>(); final List<String> allconstraints = new ArrayList<String>(); @@ -1793,6 +1800,9 @@ final List<PrimaryKeyInfo> pkInfos = getPrimaryKeyInfo(md, ti, isJdbcOdbc); final List<String> pks = getPKSequenceList(pkInfos); final TableColumnInfo[] infos = md.getColumnInfo(ti); + if (sortColumns) { + Arrays.sort(infos); + } for (final TableColumnInfo tcInfo : infos) { final String columnName = tcInfo.getColumnName(); Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/HibernateDialect.java =================================================================== --- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/HibernateDialect.java 2011-02-17 19:01:06 UTC (rev 6160) +++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/HibernateDialect.java 2011-02-21 21:25:17 UTC (rev 6161) @@ -402,7 +402,8 @@ SqlGenerationPreferences prefs); /** - * Returns the SQL command to create the specified table. + * Returns the SQL command to create the specified table (columns appear in the same order as they are + * stored in the database). * * @param tables * the tables to get create statements for @@ -418,6 +419,26 @@ CreateScriptPreferences prefs, boolean isJdbcOdbc) throws SQLException; /** + * Returns the SQL command to create the specified table. Optionally, if sortColumns is true, colums will + * be sorted by column name in ascending order. + * + * @param tables + * the tables to get create statements for + * @param md + * the metadata from the ISession + * @param prefs + * preferences about how the resultant SQL commands should be formed. + * @param isJdbcOdbc + * whether or not the connection is via JDBC-ODBC bridge. + * @param sortColumns + * whether or not to sort columns according to their column name. + * + * @return the SQL that is used to create the specified table + */ + List<String> getCreateTableSQL(List<ITableInfo> tables, ISQLDatabaseMetaData md, + CreateScriptPreferences prefs, boolean isJdbcOdbc, boolean sortColumns) throws SQLException; + + /** * Returns the DialectType enum value associated with this dialect. * * @return the DialectType Modified: trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/AbstractSideBySideDiffPresentation.java =================================================================== --- trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/AbstractSideBySideDiffPresentation.java 2011-02-17 19:01:06 UTC (rev 6160) +++ trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/AbstractSideBySideDiffPresentation.java 2011-02-21 21:25:17 UTC (rev 6161) @@ -40,6 +40,7 @@ import net.sourceforge.squirrel_sql.fw.util.log.ILogger; import net.sourceforge.squirrel_sql.fw.util.log.LoggerController; import net.sourceforge.squirrel_sql.plugins.dbdiff.IScriptFileManager; +import net.sourceforge.squirrel_sql.plugins.dbdiff.prefs.DBDiffPreferenceBean; /** * Base class for all DiffPresentation implementations that display a comparison of the contents of two files @@ -61,6 +62,11 @@ private IDialectFactory dialectFactory = new DialectFactoryImpl(); /** + * preferenceBean + */ + protected DBDiffPreferenceBean preferenceBean = null; + + /** * Sub-class implementations should override this method to provide the implementation for comparing the * contents of the specified script filenames. * @@ -98,13 +104,14 @@ try { + final String script1 = constructScriptFromList(dialect.getCreateTableSQL(sourcetables, sourceSession.getMetaData(), - csprefs, false)); + csprefs, false, preferenceBean.isSortColumnsForSideBySideComparison())); final String script2 = constructScriptFromList(dialect.getCreateTableSQL(desttables, destSession.getMetaData(), csprefs, - false)); + false, preferenceBean.isSortColumnsForSideBySideComparison())); final String sourceFilename = scriptFileManager.getOutputFilenameForSession(sourceSession, 1); final String destFilename = scriptFileManager.getOutputFilenameForSession(destSession, 2); @@ -186,4 +193,14 @@ this.dialectFactory = dialectFactory; } + /** + * @param preferenceBean + * the preferenceBean to set + */ + public void setPreferenceBean(DBDiffPreferenceBean preferenceBean) + { + Utilities.checkNull("setPreferenceBean", preferenceBean, "preferenceBean"); + this.preferenceBean = preferenceBean; + } + } Modified: trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/ExternalToolSideBySideDiffPresentation.java =================================================================== --- trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/ExternalToolSideBySideDiffPresentation.java 2011-02-17 19:01:06 UTC (rev 6160) +++ trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/ExternalToolSideBySideDiffPresentation.java 2011-02-21 21:25:17 UTC (rev 6161) @@ -21,10 +21,8 @@ import java.io.IOException; -import net.sourceforge.squirrel_sql.fw.util.Utilities; import net.sourceforge.squirrel_sql.fw.util.log.ILogger; import net.sourceforge.squirrel_sql.fw.util.log.LoggerController; -import net.sourceforge.squirrel_sql.plugins.dbdiff.prefs.DBDiffPreferenceBean; /** * A DiffPresentation implementation that creates a script from both schemas to be compared, then launches a @@ -38,11 +36,6 @@ LoggerController.createLogger(ExternalToolSideBySideDiffPresentation.class); /** - * preferenceBean - */ - private DBDiffPreferenceBean preferenceBean = null; - - /** * @see net.sourceforge.squirrel_sql.plugins.dbdiff.gui.AbstractSideBySideDiffPresentation# * executeDiff(java.lang.String, java.lang.String) */ @@ -60,14 +53,4 @@ Runtime.getRuntime().exec(toolCommand); } - /** - * @param preferenceBean - * the preferenceBean to set - */ - public void setPreferenceBean(DBDiffPreferenceBean preferenceBean) - { - Utilities.checkNull("setPreferenceBean", preferenceBean, "preferenceBean"); - this.preferenceBean = preferenceBean; - } - } Modified: trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/prefs/DBDiffPreferenceBean.java =================================================================== --- trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/prefs/DBDiffPreferenceBean.java 2011-02-17 19:01:06 UTC (rev 6160) +++ trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/prefs/DBDiffPreferenceBean.java 2011-02-21 21:25:17 UTC (rev 6161) @@ -46,6 +46,9 @@ /** The graphical tool command that launches the diff tool. It should handle two file arguments */ private String graphicalToolCommand = ""; + + /** Whether or not to sort columns by column name when generating table definitions */ + private boolean sortColumnsForSideBySideComparison = false; public DBDiffPreferenceBean() { @@ -161,4 +164,20 @@ return useTabularDiffPresenation; } + /** + * @return the sortColumnsForSideBySideComparison + */ + public boolean isSortColumnsForSideBySideComparison() + { + return sortColumnsForSideBySideComparison; + } + + /** + * @param sortColumnsForSideBySideComparison the sortColumnsForSideBySideComparison to set + */ + public void setSortColumnsForSideBySideComparison(boolean sortColumnsForSideBySideComparison) + { + this.sortColumnsForSideBySideComparison = sortColumnsForSideBySideComparison; + } + } Modified: trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/prefs/DBDiffPreferencesPanel.java =================================================================== --- trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/prefs/DBDiffPreferencesPanel.java 2011-02-17 19:01:06 UTC (rev 6160) +++ trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/prefs/DBDiffPreferencesPanel.java 2011-02-21 21:25:17 UTC (rev 6161) @@ -27,6 +27,7 @@ import java.awt.event.ActionListener; import javax.swing.ButtonGroup; +import javax.swing.JCheckBox; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JRadioButton; @@ -65,6 +66,8 @@ JTextField externalDiffToolCommandTextField = null; + JCheckBox sortColumnsCheckBox = null; + /** Internationalized strings for this class. */ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(DBDiffPreferencesPanel.class); @@ -119,11 +122,30 @@ addexternalDiffToolCommandLabel(result, 0, 3); addExternalDiffToolCommandTextField(result, 1, 3); - addTabularPresentationRadioButton(result, 0, 4); + addSortColumnsCheckBoxLabel(result, 0, 4); + + addTabularPresentationRadioButton(result, 0, 5); return result; } + private void addSortColumnsCheckBoxLabel(JPanel panel, int col, int row) + { + final GridBagConstraints c = new GridBagConstraints(); + c.gridx = col; + c.gridy = row; + c.gridwidth = 2; // Span across two columns + c.insets = new Insets(5, 20, 0, 0); + c.anchor = GridBagConstraints.WEST; + final String sortColumnsCheckBoxLabel = + s_stringMgr.getString("DBDiffPreferencesPanel.sortColumnsForSideBySideComparisonLabel"); + final String sortColumnsCheckBoxToolTip = + s_stringMgr.getString("DBDiffPreferencesPanel.sortColumnsForSideBySideComparisonToolTip"); + sortColumnsCheckBox = new JCheckBox(sortColumnsCheckBoxLabel); + sortColumnsCheckBox.setToolTipText(sortColumnsCheckBoxToolTip); + panel.add(sortColumnsCheckBox, c); + } + private void addTabularPresentationRadioButton(JPanel panel, int col, int row) { final GridBagConstraints c = new GridBagConstraints(); Modified: trunk/sql12/plugins/dbdiff/src/main/resources/net/sourceforge/squirrel_sql/plugins/dbdiff/prefs/I18NStrings.properties =================================================================== --- trunk/sql12/plugins/dbdiff/src/main/resources/net/sourceforge/squirrel_sql/plugins/dbdiff/prefs/I18NStrings.properties 2011-02-17 19:01:06 UTC (rev 6160) +++ trunk/sql12/plugins/dbdiff/src/main/resources/net/sourceforge/squirrel_sql/plugins/dbdiff/prefs/I18NStrings.properties 2011-02-21 21:25:17 UTC (rev 6161) @@ -13,6 +13,9 @@ DBDiffPreferencesPanel.sideBySidePresentationRadionButtonLabel=Side-by-Side DBDiffPreferencesPanel.sideBySidePresentationRadionButtonToolTip=A form of comparison that displays both schema definitions in terms of SQL. +DBDiffPreferencesPanel.sortColumnsForSideBySideComparisonLabel=Sort Columns for side-by-side comparison +DBDiffPreferencesPanel.sortColumnsForSideBySideComparisonToolTip=Column ordering differences can be ignored with this preference. + DBDiffPreferencesPanel.tabularPresentationRadioButtonLabel=Tabular DBDiffPreferencesPanel.tabularPresentationRadioButtonToolTipText=Shows differences in a table This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |