You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by ko...@apache.org on 2015/04/24 00:12:54 UTC
[09/17] cayenne git commit: Merge remote-tracking branch
'upstream/master'
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/1a722e5a
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/1a722e5a
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/1a722e5a
Branch: refs/heads/master
Commit: 1a722e5a5af61ac63b5cd7ed6b77d986a7a51a02
Parents: 31d59e0 76af157
Author: alexkolonitsky <Al...@gmail.com>
Authored: Tue Oct 21 11:05:18 2014 +0300
Committer: alexkolonitsky <Al...@gmail.com>
Committed: Tue Oct 21 11:05:18 2014 +0300
----------------------------------------------------------------------
build-tools/cayenne-coverage/pom.xml | 18 +
.../cayenne/query/ClientExpressionTest.java | 18 +
.../apache/cayenne/query/SelectByIdTest.java | 18 +
.../org/apache/cayenne/crypto/db/Table1.java | 18 +
.../org/apache/cayenne/crypto/db/Table2.java | 18 +
.../org/apache/cayenne/crypto/db/Table3.java | 18 +
.../java/org/apache/cayenne/exp/Expression.java | 303 ++++--
.../apache/cayenne/exp/ExpressionFactory.java | 215 ++++-
.../apache/cayenne/exp/ExpressionParameter.java | 61 +-
.../org/apache/cayenne/query/SelectById.java | 18 +
.../exp/ExpressionFactoryExtrasTest.java | 92 --
.../cayenne/exp/ExpressionFactoryTest.java | 514 +++++------
.../exp/ExpressionFactory_InContextTest.java | 319 +++++++
.../org/apache/cayenne/exp/ExpressionTest.java | 912 ++++++++-----------
.../cayenne/exp/Expression_InContextTest.java | 132 +++
.../exp/Expression_ParamsLegacyTest.java | 92 ++
.../cayenne/exp/Expression_ParamsTest.java | 471 ++++++++++
.../cayenne/exp/ParametrizedExpressionTest.java | 369 --------
.../apache/cayenne/exp/TstTraversalHandler.java | 172 ++--
.../apache/cayenne/query/SelectByIdTest.java | 18 +
docs/doc/src/main/resources/RELEASE-NOTES.txt | 4 +
.../modeler/CayenneModelerController.java | 61 +-
.../cayenne/modeler/ProjectController.java | 66 +-
.../apache/cayenne/modeler/ProjectTreeView.java | 83 +-
.../apache/cayenne/modeler/TreeDragSource.java | 97 ++
.../apache/cayenne/modeler/TreeDropTarget.java | 109 +++
.../action/CopyAttributeRelationshipAction.java | 72 ++
.../action/CutAttributeRelationshipAction.java | 74 ++
.../modeler/action/DefaultActionManager.java | 36 +-
.../modeler/action/LinkDataMapAction.java | 90 ++
.../modeler/action/LinkDataMapsAction.java | 76 ++
.../cayenne/modeler/action/RemoveAction.java | 15 +-
.../RemoveAttributeRelationshipAction.java | 74 ++
.../dialog/db/DbMigrateOptionsDialog.java | 18 +
.../cayenne/modeler/editor/DataMapView.java | 61 +-
.../modeler/editor/ObjAttributeTableModel.java | 2 +-
.../modeler/editor/ObjEntityAttributePanel.java | 506 ++++++++++
.../ObjEntityAttributeRelationshipTab.java | 156 ++++
.../modeler/editor/ObjEntityAttributeTab.java | 569 ------------
.../editor/ObjEntityRelationshipPanel.java | 472 ++++++++++
.../editor/ObjEntityRelationshipTab.java | 511 -----------
.../modeler/editor/ObjEntityTabbedView.java | 51 +-
.../editor/dbentity/DbEntityAttributePanel.java | 222 +++++
.../DbEntityAttributeRelationshipTab.java | 157 ++++
.../editor/dbentity/DbEntityAttributeTab.java | 274 ------
.../dbentity/DbEntityRelationshipPanel.java | 350 +++++++
.../dbentity/DbEntityRelationshipTab.java | 392 --------
.../editor/dbentity/DbEntityTabbedView.java | 74 +-
.../validation/AttributeValidationFailure.java | 18 +
.../ObjAttributeWrapperValidator.java | 18 +
.../editor/wrapper/ObjAttributeWrapper.java | 18 +
.../cayenne/modeler/editor/wrapper/Wrapper.java | 18 +
.../event/MultipleObjectsDisplayEvent.java | 14 +-
.../modeler/event/ProjectOnSaveEvent.java | 18 +
.../modeler/event/ProjectOnSaveListener.java | 18 +
.../modeler/undo/LinkDataMapUndoableEdit.java | 71 ++
.../modeler/undo/LinkDataMapsUndoableEdit.java | 64 ++
pom.xml | 14 +-
rat.sh | 1 +
59 files changed, 5271 insertions(+), 3469 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1a722e5a/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 859b54a,ec5cac1..824ae9e
--- a/pom.xml
+++ b/pom.xml
@@@ -520,19 -520,7 +520,7 @@@
<enabled>true</enabled>
</releases>
</pluginRepository>
- <pluginRepository>
- <id>central</id>
- <name>Maven Central</name>
- <url>http://repo1.maven.org/maven2/</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </pluginRepository>
-- </pluginRepositories>
++ </pluginRepositories>
<build>
<defaultGoal>install</defaultGoal>