updated demos

Change-Id: Ib042cbd72007a082c5d22bef72949b64c9a6e90a
diff --git a/examples/icu/.project b/examples/icu/.project
new file mode 100644
index 0000000..4101f21
--- /dev/null
+++ b/examples/icu/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>icu</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/examples/icu/org.eclipse.uomo.examples.icu.console/.classpath b/examples/icu/org.eclipse.uomo.examples.icu.console/.classpath
new file mode 100644
index 0000000..1e6d54b
--- /dev/null
+++ b/examples/icu/org.eclipse.uomo.examples.icu.console/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="src" path="src/main/java"/>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/examples/icu/org.eclipse.uomo.examples.icu.console/.project b/examples/icu/org.eclipse.uomo.examples.icu.console/.project
new file mode 100644
index 0000000..9b151a6
--- /dev/null
+++ b/examples/icu/org.eclipse.uomo.examples.icu.console/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.uomo.examples.icu.console</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.m2e.core.maven2Builder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+		<nature>org.eclipse.m2e.core.maven2Nature</nature>

+	</natures>

+</projectDescription>

diff --git a/examples/icu/org.eclipse.uomo.examples.icu.console/main/java/org/eclipse/uomo/examples/icu/console/ICUDemo.java b/examples/icu/org.eclipse.uomo.examples.icu.console/main/java/org/eclipse/uomo/examples/icu/console/ICUDemo.java
deleted file mode 100644
index 5eaf618..0000000
--- a/examples/icu/org.eclipse.uomo.examples.icu.console/main/java/org/eclipse/uomo/examples/icu/console/ICUDemo.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**

- * Copyright (c) 2005, 2020, Werner Keil and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    Werner Keil - initial API and implementation

- */

-package org.eclipse.uomo.examples.icu.console;

-

-//Constants (Java 5 static import)

-import static org.eclipse.uomo.business.money.MoneyUnit.EUR;

-import static org.eclipse.uomo.business.money.MoneyUnit.USD;

-

-import org.eclipse.uomo.business.internal.CurrencyUnit;

-import org.eclipse.uomo.business.internal.MonetaryAmount;

-import org.eclipse.uomo.business.money.MoneyAmount;

-import org.eclipse.uomo.business.money.MoneyConverter;

-import org.eclipse.uomo.business.money.MoneyUnit;

-

-/**

- * @author Werner Keil

- * @version 0.9.8, $Date: 2013-05-20 $

- */

-public class ICUDemo {

-

-	/**

-	 * @param args

-	 *            The application arguments if required.

-	 */

-	@SuppressWarnings({ "unchecked", "rawtypes" })

-	public static void main(String[] args) {

-		// /////////////////////////////////////////////////////////////////////

-		// Calculates the cost of a car trip in Europe for an American tourist.

-		// /////////////////////////////////////////////////////////////////////

-

-		@SuppressWarnings("unused")

-		MoneyConverter converter = new MoneyConverter(USD, EUR, 1.4);

-		CurrencyUnit currency = MoneyUnit.of("CHF");

-		MonetaryAmount money = MoneyAmount.of(100, currency);

-		

-		System.out.println(money);

-//		System.out.println(money.getCurrency());

-		System.out.println(converter.convert(34.6d));

-	}

-}

diff --git a/examples/icu/org.eclipse.uomo.examples.icu.console/pom.xml b/examples/icu/org.eclipse.uomo.examples.icu.console/pom.xml
index 2a06923..bdf1885 100644
--- a/examples/icu/org.eclipse.uomo.examples.icu.console/pom.xml
+++ b/examples/icu/org.eclipse.uomo.examples.icu.console/pom.xml
@@ -1,15 +1,52 @@
 <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>
   <parent>
-    <groupId>org.eclipse.uomo</groupId>
-    <artifactId>org.eclipse.uomo.examples</artifactId>
+    <groupId>org.eclipse.uomo.examples.icu</groupId>
+    <artifactId>org.eclipse.uomo.examples.icu</artifactId>
     <version>0.9.0-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.uomo.examples.icu</groupId>
-  <artifactId>org.eclipse.uomo.examples.icu</artifactId>
+  <artifactId>org.eclipse.uomo.examples.icu.console</artifactId>
   <packaging>pom</packaging>
-  <name>Eclipse UOMo ICU Examples</name>
-  <modules>
-  	<module>org.eclipse.uomo.examples.icu.console</module>
-  </modules>
+  <name>Eclipse UOMo ICU Console Examples</name>
+  
+	<dependencies>
+		<dependency>
+			<groupId>com.ibm.icu</groupId>
+			<artifactId>icu4j</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse</groupId>
+			<artifactId>osgi</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.measure</groupId>
+			<artifactId>unit-api</artifactId>
+		</dependency>
+		<dependency>
+        	<groupId>tech.units</groupId>
+        	<artifactId>indriya</artifactId>
+        </dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-all</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.uomo</groupId>
+			<artifactId>org.eclipse.uomo.core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.uomo</groupId>
+			<artifactId>org.eclipse.uomo.util</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.uomo</groupId>
+			<artifactId>org.eclipse.uomo.icu</artifactId>
+		</dependency>
+	</dependencies>
 </project>
\ No newline at end of file
diff --git a/examples/icu/org.eclipse.uomo.examples.icu.console/src/main/java/org/eclipse/uomo/examples/icu/console/ICUDemo.java b/examples/icu/org.eclipse.uomo.examples.icu.console/src/main/java/org/eclipse/uomo/examples/icu/console/ICUDemo.java
new file mode 100644
index 0000000..fb148c2
--- /dev/null
+++ b/examples/icu/org.eclipse.uomo.examples.icu.console/src/main/java/org/eclipse/uomo/examples/icu/console/ICUDemo.java
@@ -0,0 +1,33 @@
+/**

+ * Copyright (c) 2005, 2020, Werner Keil and others.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Werner Keil - initial API and implementation

+ */

+package org.eclipse.uomo.examples.icu.console;

+

+//Constants (Java 5 static import)

+//import static org.eclipse.uomo.icu

+

+/**

+ * @author Werner Keil

+ * @version 0.9.8, $Date: 2013-05-20 $

+ */

+public class ICUDemo {

+

+	/**

+	 * @param args

+	 *            The application arguments if required.

+	 */

+	@SuppressWarnings({ "unchecked", "rawtypes" })

+	public static void main(String[] args) {

+	

+		System.out.println("");

+//		System.out.println(money.getCurrency());

+

+	}

+}

diff --git a/examples/icu/org.eclipse.uomo.examples.icu.console/main/java/org/eclipse/uomo/examples/icu/console/internal/DemoMessages.java b/examples/icu/org.eclipse.uomo.examples.icu.console/src/main/java/org/eclipse/uomo/examples/icu/console/internal/DemoMessages.java
similarity index 88%
rename from examples/icu/org.eclipse.uomo.examples.icu.console/main/java/org/eclipse/uomo/examples/icu/console/internal/DemoMessages.java
rename to examples/icu/org.eclipse.uomo.examples.icu.console/src/main/java/org/eclipse/uomo/examples/icu/console/internal/DemoMessages.java
index a692f98..b7d9f85 100644
--- a/examples/icu/org.eclipse.uomo.examples.icu.console/main/java/org/eclipse/uomo/examples/icu/console/internal/DemoMessages.java
+++ b/examples/icu/org.eclipse.uomo.examples.icu.console/src/main/java/org/eclipse/uomo/examples/icu/console/internal/DemoMessages.java
@@ -13,7 +13,7 @@
 import org.eclipse.osgi.util.NLS;

 

 public class DemoMessages extends NLS {

-	private static final String BUNDLE_NAME = "org.eclipse.uomo.business.money.demomessages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.uomo.examples.icu.demomessages"; //$NON-NLS-1$

 	public static String MoneyDemo_Car_mileage;

 	public static String MoneyDemo_Gas_price;

 	public static String MoneyDemo_Trip_cost;

diff --git a/examples/icu/pom.xml b/examples/icu/pom.xml
new file mode 100644
index 0000000..2a06923
--- /dev/null
+++ b/examples/icu/pom.xml
@@ -0,0 +1,15 @@
+<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>
+  <parent>
+    <groupId>org.eclipse.uomo</groupId>
+    <artifactId>org.eclipse.uomo.examples</artifactId>
+    <version>0.9.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.eclipse.uomo.examples.icu</groupId>
+  <artifactId>org.eclipse.uomo.examples.icu</artifactId>
+  <packaging>pom</packaging>
+  <name>Eclipse UOMo ICU Examples</name>
+  <modules>
+  	<module>org.eclipse.uomo.examples.icu.console</module>
+  </modules>
+</project>
\ No newline at end of file
diff --git a/examples/pom.xml b/examples/pom.xml
index 5d71fa9..55708fe 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -60,6 +60,11 @@
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.uomo</groupId>
+				<artifactId>org.eclipse.uomo.icu</artifactId>
+				<version>${uomo-version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.uomo</groupId>
 				<artifactId>org.eclipse.uomo.util</artifactId>
 				<version>${uomo-version}</version>
 			</dependency>