Updated release notes. Simplified artifact ids.

Author: atsticks

Diff for: README.md

@@ -4,18 +4,20 @@ Java Money and Currency - Libraries extending JSR 354
 JavaMoney-lib provides extensions and libraries built upon JSR 354 (compatible implementations).
 Whereas the JSR 354 API and reference implementation provides the fundamentals like monetary amounts,
 customizable currencies and interfaces for interoperation this library adds additional powerful
-APIs and SPIs that were implemented during JSR development as a proof of concept:
+APIs and SPIs that were implemented during JSR development as a proof of concept (artifactIds in brackets):
 
-* [**Calculation**](calc) provides a set of monetary calculations and formulas. The idea here is to provide a comprehensive set of algorithms and tools to perform complex financial mathematics.
-* [**Exchange**](exchange) provides further conversion exchange resources such as FRD and Yahoo.
-* [**javamoney-cdi**](integration/javamoney-cdi) Integrates JavaMoney with CDI, so SPIs can as well be loaded from CDI.
+* **Calculation** (javamoney-calc) provides a set of monetary calculations and formulas. The idea here is to provide a comprehensive set of algorithms and tools to perform complex financial mathematics.
+* **Exchange** (javamoney-exchange) provides further conversion exchange resources such as FRD and Yahoo.
+  * **FRB** (javamoney-exchange-frb) provides conversion exchange for US Federal Reserve Department FRD.
+  * **Yahoo** (javamoney-exchange-yahoo) provides conversion exchange using Yahoo financial APIs.
+* **javamoney-cdi** (integration/javamoney-cdi) Integrates JavaMoney with CDI.
 
 To use the library you simply have to add the Maven dependency to your project:
 
 ```xml
 <dependency>
-  <groupId>org.javamoney</groupId>
-  <artifactId>javamoney-${module}</artifactId>
+  <groupId>org.javamoney.lib</groupId>
+  <artifactId>${artifactId}</artifactId>
   <versionId>the current library version</version>
 </dependency>
 ```
@@ -26,6 +28,14 @@ Different people have contributed to this project. During the development of JSR
 founded this project and were also the main contributors. Nevertheless everybody is really welcome to help
 us, to make this library more feasible and add features.
 
+Special thanks go to @manuela-grindei for her awsome help implementing financial formulas.
+
+Release Notes
+-------------
+
+* **1.0** First release of the libraries.
+
+
 javamoney-shelter
 -----------------
 The javamoney [shelter module](http://javamoney.github.io/shelter.html) is for testing out new features or

Diff for: calc/pom.xml

@@ -91,13 +91,14 @@
 			<groupId>javax.money</groupId>
 			<artifactId>money-api</artifactId>
 		</dependency>
-		<!--<dependency>-->
-			<!--<groupId>org.javamoney.moneta</groupId>-->
-			<!--<artifactId>moneta-core</artifactId>-->
-		<!--</dependency>-->
 		<dependency>
 			<groupId>javax.annotation</groupId>
 			<artifactId>javax.annotation-api</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.javamoney.moneta</groupId>
+			<artifactId>moneta-core</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>

Diff for: calc/src/test/java/org/javamoney/calc/common/PresentValueTest.java

@@ -23,7 +23,6 @@
 import java.math.RoundingMode;
 import javax.money.*;
 
-import org.javamoney.moneta.Money;
 import org.junit.Test;
 
 /**
@@ -40,19 +39,20 @@ public class PresentValueTest{
      */
     @Test
     public void testOfAndApply() throws Exception {
-        Money money = Money.of(100, "CHF");
+        MonetaryAmountFactory fact = Monetary.getDefaultAmountFactory();
+        MonetaryAmount money = fact.setCurrency("CHF").setNumber(100).create();
         MonetaryOperator rounding = Monetary.getRounding(RoundingQueryBuilder.of().setScale(2).set(RoundingMode.HALF_EVEN)
                 .build());
-        assertEquals(Money.of(BigDecimal.valueOf(95.24), "CHF"), money.with(PresentValue.of(RateAndPeriods.of(0.05, 1))).with(rounding));
-        assertEquals(Money.of(BigDecimal.valueOf(90.70), "CHF"), money.with(PresentValue.of(RateAndPeriods.of(0.05, 2))).with(rounding));
-        assertEquals(Money.of(BigDecimal.valueOf(47.51), "CHF"), money.with(PresentValue.of(RateAndPeriods.of(0.07, 11))).with(rounding));
+        assertEquals(fact.setNumber(95.24).create(), money.with(PresentValue.of(RateAndPeriods.of(0.05, 1))).with(rounding));
+        assertEquals(fact.setNumber(90.70).create(), money.with(PresentValue.of(RateAndPeriods.of(0.05, 2))).with(rounding));
+        assertEquals(fact.setNumber(47.51).create(), money.with(PresentValue.of(RateAndPeriods.of(0.07, 11))).with(rounding));
 
-        assertEquals(Money.of(BigDecimal.valueOf(100.00), "CHF"), money.with(PresentValue.of(RateAndPeriods.of(0.05, 0))).with(rounding));
-        assertEquals(Money.of(BigDecimal.valueOf(100.00), "CHF"), money.with(PresentValue.of(RateAndPeriods.of(-0.05, 0))).with(rounding));
+        assertEquals(fact.setNumber(100.00).create(), money.with(PresentValue.of(RateAndPeriods.of(0.05, 0))).with(rounding));
+        assertEquals(fact.setNumber(100.00).create(), money.with(PresentValue.of(RateAndPeriods.of(-0.05, 0))).with(rounding));
 
-        assertEquals(Money.of(BigDecimal.valueOf(105.26), "CHF"), money.with(PresentValue.of(RateAndPeriods.of(-0.05, 1))).with(rounding));
-        assertEquals(Money.of(BigDecimal.valueOf(110.80), "CHF"), money.with(PresentValue.of(RateAndPeriods.of(-0.05, 2))).with(rounding));
-        assertEquals(Money.of(BigDecimal.valueOf(222.17), "CHF"), money.with(PresentValue.of(RateAndPeriods.of(-0.07, 11))).with(rounding));
+        assertEquals(fact.setNumber(105.26).create(), money.with(PresentValue.of(RateAndPeriods.of(-0.05, 1))).with(rounding));
+        assertEquals(fact.setNumber(110.80).create(), money.with(PresentValue.of(RateAndPeriods.of(-0.05, 2))).with(rounding));
+        assertEquals(fact.setNumber(222.17).create(), money.with(PresentValue.of(RateAndPeriods.of(-0.07, 11))).with(rounding));
     }
 
     /**
@@ -62,12 +62,13 @@ public void testOfAndApply() throws Exception {
      */
     @Test
     public void testCalculate() throws Exception {
-        Money money = Money.of(100, "CHF");
+        MonetaryAmountFactory fact = Monetary.getDefaultAmountFactory();
+        MonetaryAmount money = fact.setNumber(100).setCurrency("CHF").create();
         MonetaryOperator rounding = Monetary.getRounding(RoundingQueryBuilder.of().setScale(2).set(RoundingMode.HALF_EVEN)
                 .build());
-        assertEquals(Money.of(BigDecimal.valueOf(95.24), "CHF"), PresentValue.calculate(money, RateAndPeriods.of(0.05, 1)).with(rounding));
-        assertEquals(Money.of(BigDecimal.valueOf(90.70), "CHF"), PresentValue.calculate(money, RateAndPeriods.of(0.05, 2)).with(rounding));
-        assertEquals(Money.of(BigDecimal.valueOf(47.51), "CHF"), PresentValue.calculate(money, RateAndPeriods.of(0.07, 11)).with(rounding));
+        assertEquals(fact.setNumber(95.24).create(), PresentValue.calculate(money, RateAndPeriods.of(0.05, 1)).with(rounding));
+        assertEquals(fact.setNumber(90.70).create(), PresentValue.calculate(money, RateAndPeriods.of(0.05, 2)).with(rounding));
+        assertEquals(fact.setNumber(47.51).create(), PresentValue.calculate(money, RateAndPeriods.of(0.07, 11)).with(rounding));
     }
 
     /**

Diff for: calc/src/test/java/org/javamoney/calc/securities/CapitalGainsYieldTest.java

@@ -21,6 +21,8 @@
 import org.javamoney.moneta.Money;
 import org.junit.Test;
 
+import javax.money.MonetaryAmount;
+
 import static org.junit.Assert.assertEquals;
 
 /**
@@ -30,8 +32,8 @@
  */
 public class CapitalGainsYieldTest {
 
-    private static final Money INITIAL_STOCK_PRICE = Money.of(123, "GBP");
-    private static final Money STOCK_PRICE_AFTER_FIRST_PERIOD = Money.of(223, "GBP");
+    private static final MonetaryAmount INITIAL_STOCK_PRICE = Money.of(123, "GBP");
+    private static final MonetaryAmount STOCK_PRICE_AFTER_FIRST_PERIOD = Money.of(223, "GBP");
 
     /**
      * Test calculate.

Diff for: exchange/exchange-rate-frb/pom.xml

@@ -24,7 +24,7 @@
 		<artifactId>javamoney-exchange</artifactId>
 		<version>1.0</version>
 	</parent>
-	<artifactId>javamoney-exchange-rate-frb</artifactId>
+	<artifactId>javamoney-exchange-frb</artifactId>
 	<packaging>jar</packaging>
 
 	<name>JavaMoney Exchange Federal Reserve Bank Rate Provider</name>

Diff for: exchange/exchange-rate-yahoo/pom.xml

@@ -24,7 +24,7 @@
 		<artifactId>javamoney-exchange</artifactId>
 		<version>1.0</version>
 	</parent>
-	<artifactId>javamoney-exchange-rate-yahoo</artifactId>
+	<artifactId>javamoney-exchange-yahoo</artifactId>
 	<packaging>jar</packaging>
 
 	<name>JavaMoney Exchange Yahoo Rate Provider</name>

Diff for: javamoney-cdi/pom.xml

@@ -25,6 +25,15 @@
 			<version>1</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.money</groupId>
+            <artifactId>money-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.javamoney.moneta</groupId>
+            <artifactId>moneta-core</artifactId>
+            <scope>test</scope>
+        </dependency>
 	</dependencies>
 
 </project>