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/28 11:22:20 UTC
[14/14] cayenne git commit: Cleanup after PR #278
Cleanup after PR #278
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/d56d9a6a
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/d56d9a6a
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/d56d9a6a
Branch: refs/heads/master
Commit: d56d9a6a3ddf88af53278e2e78ac4c6950242ea9
Parents: dbee2d1
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Mar 28 14:06:36 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Mar 28 14:06:36 2018 +0300
----------------------------------------------------------------------
.../src/main/resources/assemblies/assembly-mac.xml | 13 -------------
cayenne-dbsync/pom.xml | 5 -----
.../dbsync/reverse/configuration/ToolsModule.java | 3 +--
.../org/apache/cayenne/dbsync/xml/CatalogHandler.java | 10 ++++++++--
.../java/org/apache/cayenne/CayenneDataObject.java | 2 --
modeler/cayenne-modeler/pom.xml | 12 ------------
6 files changed, 9 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/d56d9a6a/assembly/src/main/resources/assemblies/assembly-mac.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-mac.xml b/assembly/src/main/resources/assemblies/assembly-mac.xml
index a6bd5a9..6ff90db 100644
--- a/assembly/src/main/resources/assemblies/assembly-mac.xml
+++ b/assembly/src/main/resources/assemblies/assembly-mac.xml
@@ -61,19 +61,6 @@
<include>KEYS</include>
</includes>
</fileSet>
- <fileSet>
- <directory>target/doc-staging</directory>
- <outputDirectory>cayenne-${project.version}-macosx/doc</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../</directory>
- <outputDirectory>cayenne-${project.version}-macosx/</outputDirectory>
- <includes>
- <include>RELEASE-NOTES.txt</include>
- <include>UPGRADE.txt</include>
- <include>KEYS</include>
- </includes>
- </fileSet>
</fileSets>
<dependencySets>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/d56d9a6a/cayenne-dbsync/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/pom.xml b/cayenne-dbsync/pom.xml
index fa5809e..5c68b4d 100644
--- a/cayenne-dbsync/pom.xml
+++ b/cayenne-dbsync/pom.xml
@@ -86,11 +86,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.cayenne</groupId>
- <artifactId>cayenne-di</artifactId>
- <version>4.1.M2-SNAPSHOT</version>
- </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/d56d9a6a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java
index 0ca291d..ceb1e11 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java
@@ -65,7 +65,6 @@ import org.apache.cayenne.log.Slf4jJdbcEventLogger;
import org.apache.cayenne.log.JdbcEventLogger;
import org.apache.cayenne.project.ProjectModule;
import org.apache.cayenne.project.extension.ExtensionAwareHandlerFactory;
-import org.apache.cayenne.project.extension.info.InfoExtension;
import org.apache.cayenne.resource.ClassLoaderResourceLocator;
import org.apache.cayenne.resource.ResourceLocator;
import org.slf4j.Logger;
@@ -122,7 +121,7 @@ public class ToolsModule implements Module {
binder.bind(DataChannelMetaData.class).to(DefaultDataChannelMetaData.class);
binder.bind(XMLReader.class).toProviderInstance(new XMLReaderProvider(true)).withoutScope();
- ProjectModule.contributeExtensions(binder).add(InfoExtension.class);
+ ProjectModule.contributeExtensions(binder);
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/d56d9a6a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/xml/CatalogHandler.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/xml/CatalogHandler.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/xml/CatalogHandler.java
index dd71840..06247d3 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/xml/CatalogHandler.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/xml/CatalogHandler.java
@@ -20,8 +20,14 @@
package org.apache.cayenne.dbsync.xml;
import org.apache.cayenne.configuration.xml.NamespaceAwareNestedTagHandler;
-import org.apache.cayenne.dbsync.reverse.dbimport.*;
-
+import org.apache.cayenne.dbsync.reverse.dbimport.Catalog;
+import org.apache.cayenne.dbsync.reverse.dbimport.ExcludeColumn;
+import org.apache.cayenne.dbsync.reverse.dbimport.ExcludeProcedure;
+import org.apache.cayenne.dbsync.reverse.dbimport.ExcludeTable;
+import org.apache.cayenne.dbsync.reverse.dbimport.IncludeColumn;
+import org.apache.cayenne.dbsync.reverse.dbimport.IncludeProcedure;
+import org.apache.cayenne.dbsync.reverse.dbimport.IncludeTable;
+import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/d56d9a6a/cayenne-server/src/main/java/org/apache/cayenne/CayenneDataObject.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/CayenneDataObject.java b/cayenne-server/src/main/java/org/apache/cayenne/CayenneDataObject.java
index 512f712..3cad849 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/CayenneDataObject.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/CayenneDataObject.java
@@ -47,8 +47,6 @@ public class CayenneDataObject extends BaseDataObject {
private static final long serialVersionUID = -313743913882350400L;
- protected long snapshotVersion = DEFAULT_VERSION;
-
protected Map<String, Object> values = new HashMap<>();
@Override
http://git-wip-us.apache.org/repos/asf/cayenne/blob/d56d9a6a/modeler/cayenne-modeler/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/pom.xml b/modeler/cayenne-modeler/pom.xml
index 794ebd3..a8ca1c1 100644
--- a/modeler/cayenne-modeler/pom.xml
+++ b/modeler/cayenne-modeler/pom.xml
@@ -20,18 +20,6 @@
<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>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
<parent>
<groupId>org.apache.cayenne.modeler</groupId>