#217 moved mini example modules

sialcasa · Jul 2, 2015 · 6ddd78e · 6ddd78e
1 parent 8b930b7
commit 6ddd78e
Show file tree

Hide file tree

Showing 27 changed files with 80 additions and 49 deletions.
diff --git a/examples/mvvmfx-fx-root-example/README.md → ...s/mini-examples/fx-root-example/README.md b/examples/mvvmfx-fx-root-example/README.md → ...s/mini-examples/fx-root-example/README.md
diff --git a/examples/mvvmfx-fx-root-example/pom.xml → ...les/mini-examples/fx-root-example/pom.xml b/examples/mvvmfx-fx-root-example/pom.xml → ...les/mini-examples/fx-root-example/pom.xml
@@ -1,14 +1,16 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
-	<artifactId>mvvmfx-fx-root-example</artifactId>
-	<name>Example with fx:root</name>
-
 	<parent>
+		<artifactId>mini-examples</artifactId>
 		<groupId>de.saxsys.mvvmfx</groupId>
-		<artifactId>examples</artifactId>
 		<version>1.4.0-SNAPSHOT</version>
 	</parent>
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>fx-root-example</artifactId>
+	<name>Example with fx:root</name>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -47,4 +49,4 @@
 		</dependency>
 	</dependencies>
 
-</project>
+</project>
diff --git a/...mfx/fx_root_example/LabeledTextField.java → ...mfx/fx_root_example/LabeledTextField.java b/...mfx/fx_root_example/LabeledTextField.java → ...mfx/fx_root_example/LabeledTextField.java
@@ -1,12 +1,12 @@
 package de.saxsys.jfx.mvvmfx.fx_root_example;
 
-import de.saxsys.mvvmfx.FluentViewLoader;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 import javafx.scene.layout.HBox;
 
+import de.saxsys.mvvmfx.FluentViewLoader;
 import de.saxsys.mvvmfx.FxmlView;
 import de.saxsys.mvvmfx.InjectViewModel;
 

diff --git a/...ot_example/LabeledTextFieldViewModel.java → ...ot_example/LabeledTextFieldViewModel.java b/...ot_example/LabeledTextFieldViewModel.java → ...ot_example/LabeledTextFieldViewModel.java
diff --git a/...s/jfx/mvvmfx/fx_root_example/Starter.java → ...s/jfx/mvvmfx/fx_root_example/Starter.java b/...s/jfx/mvvmfx/fx_root_example/Starter.java → ...s/jfx/mvvmfx/fx_root_example/Starter.java
diff --git a/...mfx/fx_root_example/LabeledTextField.fxml → ...mfx/fx_root_example/LabeledTextField.fxml b/...mfx/fx_root_example/LabeledTextField.fxml → ...mfx/fx_root_example/LabeledTextField.fxml
diff --git a/...ot_example/IntegrationTestWithTestFX.java → ...ot_example/IntegrationTestWithTestFX.java b/...ot_example/IntegrationTestWithTestFX.java → ...ot_example/IntegrationTestWithTestFX.java
@@ -1,14 +1,15 @@
 package de.saxsys.jfx.mvvmfx.fx_root_example;
 
+import static org.loadui.testfx.Assertions.verifyThat;
+
 import javafx.scene.Parent;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
+
 import org.junit.Test;
 import org.loadui.testfx.GuiTest;
 
-import static org.loadui.testfx.Assertions.verifyThat;
-
 public class IntegrationTestWithTestFX extends GuiTest {
 
 	@Override

diff --git a/...fx_root_example/LabeledTextFieldTest.java → ...fx_root_example/LabeledTextFieldTest.java b/...fx_root_example/LabeledTextFieldTest.java → ...fx_root_example/LabeledTextFieldTest.java
diff --git a/...es/mvvmfx-helloworld-without-fxml/pom.xml → ...-examples/helloworld-without-fxml/pom.xml b/...es/mvvmfx-helloworld-without-fxml/pom.xml → ...-examples/helloworld-without-fxml/pom.xml
@@ -1,21 +1,16 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
-	<artifactId>mvvmfx-helloworld-without-fxml</artifactId>
-	<name>HelloWorld Example without FXML</name>
-
 	<parent>
+		<artifactId>mini-examples</artifactId>
 		<groupId>de.saxsys.mvvmfx</groupId>
-		<artifactId>examples</artifactId>
 		<version>1.4.0-SNAPSHOT</version>
 	</parent>
+	<modelVersion>4.0.0</modelVersion>
 
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
-	</properties>
-
+	<artifactId>helloworld-without-fxml</artifactId>
+	<name>HelloWorld Example without FXML</name>
 
 	<dependencies>
 		<dependency>
@@ -24,4 +19,5 @@
 		</dependency>
 	</dependencies>
 
-</project>
+
+</project>
diff --git a/...jfx/mvvmfx/helloworld/HelloWorldView.java → ...jfx/mvvmfx/helloworld/HelloWorldView.java b/...jfx/mvvmfx/helloworld/HelloWorldView.java → ...jfx/mvvmfx/helloworld/HelloWorldView.java
diff --git a/...vvmfx/helloworld/HelloWorldViewModel.java → ...vvmfx/helloworld/HelloWorldViewModel.java b/...vvmfx/helloworld/HelloWorldViewModel.java → ...vvmfx/helloworld/HelloWorldViewModel.java
diff --git a/...saxsys/jfx/mvvmfx/helloworld/Starter.java → ...saxsys/jfx/mvvmfx/helloworld/Starter.java b/...saxsys/jfx/mvvmfx/helloworld/Starter.java → ...saxsys/jfx/mvvmfx/helloworld/Starter.java
diff --git a/examples/mvvmfx-helloworld/README.md → examples/mini-examples/helloworld/README.md b/examples/mvvmfx-helloworld/README.md → examples/mini-examples/helloworld/README.md
diff --git a/examples/mvvmfx-helloworld/pom.xml → examples/mini-examples/helloworld/pom.xml b/examples/mvvmfx-helloworld/pom.xml → examples/mini-examples/helloworld/pom.xml
@@ -1,19 +1,16 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
-	<artifactId>mvvmfx-helloworld</artifactId>
-	<name>HelloWorld Example</name>
 	<parent>
+		<artifactId>mini-examples</artifactId>
 		<groupId>de.saxsys.mvvmfx</groupId>
-		<artifactId>examples</artifactId>
 		<version>1.4.0-SNAPSHOT</version>
 	</parent>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
-	</properties>
+	<modelVersion>4.0.0</modelVersion>
 
+	<artifactId>helloworld</artifactId>
+	<name>HelloWorld Example</name>
 
 	<dependencies>
 		<dependency>
@@ -22,4 +19,5 @@
 		</dependency>
 	</dependencies>
 
-</project>
+
+</project>
diff --git a/...jfx/mvvmfx/helloworld/HelloWorldView.java → ...jfx/mvvmfx/helloworld/HelloWorldView.java b/...jfx/mvvmfx/helloworld/HelloWorldView.java → ...jfx/mvvmfx/helloworld/HelloWorldView.java
diff --git a/...vvmfx/helloworld/HelloWorldViewModel.java → ...vvmfx/helloworld/HelloWorldViewModel.java b/...vvmfx/helloworld/HelloWorldViewModel.java → ...vvmfx/helloworld/HelloWorldViewModel.java
diff --git a/...saxsys/jfx/mvvmfx/helloworld/Starter.java → ...saxsys/jfx/mvvmfx/helloworld/Starter.java b/...saxsys/jfx/mvvmfx/helloworld/Starter.java → ...saxsys/jfx/mvvmfx/helloworld/Starter.java
diff --git a/...jfx/mvvmfx/helloworld/HelloWorldView.fxml → ...jfx/mvvmfx/helloworld/HelloWorldView.fxml b/...jfx/mvvmfx/helloworld/HelloWorldView.fxml → ...jfx/mvvmfx/helloworld/HelloWorldView.fxml
diff --git a/examples/mini-examples/pom.xml b/examples/mini-examples/pom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+	<parent>
+		<artifactId>examples</artifactId>
+		<groupId>de.saxsys.mvvmfx</groupId>
+		<version>1.4.0-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<packaging>pom</packaging>
+	<artifactId>mini-examples</artifactId>
+
+	<name>mvvmfx - mini-examples</name>
+
+
+	<modules>
+		<module>synchronizefx-example</module>
+		<module>fx-root-example</module>
+		<module>helloworld</module>
+		<module>helloworld-without-fxml</module>
+	</modules>
+
+
+</project>
diff --git a/examples/mvvmfx-synchronizefx/README.md → ...-examples/synchronizefx-example/README.md b/examples/mvvmfx-synchronizefx/README.md → ...-examples/synchronizefx-example/README.md
diff --git a/examples/mvvmfx-synchronizefx/pom.xml → ...ni-examples/synchronizefx-example/pom.xml b/examples/mvvmfx-synchronizefx/pom.xml → ...ni-examples/synchronizefx-example/pom.xml
@@ -1,13 +1,17 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
-	<artifactId>mvvmfx-synchronizefx</artifactId>
-	<name>SynchronizeFX example</name>
 	<parent>
+		<artifactId>mini-examples</artifactId>
 		<groupId>de.saxsys.mvvmfx</groupId>
-		<artifactId>examples</artifactId>
 		<version>1.4.0-SNAPSHOT</version>
 	</parent>
+	<modelVersion>4.0.0</modelVersion>
+
+	<name>mvvmfx - synchronizeFX example</name>
+	<artifactId>synchronizefx-example</artifactId>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>1.8</maven.compiler.source>
@@ -33,4 +37,5 @@
 		</dependency>
 	</dependencies>
 
-</project>
+
+</project>
diff --git a/...vvmfx/examples/synchronize/ClientApp.java → ...vvmfx/examples/synchronize/ClientApp.java b/...vvmfx/examples/synchronize/ClientApp.java → ...vvmfx/examples/synchronize/ClientApp.java
diff --git a/...vvmfx/examples/synchronize/ServerApp.java → ...vvmfx/examples/synchronize/ServerApp.java b/...vvmfx/examples/synchronize/ServerApp.java → ...vvmfx/examples/synchronize/ServerApp.java
diff --git a/...vmfx/examples/synchronize/SliderView.java → ...vmfx/examples/synchronize/SliderView.java b/...vmfx/examples/synchronize/SliderView.java → ...vmfx/examples/synchronize/SliderView.java
@@ -3,6 +3,7 @@
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.control.Slider;
+
 import de.saxsys.mvvmfx.FxmlView;
 import de.saxsys.mvvmfx.InjectViewModel;
 

diff --git a/...examples/synchronize/SliderViewModel.java → ...examples/synchronize/SliderViewModel.java b/...examples/synchronize/SliderViewModel.java → ...examples/synchronize/SliderViewModel.java
@@ -1,12 +1,13 @@
 package de.saxsys.mvvmfx.examples.synchronize;
 
-import de.saxsys.mvvmfx.ViewModel;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ReadOnlyStringProperty;
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.beans.property.SimpleDoubleProperty;
 
+import de.saxsys.mvvmfx.ViewModel;
+
 public class SliderViewModel implements ViewModel {
 
 	private final DoubleProperty sliderValue = new SimpleDoubleProperty();

diff --git a/...vmfx/examples/synchronize/SliderView.fxml → ...vmfx/examples/synchronize/SliderView.fxml b/...vmfx/examples/synchronize/SliderView.fxml → ...vmfx/examples/synchronize/SliderView.fxml
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -17,18 +17,20 @@
 		<module>mvvmfx-complex-example</module>
 		<module>mvvmfx-guice-starter</module>
 		<module>mvvmfx-cdi-starter</module>
-		<module>mvvmfx-fx-root-example</module>
-		<module>mvvmfx-helloworld</module>
-		<module>mvvmfx-helloworld-without-fxml</module>
-		<module>mvvmfx-synchronizefx</module>
 		<module>contacts-example</module>
 		<module>books-example</module>
 		<module>todomvc-example</module>
+		<module>mini-examples</module>
 	</modules>
 
 
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>de.saxsys.mvvmfx</groupId>
+				<artifactId>mini-examples</artifactId>
+				<version>${project.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>de.saxsys.mvvmfx</groupId>
 				<artifactId>mvvmfx-complex</artifactId>
@@ -46,22 +48,22 @@
 			</dependency>
 			<dependency>
 				<groupId>de.saxsys.mvvmfx</groupId>
-				<artifactId>mvvmfx-fx-root-example</artifactId>
+				<artifactId>fx-root-example</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>de.saxsys.mvvmfx</groupId>
-				<artifactId>mvvmfx-helloworld</artifactId>
+				<artifactId>helloworld</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>de.saxsys.mvvmfx</groupId>
-				<artifactId>mvvmfx-helloworld-without-fxml</artifactId>
+				<artifactId>helloworld-without-fxml</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>de.saxsys.mvvmfx</groupId>
-				<artifactId>mvvmfx-synchronizefx</artifactId>
+				<artifactId>synchronizefx-example</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>