You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/03/27 14:05:24 UTC

[1/3] cayenne git commit: Deprecated DPCP2

Repository: cayenne
Updated Branches:
  refs/heads/master bddc400b9 -> 85316fd29


Deprecated DPCP2


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/7f6908c7
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/7f6908c7
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/7f6908c7

Branch: refs/heads/master
Commit: 7f6908c74d9241fb5e68d82a3793cab267629493
Parents: b83cc3e
Author: Arseni Bulatski <an...@gmail.com>
Authored: Fri Jan 26 17:55:01 2018 +0300
Committer: Arseni Bulatski <an...@gmail.com>
Committed: Fri Jan 26 17:55:01 2018 +0300

----------------------------------------------------------------------
 RELEASE-NOTES.txt                                                  | 1 +
 UPGRADE.txt                                                        | 1 +
 .../apache/cayenne/configuration/server/DBCPDataSourceFactory.java | 2 ++
 3 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/7f6908c7/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 4f15920..57bf788 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -20,6 +20,7 @@ CAY-2393 Add sqlserver-docker profile to automate tests on SQLServer
 CAY-2394 Upgrade to Apache Velocity 2.0
 CAY-2395 cdbimport: add option to create project file
 CAY-2396 Upgrade maven-assembly-plugin to 3.1.0
+CAY-2400 Cayenne-DBCP2 was deprecated
 
 Bug Fixes:
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7f6908c7/UPGRADE.txt
----------------------------------------------------------------------
diff --git a/UPGRADE.txt b/UPGRADE.txt
index 0c9fc00..6b2f3d1 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -5,6 +5,7 @@ IMPORTANT: be sure to read all notes for the intermediate releases between your
            current release and the release you are upgrading to.
 -------------------------------------------------------------------------------
 UPGRADING TO 4.1.M2
+* Per CAY-2400 Cayenne-DBCP2 was deprecated
 
 * Per CAY-2377 All code deprecated in Cayenne 4.0 was removed, please review your code before upgrading.
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7f6908c7/cayenne-dbcp2/src/main/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-dbcp2/src/main/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactory.java b/cayenne-dbcp2/src/main/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactory.java
index 54d3a6d..6a4cf24 100644
--- a/cayenne-dbcp2/src/main/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactory.java
+++ b/cayenne-dbcp2/src/main/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactory.java
@@ -33,7 +33,9 @@ import org.slf4j.LoggerFactory;
 
 /**
  * A {@link DataSourceFactory} based on DBCP2 connection pool library.
+ * @deprecated since 4.1
  */
+@Deprecated
 public class DBCPDataSourceFactory implements DataSourceFactory {
 
 	private static final String DBCP2_PROPERTIES = "dbcp2.properties";


[2/3] cayenne git commit: CAY-2400 DBCPDataSourceFactory was deprecated

Posted by nt...@apache.org.
CAY-2400 DBCPDataSourceFactory was deprecated


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/0a053182
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/0a053182
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/0a053182

Branch: refs/heads/master
Commit: 0a05318297953c3fbebf225c5a0d6025880a05a0
Parents: 7f6908c
Author: Arseni Bulatski <an...@gmail.com>
Authored: Fri Feb 2 14:42:18 2018 +0300
Committer: Arseni Bulatski <an...@gmail.com>
Committed: Fri Feb 2 14:48:27 2018 +0300

----------------------------------------------------------------------
 .../editor/datanode/MainDataNodeEditor.java     |  3 +-
 .../editor/datanode/MainDataNodeView.java       | 32 ++++++++++++++------
 2 files changed, 25 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/0a053182/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeEditor.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeEditor.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeEditor.java
index d2b67fc..917c705 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeEditor.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeEditor.java
@@ -60,7 +60,7 @@ import org.apache.cayenne.validation.ValidationException;
 public class MainDataNodeEditor extends CayenneController {
 
 	protected static final String NO_LOCAL_DATA_SOURCE = "Select DataSource for Local Work...";
-	private static final String DBCP_DATA_SOURCE_FACTORY = "org.apache.cayenne.configuration.server.DBCPDataSourceFactory";
+	public static final String DBCP_DATA_SOURCE_FACTORY = "org.apache.cayenne.configuration.server.DBCPDataSourceFactory";
 
 	final static String[] standardDataSourceFactories = new String[] { XMLPoolingDataSourceFactory.class.getName(),
 			JNDIDataSourceFactory.class.getName(), DBCP_DATA_SOURCE_FACTORY };
@@ -270,6 +270,7 @@ public class MainDataNodeEditor extends CayenneController {
 	 * Selects a subview for a currently selected DataSource factory.
 	 */
 	protected void showDataSourceSubview(String factoryName) {
+
 		DataSourceEditor c = (DataSourceEditor) datasourceEditors.get(factoryName);
 
 		// create subview dynamically...

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0a053182/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeView.java
index 443df1c..6138e2e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeView.java
@@ -19,22 +19,25 @@
 
 package org.apache.cayenne.modeler.editor.datanode;
 
-import java.awt.BorderLayout;
-import java.awt.CardLayout;
-import java.awt.Font;
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+import com.jgoodies.forms.layout.FormLayout;
+import org.apache.cayenne.modeler.Application;
+import org.apache.cayenne.modeler.ProjectController;
+import org.apache.cayenne.modeler.util.JTextFieldUndoable;
 
 import javax.swing.JButton;
 import javax.swing.JComboBox;
+import javax.swing.JDialog;
 import javax.swing.JLabel;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Font;
+import java.awt.event.ActionEvent;
 
-import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.ProjectController;
-import org.apache.cayenne.modeler.util.JTextFieldUndoable;
-
-import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
+import static org.apache.cayenne.modeler.editor.datanode.MainDataNodeEditor.DBCP_DATA_SOURCE_FACTORY;
 
 /**
  * A view for the main DataNode editor tab.
@@ -57,6 +60,8 @@ public class MainDataNodeView extends JPanel {
 
         this.factories = Application.getWidgetFactory().createUndoableComboBox();
 
+        factories.addActionListener(this::showWarningMessage);
+
         this.localDataSources = Application.getWidgetFactory().createUndoableComboBox();
 
         this.schemaUpdateStrategy = Application.getWidgetFactory().createUndoableComboBox();
@@ -124,4 +129,13 @@ public class MainDataNodeView extends JPanel {
     public JButton getConfigLocalDataSources() {
         return configLocalDataSources;
     }
+
+    private void showWarningMessage(ActionEvent e){
+        if(DBCP_DATA_SOURCE_FACTORY.equals(factories.getSelectedItem())) {
+            JDialog dialog = new JOptionPane("DPCPDataSourceFactory is deprecated since 4.1", JOptionPane.WARNING_MESSAGE)
+                    .createDialog("Warning");
+            dialog.setAlwaysOnTop(true);
+            dialog.setVisible(true);
+        }
+    }
 }


[3/3] cayenne git commit: Merge remote-tracking branch 'remotes/parent/pr/263' into asf-master

Posted by nt...@apache.org.
Merge remote-tracking branch 'remotes/parent/pr/263' into asf-master

# Conflicts:
#	RELEASE-NOTES.txt


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/85316fd2
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/85316fd2
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/85316fd2

Branch: refs/heads/master
Commit: 85316fd29ead42f527f0d0f6f12004582ae79fd3
Parents: bddc400 0a05318
Author: Nikita Timofeev <st...@gmail.com>
Authored: Tue Mar 27 16:58:34 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Tue Mar 27 16:58:34 2018 +0300

----------------------------------------------------------------------
 RELEASE-NOTES.txt                               |  1 +
 UPGRADE.txt                                     |  1 +
 .../server/DBCPDataSourceFactory.java           |  2 ++
 .../editor/datanode/MainDataNodeEditor.java     |  3 +-
 .../editor/datanode/MainDataNodeView.java       | 32 ++++++++++++++------
 5 files changed, 29 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/85316fd2/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --cc RELEASE-NOTES.txt
index acdd968,57bf788..a8787a0
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@@ -21,14 -20,7 +21,15 @@@ CAY-2393 Add sqlserver-docker profile t
  CAY-2394 Upgrade to Apache Velocity 2.0
  CAY-2395 cdbimport: add option to create project file
  CAY-2396 Upgrade maven-assembly-plugin to 3.1.0
 -CAY-2400 Cayenne-DBCP2 was deprecated
 +CAY-2398 Deprecate cayenne-joda
++CAY-2400 Deprecate cayenne-dbcp2
 +CAY-2403 Extract eventbridges to top level
 +CAY-2404 Move itests to maven-plugins
 +CAY-2406 Add prefetch-related API to SQLSelect
 +CAY-2407 Modeler: add prefetch support for the SQLTemplate query
 +CAY-2410 Add prefetch type support for SQLTemplate query and SelectQuery
 +CAY-2414 Modeler: new icon design
 +CAY-2415 Transaction isolation and propagation support
  
  Bug Fixes: