diff -Nru zeroc-ice-3.4.2/debian/changelog zeroc-ice-3.4.2/debian/changelog --- zeroc-ice-3.4.2/debian/changelog 2013-03-04 19:58:06.000000000 +0800 +++ zeroc-ice-3.4.2/debian/changelog 2013-06-30 05:24:25.000000000 +0800 @@ -1,3 +1,11 @@ +zeroc-ice (3.4.2-8.3) unstable; urgency=low + + * Non-maintainer upload. + * FIX FTBFS with OpenJDK 7. (Closes: 676441) + - debian/patches/compatible-with-openjdk7.patch + + -- ShuxiongYe Mon, 17 Jun 2013 01:43:20 +0800 + zeroc-ice (3.4.2-8.2) unstable; urgency=high [Sebastian Ramacher] diff -Nru zeroc-ice-3.4.2/debian/patches/compatible-with-openjdk7.patch zeroc-ice-3.4.2/debian/patches/compatible-with-openjdk7.patch --- zeroc-ice-3.4.2/debian/patches/compatible-with-openjdk7.patch 1970-01-01 08:00:00.000000000 +0800 +++ zeroc-ice-3.4.2/debian/patches/compatible-with-openjdk7.patch 2013-06-30 04:34:13.000000000 +0800 @@ -0,0 +1,389 @@ +From d791a3913bc966e2736a8f13172630bf4bc2b6a4 Mon Sep 17 00:00:00 2001 +From: "David M. Lee" +Date: Thu, 20 Oct 2011 10:57:16 -0500 +Subject: [PATCH] Fix for JDK-7 + +--- + java/src/IceInternal/OutgoingConnectionFactory.java | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +Index: zeroc-ice-3.4.2/java/src/IceInternal/OutgoingConnectionFactory.java +=================================================================== +--- zeroc-ice-3.4.2.orig/java/src/IceInternal/OutgoingConnectionFactory.java 2013-06-30 04:26:47.261808507 +0800 ++++ zeroc-ice-3.4.2/java/src/IceInternal/OutgoingConnectionFactory.java 2013-06-30 04:26:55.965851668 +0800 +@@ -17,7 +17,7 @@ + private static class MultiHashMap extends java.util.HashMap> + { + public void +- put(K key, V value) ++ putOne(K key, V value) + { + java.util.List list = this.get(key); + if(list == null) +@@ -693,9 +693,9 @@ + throw ex; + } + +- _connections.put(ci.connector, connection); +- _connectionsByEndpoint.put(connection.endpoint(), connection); +- _connectionsByEndpoint.put(connection.endpoint().compress(true), connection); ++ _connections.putOne(ci.connector, connection); ++ _connectionsByEndpoint.putOne(connection.endpoint(), connection); ++ _connectionsByEndpoint.putOne(connection.endpoint().compress(true), connection); + return connection; + } + +Index: zeroc-ice-3.4.2/java/src/IceGridGUI/Application/AdapterEditor.java +=================================================================== +--- zeroc-ice-3.4.2.orig/java/src/IceGridGUI/Application/AdapterEditor.java 2013-06-30 04:26:47.261808507 +0800 ++++ zeroc-ice-3.4.2/java/src/IceGridGUI/Application/AdapterEditor.java 2013-06-30 04:26:55.969851680 +0800 +@@ -343,7 +343,7 @@ + private void refreshId() + { + Object id = _id.getSelectedItem(); +- _id.setModel(new DefaultComboBoxModel(new Object[]{DEFAULT_ADAPTER_ID})); ++ _id.setModel(new DefaultComboBoxModel(new Object[]{DEFAULT_ADAPTER_ID})); + _id.setSelectedItem(id); + } + +@@ -603,14 +603,14 @@ + private JTextField _name = new JTextField(20); + private JTextArea _description = new JTextArea(3, 20); + +- private JComboBox _id = new JComboBox(new Object[] {DEFAULT_ADAPTER_ID}); +- private JComboBox _replicaGroupId = new JComboBox(); ++ private JComboBox _id = new JComboBox(new Object[] {DEFAULT_ADAPTER_ID}); ++ private JComboBox _replicaGroupId = new JComboBox(); + private JButton _replicaGroupButton; + + private JTextField _priority = new JTextField(20); + + private JTextField _endpoints = new JTextField(20); +- private JComboBox _publishedEndpoints = new JComboBox(new Object[]{PUBLISH_ACTUAL}); ++ private JComboBox _publishedEndpoints = new JComboBox(new Object[]{PUBLISH_ACTUAL}); + + private JTextField _currentStatus = new JTextField(20); + private JTextField _currentEndpoints = new JTextField(20); +Index: zeroc-ice-3.4.2/java/src/IceGridGUI/Application/ApplicationEditor.java +=================================================================== +--- zeroc-ice-3.4.2.orig/java/src/IceGridGUI/Application/ApplicationEditor.java 2013-06-30 04:26:47.261808507 +0800 ++++ zeroc-ice-3.4.2/java/src/IceGridGUI/Application/ApplicationEditor.java 2013-06-30 04:26:55.969851680 +0800 +@@ -100,7 +100,7 @@ + // + // Distrib + // +- _distrib = new JComboBox(new Object[]{NO_DISTRIB, DEFAULT_DISTRIB}); ++ _distrib = new JComboBox(new Object[]{NO_DISTRIB, DEFAULT_DISTRIB}); + _distrib.setEditable(true); + _distrib.setToolTipText("The proxy to the IcePatch2 server holding your files"); + +Index: zeroc-ice-3.4.2/java/src/IceGridGUI/Application/DbEnvEditor.java +=================================================================== +--- zeroc-ice-3.4.2.orig/java/src/IceGridGUI/Application/DbEnvEditor.java 2013-06-30 04:26:47.261808507 +0800 ++++ zeroc-ice-3.4.2/java/src/IceGridGUI/Application/DbEnvEditor.java 2013-06-30 04:26:55.969851680 +0800 +@@ -183,7 +183,7 @@ + private JTextField _name = new JTextField(20); + private JTextArea _description = new JTextArea(3, 20); + +- private JComboBox _dbHome = new JComboBox(new Object[]{NO_DB_HOME}); ++ private JComboBox _dbHome = new JComboBox(new Object[]{NO_DB_HOME}); + private PropertiesField _properties; + + static private final Object NO_DB_HOME = new Object() +Index: zeroc-ice-3.4.2/java/src/IceGridGUI/Application/ListTreeNode.java +=================================================================== +--- zeroc-ice-3.4.2.orig/java/src/IceGridGUI/Application/ListTreeNode.java 2013-06-30 04:26:47.261808507 +0800 ++++ zeroc-ice-3.4.2/java/src/IceGridGUI/Application/ListTreeNode.java 2013-06-30 04:26:55.969851680 +0800 +@@ -154,12 +154,12 @@ + return _editable; + } + +- javax.swing.ComboBoxModel createComboBoxModel() ++ javax.swing.ComboBoxModel createComboBoxModel() + { + return new ComboBoxModel(); + } + +- javax.swing.ComboBoxModel createComboBoxModel(Object item) ++ javax.swing.ComboBoxModel createComboBoxModel(Object item) + { + return new ComboBoxModel(item); + } +@@ -167,7 +167,7 @@ + // + // Adapts ListTreeNode to a ComboBoxModel + // +- class ComboBoxModel extends javax.swing.AbstractListModel implements javax.swing.ComboBoxModel ++ class ComboBoxModel extends javax.swing.AbstractListModel implements javax.swing.ComboBoxModel + { + public Object getElementAt(int index) + { +Index: zeroc-ice-3.4.2/java/src/IceGridGUI/Application/ParameterValuesField.java +=================================================================== +--- zeroc-ice-3.4.2.orig/java/src/IceGridGUI/Application/ParameterValuesField.java 2013-06-30 04:26:47.261808507 +0800 ++++ zeroc-ice-3.4.2/java/src/IceGridGUI/Application/ParameterValuesField.java 2013-06-30 04:26:55.969851680 +0800 +@@ -162,9 +162,9 @@ + + private static final String _notSet = "Not set"; + +- private JComboBox _useDefaultCombo = new JComboBox(new Object[]{_useDefault}); ++ private JComboBox _useDefaultCombo = new JComboBox(new Object[]{_useDefault}); + +- private JComboBox _notSetCombo = new JComboBox(new Object[]{_notSet}); ++ private JComboBox _notSetCombo = new JComboBox(new Object[]{_notSet}); + + private TableCellEditor _useDefaultEditor = new DefaultCellEditor(_useDefaultCombo); + private TableCellEditor _notSetEditor = new DefaultCellEditor(_notSetCombo); +Index: zeroc-ice-3.4.2/java/src/IceGridGUI/Application/ParametersField.java +=================================================================== +--- zeroc-ice-3.4.2.orig/java/src/IceGridGUI/Application/ParametersField.java 2013-06-30 04:26:47.261808507 +0800 ++++ zeroc-ice-3.4.2/java/src/IceGridGUI/Application/ParametersField.java 2013-06-30 04:26:55.969851680 +0800 +@@ -42,7 +42,7 @@ + _columnNames.add("Name"); + _columnNames.add("Default value"); + +- JComboBox comboBox = new JComboBox(new Object[]{_noDefault}); ++ JComboBox comboBox = new JComboBox(new Object[]{_noDefault}); + comboBox.setEditable(true); + _cellEditor = new DefaultCellEditor(comboBox); + +Index: zeroc-ice-3.4.2/java/src/IceGridGUI/Application/ReplicaGroupEditor.java +=================================================================== +--- zeroc-ice-3.4.2.orig/java/src/IceGridGUI/Application/ReplicaGroupEditor.java 2013-06-30 04:26:47.261808507 +0800 ++++ zeroc-ice-3.4.2/java/src/IceGridGUI/Application/ReplicaGroupEditor.java 2013-06-30 04:26:55.969851680 +0800 +@@ -448,12 +448,12 @@ + private JTextField _id = new JTextField(20); + private JTextArea _description = new JTextArea(3, 20); + +- private JComboBox _loadBalancing = new JComboBox(new Object[] {ADAPTIVE, ORDERED, RANDOM, ROUND_ROBIN}); ++ private JComboBox _loadBalancing = new JComboBox(new Object[] {ADAPTIVE, ORDERED, RANDOM, ROUND_ROBIN}); + + private JTextField _nReplicas = new JTextField(20); + + private JLabel _loadSampleLabel; +- private JComboBox _loadSample = new JComboBox(new Object[] {"1", "5", "15"}); ++ private JComboBox _loadSample = new JComboBox(new Object[] {"1", "5", "15"}); + + private SimpleMapField _objects; + private java.util.LinkedList _objectList; +Index: zeroc-ice-3.4.2/java/src/IceGridGUI/Application/ServerInstanceEditor.java +=================================================================== +--- zeroc-ice-3.4.2.orig/java/src/IceGridGUI/Application/ServerInstanceEditor.java 2013-06-30 04:26:47.261808507 +0800 ++++ zeroc-ice-3.4.2/java/src/IceGridGUI/Application/ServerInstanceEditor.java 2013-06-30 04:26:55.969851680 +0800 +@@ -215,7 +215,7 @@ + } + } + +- private JComboBox _template = new JComboBox(); ++ private JComboBox _template = new JComboBox(); + private JButton _templateButton; + private ParameterValuesField _parameters; + +Index: zeroc-ice-3.4.2/java/src/IceGridGUI/Application/ServerInstancePropertySetEditor.java +=================================================================== +--- zeroc-ice-3.4.2.orig/java/src/IceGridGUI/Application/ServerInstancePropertySetEditor.java 2013-06-30 04:26:47.261808507 +0800 ++++ zeroc-ice-3.4.2/java/src/IceGridGUI/Application/ServerInstancePropertySetEditor.java 2013-06-30 04:26:55.969851680 +0800 +@@ -57,11 +57,11 @@ + + _id.setEnabled(true); + _id.setEditable(true); +- _id.setModel(new DefaultComboBoxModel(s.getServiceNames())); ++ _id.setModel(new DefaultComboBoxModel(s.getServiceNames())); + _id.setSelectedItem(Utils.substitute(unsubstitutedId, resolver)); + _id.setEditable(resolver == null); + _id.setEnabled(resolver == null); + } + +- private JComboBox _id = new JComboBox(); ++ private JComboBox _id = new JComboBox(); + } +Index: zeroc-ice-3.4.2/java/src/IceGridGUI/Application/ServerSubEditor.java +=================================================================== +--- zeroc-ice-3.4.2.orig/java/src/IceGridGUI/Application/ServerSubEditor.java 2013-06-30 04:26:47.261808507 +0800 ++++ zeroc-ice-3.4.2/java/src/IceGridGUI/Application/ServerSubEditor.java 2013-06-30 04:26:55.969851680 +0800 +@@ -65,7 +65,7 @@ + + _envs = new SimpleMapField(mainEditor, true, "Name", "Value"); + +- _activation = new JComboBox(new Object[]{ALWAYS, MANUAL, ON_DEMAND, SESSION}); ++ _activation = new JComboBox(new Object[]{ALWAYS, MANUAL, ON_DEMAND, SESSION}); + _activation.setToolTipText("always: IceGrid starts and keeps the server up all the time
" + + "manual: you start the server yourself
" + + "on-demand: IceGrid starts the server when a client needs it
" +@@ -109,7 +109,7 @@ + + _applicationDistrib = new JCheckBox(appDistrib); + +- _distrib = new JComboBox(new Object[]{NO_DISTRIB, DEFAULT_DISTRIB}); ++ _distrib = new JComboBox(new Object[]{NO_DISTRIB, DEFAULT_DISTRIB}); + _distrib.setToolTipText("The proxy to the IcePatch2 server holding your files"); + + JTextField distribTextField = (JTextField)_distrib.getEditor().getEditorComponent(); +Index: zeroc-ice-3.4.2/java/src/IceGridGUI/Application/ServiceInstanceEditor.java +=================================================================== +--- zeroc-ice-3.4.2.orig/java/src/IceGridGUI/Application/ServiceInstanceEditor.java 2013-06-30 04:26:47.261808507 +0800 ++++ zeroc-ice-3.4.2/java/src/IceGridGUI/Application/ServiceInstanceEditor.java 2013-06-30 04:26:55.969851680 +0800 +@@ -224,7 +224,7 @@ + } + } + +- private JComboBox _template = new JComboBox(); ++ private JComboBox _template = new JComboBox(); + private JButton _templateButton; + private ParameterValuesField _parameters; + private ListTextField _propertySets = new ListTextField(20); +Index: zeroc-ice-3.4.2/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java +=================================================================== +--- zeroc-ice-3.4.2.orig/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java 2013-06-30 04:26:47.261808507 +0800 ++++ zeroc-ice-3.4.2/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java 2013-06-30 04:29:45.470692192 +0800 +@@ -30,7 +30,6 @@ + + import com.jgoodies.forms.builder.DefaultFormBuilder; + import com.jgoodies.forms.factories.Borders; +-import com.jgoodies.forms.factories.ButtonBarFactory; + import com.jgoodies.forms.layout.CellConstraints; + import com.jgoodies.forms.layout.FormLayout; + import com.jgoodies.forms.util.LayoutStyle; +@@ -128,8 +127,7 @@ + }; + cancelButton.addActionListener(cancelListener); + +- JComponent buttonBar = +- ButtonBarFactory.buildOKCancelBar(okButton, cancelButton); ++ JComponent buttonBar = new com.jgoodies.forms.builder.ButtonBarBuilder().addGlue().addButton(okButton, cancelButton).build(); + buttonBar.setBorder(Borders.DIALOG_BORDER); + + contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS)); +@@ -164,7 +162,7 @@ + + private JTextArea _proxy = new JTextArea(3, 40); + private JTextField _type = new JTextField(40); +- private JComboBox _typeCombo = new JComboBox(new Object[]{QUERY_OBJECT}); ++ private JComboBox _typeCombo = new JComboBox(new Object[]{QUERY_OBJECT}); + private JFrame _mainFrame; + + static private final Object QUERY_OBJECT = new Object() +Index: zeroc-ice-3.4.2/java/src/IceGridGUI/SessionKeeper.java +=================================================================== +--- zeroc-ice-3.4.2.orig/java/src/IceGridGUI/SessionKeeper.java 2013-06-30 04:26:47.261808507 +0800 ++++ zeroc-ice-3.4.2/java/src/IceGridGUI/SessionKeeper.java 2013-06-30 04:26:55.969851680 +0800 +@@ -29,7 +29,6 @@ + + import com.jgoodies.forms.builder.DefaultFormBuilder; + import com.jgoodies.forms.factories.Borders; +-import com.jgoodies.forms.factories.ButtonBarFactory; + import com.jgoodies.forms.factories.DefaultComponentFactory; + import com.jgoodies.forms.layout.FormLayout; + import com.jgoodies.forms.util.LayoutStyle; +@@ -884,7 +883,7 @@ + TitledBorder titledBorder = BorderFactory.createTitledBorder(Borders.DIALOG_BORDER, "SSL Configuration"); + _sslPane.setBorder(titledBorder); + +- JComponent buttonBar = ButtonBarFactory.buildOKCancelBar(okButton, cancelButton); ++ JComponent buttonBar = new com.jgoodies.forms.builder.ButtonBarBuilder().addGlue().addButton(okButton, cancelButton).build(); + buttonBar.setBorder(Borders.DIALOG_BORDER); + + Container contentPane = getContentPane(); +@@ -1054,7 +1053,7 @@ + catch(java.io.IOException e) + {} + } +- _alias.setModel(new DefaultComboBoxModel(aliasVector)); ++ _alias.setModel(new DefaultComboBoxModel(aliasVector)); + if(selectedAlias != null) + { + _alias.setSelectedItem(selectedAlias); +@@ -1068,7 +1067,7 @@ + + private void clearAlias() + { +- _alias.setModel(new DefaultComboBoxModel()); ++ _alias.setModel(new DefaultComboBoxModel()); + } + + private void selectRegistryUseSSL(boolean selected) +@@ -1171,7 +1170,7 @@ + private JPasswordField _advancedKeyPassword = new JPasswordField(_keyPassword.getDocument(), null, 30); + + private JPasswordField _keystorePassword = new JPasswordField(30); +- private JComboBox _alias = new JComboBox(); ++ private JComboBox _alias = new JComboBox(); + + private JTextField _truststore = new JTextField(30); + private JPasswordField _truststorePassword = new JPasswordField(30); +Index: zeroc-ice-3.4.2/java/src/IceGridGUI/Application/Editor.java +=================================================================== +--- zeroc-ice-3.4.2.orig/java/src/IceGridGUI/Application/Editor.java 2013-06-30 04:17:29.803044211 +0800 ++++ zeroc-ice-3.4.2/java/src/IceGridGUI/Application/Editor.java 2013-06-30 04:28:58.510459328 +0800 +@@ -29,7 +29,6 @@ + + import com.jgoodies.forms.builder.DefaultFormBuilder; + import com.jgoodies.forms.factories.Borders; +-import com.jgoodies.forms.factories.ButtonBarFactory; + import com.jgoodies.forms.factories.DefaultComponentFactory; + import com.jgoodies.forms.layout.FormLayout; + import com.jgoodies.forms.util.LayoutStyle; +@@ -106,7 +105,7 @@ + protected void buildPropertiesPanel() + { + super.buildPropertiesPanel(); +- JComponent buttonBar = ButtonBarFactory.buildRightAlignedBar(_applyButton, _discardButton); ++ JComponent buttonBar = new com.jgoodies.forms.builder.ButtonBarBuilder().addGlue().addButton(_applyButton, _discardButton).build(); + buttonBar.setBorder(Borders.DIALOG_BORDER); + _propertiesPanel.add(buttonBar, BorderLayout.SOUTH); + } +Index: zeroc-ice-3.4.2/java/src/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java +=================================================================== +--- zeroc-ice-3.4.2.orig/java/src/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java 2013-06-30 04:17:29.803044211 +0800 ++++ zeroc-ice-3.4.2/java/src/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java 2013-06-30 04:30:59.543059502 +0800 +@@ -29,7 +29,6 @@ + + import com.jgoodies.forms.builder.DefaultFormBuilder; + import com.jgoodies.forms.factories.Borders; +-import com.jgoodies.forms.factories.ButtonBarFactory; + import com.jgoodies.forms.layout.FormLayout; + import com.jgoodies.forms.util.LayoutStyle; + +Index: zeroc-ice-3.4.2/java/src/IceGridGUI/LiveDeployment/ShowLogPrefsDialog.java +=================================================================== +--- zeroc-ice-3.4.2.orig/java/src/IceGridGUI/LiveDeployment/ShowLogPrefsDialog.java 2013-06-30 04:17:29.803044211 +0800 ++++ zeroc-ice-3.4.2/java/src/IceGridGUI/LiveDeployment/ShowLogPrefsDialog.java 2013-06-30 04:32:31.295514456 +0800 +@@ -22,7 +22,6 @@ + + import com.jgoodies.forms.builder.DefaultFormBuilder; + import com.jgoodies.forms.factories.Borders; +-import com.jgoodies.forms.factories.ButtonBarFactory; + import com.jgoodies.forms.layout.FormLayout; + import com.jgoodies.forms.util.LayoutStyle; + +@@ -108,8 +107,7 @@ + builder.append("Poll period (seconds)", periodField); + builder.nextLine(); + +- JComponent buttonBar = +- ButtonBarFactory.buildOKCancelBar(okButton, cancelButton); ++ JComponent buttonBar = new com.jgoodies.forms.builder.ButtonBarBuilder().addGlue().addButton(okButton, cancelButton).build(); + buttonBar.setBorder(Borders.DIALOG_BORDER); + + java.awt.Container contentPane = getContentPane(); +Index: zeroc-ice-3.4.2/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java +=================================================================== +--- zeroc-ice-3.4.2.orig/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java 2013-06-30 04:17:29.803044211 +0800 ++++ zeroc-ice-3.4.2/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java 2013-06-30 04:31:46.031290021 +0800 +@@ -34,7 +34,6 @@ + + import com.jgoodies.forms.builder.DefaultFormBuilder; + import com.jgoodies.forms.factories.Borders; +-import com.jgoodies.forms.factories.ButtonBarFactory; + import com.jgoodies.forms.layout.CellConstraints; + import com.jgoodies.forms.layout.FormLayout; + import com.jgoodies.forms.util.LayoutStyle; +@@ -169,7 +168,7 @@ + builder.append(_stdOut); + builder.append(stdErr); + builder.nextLine(); +- JComponent buttonBar = ButtonBarFactory.buildOKCancelBar(okButton, cancelButton); ++ JComponent buttonBar = new com.jgoodies.forms.builder.ButtonBarBuilder().addGlue().addButton(okButton, cancelButton).build(); + buttonBar.setBorder(Borders.DIALOG_BORDER); + + Container contentPane = getContentPane(); diff -Nru zeroc-ice-3.4.2/debian/patches/series zeroc-ice-3.4.2/debian/patches/series --- zeroc-ice-3.4.2/debian/patches/series 2013-03-04 19:58:06.000000000 +0800 +++ zeroc-ice-3.4.2/debian/patches/series 2013-06-30 05:25:35.000000000 +0800 @@ -14,3 +14,4 @@ cpp-make-rules.path php5.4-transition.patch force_gcc_46.patch +compatible-with-openjdk7.patch