- Recreated platform part, separating platform and standalone part.

- Removed invalid reference on platform RI from ext API
(MonetaryCurrencies).
- Unified maven names.

Author: atsticks

money-impl/platform-ri/src/main/java/javax/money/MonetaryCurrencies.java renamed to money-api/ext/src/main/java/javax/money/ext/MonetaryCurrencies.java

@@ -6,19 +6,16 @@
  * Copyright (c) 2012-2013, Credit Suisse
  * All rights reserved.
  */
-package javax.money;
+package javax.money.ext;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Currency;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.ServiceLoader;
-import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -373,74 +370,43 @@ private static CurrencyUnitMapperSpi loadCurrencyUnitMapperSpi() {
 	private static final class DefaultCurrencyUnitProviderSpi implements
 			CurrencyUnitProviderSpi {
 
+		private static final String ISO_NAMESPACE = "ISO-4217";
+
 		@Override
 		public String getDefaultNamespace() {
-			return MoneyCurrency.ISO_NAMESPACE;
+			return ISO_NAMESPACE;
 		}
 
 		@Override
 		public boolean isNamespaceAvailable(String namespace, Long timestamp) {
-			if (timestamp != null) {
-				return false;
-			}
-			return MoneyCurrency.ISO_NAMESPACE.equals(namespace);
+			return false;
 		}
 
 		@Override
 		public Collection<String> getNamespaces(Long timestamp) {
-			if (timestamp != null) {
-				return Collections.emptySet();
-			}
-			Set<String> namespaces = new HashSet<String>();
-			namespaces.add(MoneyCurrency.ISO_NAMESPACE);
-			return namespaces;
+			return Collections.emptySet();
 		}
 
 		@Override
-		public boolean isAvailable(String namespace, String code, Long timestamp) {
-			if (timestamp != null) {
-				return false;
-			}
-			return MoneyCurrency.of(namespace, code) != null;
+		public CurrencyUnit get(String namespace, String code, Long timestamp) {
+			throw new UnknownCurrencyException(namespace, code,
+					"No CurrencyUnitProviderSpi registered using ServiceLoader.");
 		}
 
 		@Override
-		public CurrencyUnit get(String namespace, String code, Long timestamp) {
-			if (timestamp != null) {
-				return null;
-			}
-			return MoneyCurrency.of(namespace, code);
+		public boolean isAvailable(String namespace, String code, Long timestamp) {
+			return false;
 		}
 
 		@Override
 		public Collection<CurrencyUnit> getAll(String namespace, Long timestamp) {
-			if (timestamp != null) {
-				return Collections.emptySet();
-			}
-			if (!isNamespaceAvailable(namespace, timestamp)) {
-				Collections.emptySet();
-			}
-			Set<CurrencyUnit> currencyUnits = new HashSet<CurrencyUnit>();
-			Set<Currency> currencies = Currency.getAvailableCurrencies();
-			for (Currency currency : currencies) {
-				currencyUnits.add(MoneyCurrency.of(currency));
-			}
-			return currencyUnits;
+			return Collections.emptySet();
 		}
 
 		@Override
 		public Collection<CurrencyUnit> getAll(Locale locale, Long timestamp) {
-			if (timestamp != null) {
-				return Collections.emptySet();
-			}
-			Set<CurrencyUnit> currencyUnits = new HashSet<CurrencyUnit>();
-			Currency jdkCurrency = Currency.getInstance(locale);
-			if (jdkCurrency != null) {
-				currencyUnits.add(MoneyCurrency.of(jdkCurrency));
-			}
-			return currencyUnits;
+			return Collections.emptySet();
 		}
-
 	}
 
 	private static final class DefaultCurrencyUnitMapperSpi implements
@@ -455,8 +421,9 @@ public CurrencyUnit map(String targetNamespace, Long timestamp,
 	}
 
 	/**
-	 * This class models the component defined by JSR 354 that provides accessors
-	 * for {@link CurrencyUnit}. It is provided by the Monetary singleton.
+	 * This class models the component defined by JSR 354 that provides
+	 * accessors for {@link CurrencyUnit}. It is provided by the Monetary
+	 * singleton.
 	 * 
 	 * @author Anatole Tresch
 	 */
@@ -553,10 +520,11 @@ public interface CurrencyUnitProviderSpi {
 		public Collection<CurrencyUnit> getAll(Locale locale, Long timestamp);
 
 	}
-	
+
 	/**
-	 * This class models the component defined by JSR 354 that provides accessors
-	 * for {@link CurrencyUnit}. It is provided by the Monetary singleton.
+	 * This class models the component defined by JSR 354 that provides
+	 * accessors for {@link CurrencyUnit}. It is provided by the Monetary
+	 * singleton.
 	 * 
 	 * @author Anatole Tresch
 	 */

money-impl/platform-ri/src/test/java/javax/money/MonetaryCurrenciesTest.java renamed to money-api/ext/src/test/java/javax/money/ext/MonetaryCurrenciesTest.java

@@ -6,14 +6,14 @@
  * Copyright (c) 2012-2013, Credit Suisse
  * All rights reserved.
  */
-package javax.money;
+package javax.money.ext;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import javax.money.CurrencyUnit;
-import javax.money.MonetaryCurrencies;
 import javax.money.MoneyCurrency;
+import javax.money.ext.MonetaryCurrencies;
 
 import org.junit.Test;
 

money-api/ext/src/test/java/javax/money/ext/TestCurrencyUnitProvider.java

@@ -0,0 +1,97 @@
+/*
+ * CREDIT SUISSE IS WILLING TO LICENSE THIS SPECIFICATION TO YOU ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS AGREEMENT. PLEASE READ THE TERMS AND CONDITIONS OF THIS AGREEMENT CAREFULLY. BY DOWNLOADING THIS SPECIFICATION, YOU ACCEPT THE TERMS AND CONDITIONS OF THE AGREEMENT. IF YOU ARE NOT WILLING TO BE BOUND BY IT, SELECT THE "DECLINE" BUTTON AT THE BOTTOM OF THIS PAGE.
+ *
+ * Specification:  JSR-354  Money and Currency API ("Specification")
+ *
+ * Copyright (c) 2012-2013, Credit Suisse
+ * All rights reserved.
+ */
+package javax.money.ext;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Currency;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Set;
+
+import javax.money.CurrencyUnit;
+import javax.money.MoneyCurrency;
+import javax.money.UnknownCurrencyException;
+import javax.money.ext.MonetaryCurrencies.CurrencyUnitProviderSpi;
+
+/**
+ * Empty pseudo implementation for testing only.
+ * 
+ * @author Anatole Tresch
+ * 
+ */
+public class TestCurrencyUnitProvider implements CurrencyUnitProviderSpi {
+
+	@Override
+	public String getDefaultNamespace() {
+		return MoneyCurrency.ISO_NAMESPACE;
+	}
+
+	@Override
+	public boolean isNamespaceAvailable(String namespace, Long timestamp) {
+		return false;
+	}
+
+	@Override
+	public Collection<String> getNamespaces(Long timestamp) {
+		Set<String> result = new HashSet<String>();
+		result.add(MoneyCurrency.ISO_NAMESPACE);
+		return result;
+	}
+
+	@Override
+	public boolean isAvailable(String namespace, String currencyCode, Long timestamp) {
+		if (timestamp == null) {
+			return MoneyCurrency.of(namespace, currencyCode) != null;
+		}
+		return false;
+	}
+
+	@Override
+	public CurrencyUnit get(String namespace, String currencyCode,
+			Long timestamp) {
+		if (timestamp == null) {
+			CurrencyUnit unit = MoneyCurrency.of(namespace, currencyCode);
+			if(unit!=null){
+				return unit;
+			}
+		}
+		throw new UnknownCurrencyException(namespace, currencyCode);
+	}
+
+	@Override
+	public Collection<CurrencyUnit> getAll(String namespace, Long timestamp) {
+		if (timestamp != null) {
+			return Collections.emptySet();
+		}
+		if (!isNamespaceAvailable(namespace, timestamp)) {
+			Collections.emptySet();
+		}
+		Set<CurrencyUnit> currencyUnits = new HashSet<CurrencyUnit>();
+		Set<Currency> currencies = Currency.getAvailableCurrencies();
+		for (Currency currency : currencies) {
+			currencyUnits.add(MoneyCurrency.of(currency));
+		}
+		return currencyUnits;
+	}
+
+	@Override
+	public Collection<CurrencyUnit> getAll(Locale locale, Long timestamp) {
+		if (timestamp != null) {
+			return Collections.emptySet();
+		}
+		Set<CurrencyUnit> currencyUnits = new HashSet<CurrencyUnit>();
+		Currency jdkCurrency = Currency.getInstance(locale);
+		if (jdkCurrency != null) {
+			currencyUnits.add(MoneyCurrency.of(jdkCurrency));
+		}
+		return currencyUnits;
+	}
+
+}

money-api/ext/src/test/resources/META-INF/services/javax.money.ext.MonetaryCurrencies$CurrencyUnitProviderSpi

@@ -0,0 +1 @@
+javax.money.ext.TestCurrencyUnitProvider

money-api/pom.xml

@@ -9,10 +9,9 @@
 	</parent>
 	<artifactId>money-api</artifactId>
 	<packaging>pom</packaging>
-	<name>JSR354 - Java Money and Currency API</name>
+	<name>JSR 354 (Money and Currency) - Standalone API</name>
 
 	<modules>
-	    <module>platform</module>
 		<module>convert</module>
 		<module>format</module>
 		<module>ext</module>

money-impl/cdi/pom.xml

@@ -7,7 +7,7 @@
 		<version>1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>money-cdi</artifactId>
-	<name>JSR 354 (Money and Currency) - Implementation for CDI</name>
+	<name>JSR 354 (Money and Currency) - CDI Standalone Support</name>
 	<description>Implementation of JSR 354 (CDI).</description>
 
 	<dependencies>

money-impl/cdi/src/test/java/SmokeTests.java

@@ -25,7 +25,6 @@
 
 import javax.money.CurrencyUnit;
 import javax.money.MonetaryAmount;
-import javax.money.MonetaryCurrencies;
 import javax.money.MonetaryOperator;
 import javax.money.Money;
 import javax.money.MoneyCurrency;
@@ -34,6 +33,7 @@
 import javax.money.convert.ExchangeRate;
 import javax.money.convert.ExchangeRateType;
 import javax.money.convert.MonetaryConversions;
+import javax.money.ext.MonetaryCurrencies;
 import javax.money.format.ItemFormat;
 import javax.money.format.ItemParseException;
 import javax.money.format.LocalizationStyle;

money-impl/java-ee/pom.xml

@@ -7,7 +7,7 @@
 		<version>1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>money-java-ee</artifactId>
-	<name>JSR 354 (Money and Currency) - Implementation for Java EE</name>
+	<name>JSR 354 (Money and Currency) - Java EE Support</name>
 	<description>Implementation of JSR 354, based on CDI features within a container.</description>
 
 	<dependencies>