You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by mg...@apache.org on 2021/12/19 19:20:55 UTC
[cayenne-modeler] branch master updated (e612d87 -> 89a84f4)
This is an automated email from the ASF dual-hosted git repository.
mgentry pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne-modeler.git.
from e612d87 Changes needed due to updating to the Cayenne 4.0 Beta.
new 5f81c3f For jEnv users, set Java version to 11.
new d34838e JGroups testing.
new 8a118a5 Specify Java 11.
new 89a84f4 Version updates to make project run again.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.java-version | 1 +
docs/Prerequisites.md | 2 +-
pom.xml | 173 ++++++++++++---------
.../org/apache/cayenne/modeler/CayenneModeler.java | 4 +-
src/test/resources/cayenne-analytic.xml | 3 +
5 files changed, 108 insertions(+), 75 deletions(-)
create mode 100644 .java-version
[cayenne-modeler] 04/04: Version updates to make project run again.
Posted by mg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mgentry pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne-modeler.git
commit 89a84f47d985f38e46ffbcd077f8a2f8fbd262a0
Author: Michael Gentry <bl...@gmail.com>
AuthorDate: Sun Dec 19 14:19:10 2021 -0500
Version updates to make project run again.
---
pom.xml | 173 +++++++++++++++++++++++++++++++++++++---------------------------
1 file changed, 100 insertions(+), 73 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6a547d5..7090be6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,69 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
<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>
- <groupId>org.apache.cayenne</groupId>
- <artifactId>modeler</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <name>Cayenne Modeler Prototype</name>
+ 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>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>modeler</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>Cayenne Modeler Prototype</name>
- <properties>
- <cayenne.version>4.0.B1</cayenne.version>
- <fontawesomefx.version>8.9</fontawesomefx.version>
- <java.version>1.8</java.version>
- <jfxtras.version>8.0-r4</jfxtras.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
+ <properties>
+ <cayenne.version>4.0.2</cayenne.version>
+ <fontawesomefx.version>8.9</fontawesomefx.version>
+ <java.version>11</java.version>
+ <jfx.version>17.0.1</jfx.version>
+ <jfxtras.version>9.0-r1</jfxtras.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>${java.version}</source>
+ <target>${java.version}</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.openjfx</groupId>
+ <artifactId>javafx-maven-plugin</artifactId>
+ <version>0.0.8</version>
+ <configuration>
+ <mainClass>org.apache.cayenne.modeler.CayenneModeler</mainClass>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.25</version>
</dependency>
- <dependency>
- <groupId>org.apache.cayenne</groupId>
- <artifactId>cayenne-server</artifactId>
- <version>${cayenne.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-server</artifactId>
+ <version>${cayenne.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-jgroups</artifactId>
@@ -79,25 +88,43 @@
<artifactId>cayenne-xmpp</artifactId>
<version>${cayenne.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.cayenne</groupId>
- <artifactId>cayenne-project</artifactId>
- <version>${cayenne.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.4</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
- </dependency>
- <dependency>
- <groupId>de.jensd</groupId>
- <artifactId>fontawesomefx</artifactId>
- <version>${fontawesomefx.version}</version>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-project</artifactId>
+ <version>${cayenne.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <version>2.12.3.Final</version>
+ <!-- <version>3.6.20.Final</version> -->
+ <!-- <version>4.2.4.Final</version> -->
+ <!-- <version>5.1.9.Final</version> -->
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openjfx</groupId>
+ <artifactId>javafx-controls</artifactId>
+ <version>${jfx.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openjfx</groupId>
+ <artifactId>javafx-fxml</artifactId>
+ <version>${jfx.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>de.jensd</groupId>
+ <artifactId>fontawesomefx</artifactId>
+ <version>${fontawesomefx.version}</version>
+ </dependency>
+ </dependencies>
</project>
[cayenne-modeler] 02/04: JGroups testing.
Posted by mg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mgentry pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne-modeler.git
commit d34838eada387d4f7b801f8d1ac766053a7d9396
Author: Michael Gentry <bl...@gmail.com>
AuthorDate: Sun Dec 19 14:18:27 2021 -0500
JGroups testing.
---
src/main/java/org/apache/cayenne/modeler/CayenneModeler.java | 4 +++-
src/test/resources/cayenne-analytic.xml | 3 +++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/cayenne/modeler/CayenneModeler.java b/src/main/java/org/apache/cayenne/modeler/CayenneModeler.java
index ca4ac5d..efeeaea 100644
--- a/src/main/java/org/apache/cayenne/modeler/CayenneModeler.java
+++ b/src/main/java/org/apache/cayenne/modeler/CayenneModeler.java
@@ -25,6 +25,7 @@ import java.util.Collection;
import org.apache.cayenne.configuration.server.ServerModule;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Module;
+import org.apache.cayenne.event.JGroupsModule;
import org.apache.cayenne.modeler.di.Injection;
import org.apache.cayenne.modeler.layout.MainWindowLayout;
import org.apache.cayenne.modeler.layout.PreferencesLayout;
@@ -178,6 +179,7 @@ public class CayenneModeler extends Application
modules.add(new ServerModule("CayenneModeler"));
// modules.add(ServerRuntime.builder().addConfig("CayenneModeler").build());
modules.add(new ProjectModule());
+ modules.add(new JGroupsModule());
// modules.add(new CayenneModelerModule());
return modules;
@@ -187,7 +189,7 @@ public class CayenneModeler extends Application
{
// Font.loadFont(CayenneModeler.class.getResource("/font/fontawesome-webfont.ttf").toExternalForm(), 10);
- Injection.setInjector(DIBootstrap.createInjector(appendModules(new ArrayList<Module>())));
+ Injection.setInjector(DIBootstrap.createInjector(appendModules(new ArrayList<>())));
launch(args);
}
diff --git a/src/test/resources/cayenne-analytic.xml b/src/test/resources/cayenne-analytic.xml
index a5b1898..e48f780 100644
--- a/src/test/resources/cayenne-analytic.xml
+++ b/src/test/resources/cayenne-analytic.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<domain project-version="9">
<property name="cayenne.DataDomain.validatingObjectsOnCommit" value="false"/>
+ <property name="cayenne.DataRowStore.EventBridge.factory" value="org.apache.cayenne.event.JavaGroupsBridgeFactory"/>
<property name="cayenne.DataRowStore.remote.notify" value="true"/>
+ <property name="cayenne.JMSBridge.topic.connection.factory" value="JmsTopicConnectionFactory"/>
+ <property name="javagroupsbridge.config.url" value="mrg"/>
<map name="analytic"/>
[cayenne-modeler] 01/04: For jEnv users, set Java version to 11.
Posted by mg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mgentry pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne-modeler.git
commit 5f81c3fa21ceabed217a2debfe6b1b1a1764a211
Author: Michael Gentry <bl...@gmail.com>
AuthorDate: Sun Dec 19 14:17:04 2021 -0500
For jEnv users, set Java version to 11.
---
.java-version | 1 +
1 file changed, 1 insertion(+)
diff --git a/.java-version b/.java-version
new file mode 100644
index 0000000..b4de394
--- /dev/null
+++ b/.java-version
@@ -0,0 +1 @@
+11
[cayenne-modeler] 03/04: Specify Java 11.
Posted by mg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mgentry pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne-modeler.git
commit 8a118a5b75bf3358ef00bbecaedfd01f53c1f95f
Author: Michael Gentry <bl...@gmail.com>
AuthorDate: Sun Dec 19 14:18:45 2021 -0500
Specify Java 11.
---
docs/Prerequisites.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/Prerequisites.md b/docs/Prerequisites.md
index 0acbbbb..302b0b8 100644
--- a/docs/Prerequisites.md
+++ b/docs/Prerequisites.md
@@ -1,6 +1,6 @@
# Development > Prerequisites
-* Java 8
+* Java 11
* [Scene Builder](http://gluonhq.com/open-source/scene-builder/) (to edit FXML files)
* An IDE
* Eclipse