Skip to content

Commit c8fcb28

Browse files
keilwkeilw
committed
OPEN - issue JAVAMONEY-15: EDR Specification Document
Fixed circular dependencies https://java.net/jira/browse/JAVAMONEY-15
1 parent 8b582f5 commit c8fcb28

File tree

17 files changed

+98
-113
lines changed

17 files changed

+98
-113
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@
1616
/money-impl/ri/.settings/org.eclipse.wst.common.component
1717
/money-platform/api/.settings/org.eclipse.wst.common.component
1818
/money-platform/api/.settings/org.eclipse.wst.common.project.facet.core.xml
19+
/money-api/platform/.settings

‎money-api/platform/.classpath‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<classpath>
3-
<classpathentry kind="src" output="target/classes" path="src/main/java">
4-
<attributes>
5-
<attribute name="optional" value="true"/>
6-
<attribute name="maven.pomderived" value="true"/>
7-
</attributes>
8-
</classpathentry>
9-
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
10-
<attributes>
11-
<attribute name="optional" value="true"/>
12-
<attribute name="maven.pomderived" value="true"/>
13-
</attributes>
14-
</classpathentry>
15-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
16-
<attributes>
17-
<attribute name="maven.pomderived" value="true"/>
18-
</attributes>
19-
</classpathentry>
20-
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
21-
<attributes>
22-
<attribute name="maven.pomderived" value="true"/>
23-
</attributes>
24-
</classpathentry>
25-
<classpathentry kind="output" path="target/classes"/>
26-
</classpath>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" output="target/classes" path="src/main/java">
4+
<attributes>
5+
<attribute name="optional" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
10+
<attributes>
11+
<attribute name="optional" value="true"/>
12+
<attribute name="maven.pomderived" value="true"/>
13+
</attributes>
14+
</classpathentry>
15+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
16+
<attributes>
17+
<attribute name="maven.pomderived" value="true"/>
18+
</attributes>
19+
</classpathentry>
20+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
21+
<attributes>
22+
<attribute name="maven.pomderived" value="true"/>
23+
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
24+
</attributes>
25+
</classpathentry>
26+
<classpathentry kind="output" path="target/classes"/>
27+
</classpath>

‎money-api/platform/.settings/org.eclipse.core.resources.prefs‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎money-api/platform/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎money-api/platform/.settings/org.eclipse.m2e.core.prefs‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
import javax.money.CurrencyUnit;
2727
import javax.money.MonetaryAmount;
28+
import javax.money.MonetaryCurrencies;
2829
import javax.money.MonetaryOperator;
2930
import javax.money.Money;
3031
import javax.money.MoneyCurrency;
@@ -33,7 +34,6 @@
3334
import javax.money.convert.ExchangeRate;
3435
import javax.money.convert.ExchangeRateType;
3536
import javax.money.convert.MonetaryConversions;
36-
import javax.money.ext.MonetaryCurrencies;
3737
import javax.money.format.ItemFormat;
3838
import javax.money.format.ItemParseException;
3939
import javax.money.format.LocalizationStyle;

‎money-impl/platform-ri/.classpath‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<classpath>
3-
<classpathentry kind="src" output="target/classes" path="src/main/java">
4-
<attributes>
5-
<attribute name="optional" value="true"/>
6-
<attribute name="maven.pomderived" value="true"/>
7-
</attributes>
8-
</classpathentry>
9-
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
10-
<attributes>
11-
<attribute name="optional" value="true"/>
12-
<attribute name="maven.pomderived" value="true"/>
13-
</attributes>
14-
</classpathentry>
15-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
16-
<attributes>
17-
<attribute name="maven.pomderived" value="true"/>
18-
</attributes>
19-
</classpathentry>
20-
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
21-
<attributes>
22-
<attribute name="maven.pomderived" value="true"/>
23-
</attributes>
24-
</classpathentry>
25-
<classpathentry kind="output" path="target/classes"/>
26-
</classpath>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" output="target/classes" path="src/main/java">
4+
<attributes>
5+
<attribute name="optional" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
10+
<attributes>
11+
<attribute name="optional" value="true"/>
12+
<attribute name="maven.pomderived" value="true"/>
13+
</attributes>
14+
</classpathentry>
15+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
16+
<attributes>
17+
<attribute name="maven.pomderived" value="true"/>
18+
</attributes>
19+
</classpathentry>
20+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
21+
<attributes>
22+
<attribute name="maven.pomderived" value="true"/>
23+
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
24+
</attributes>
25+
</classpathentry>
26+
<classpathentry kind="output" path="target/classes"/>
27+
</classpath>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 2012-2013, Credit Suisse
77
* All rights reserved.
88
*/
9-
package javax.money.ext;
9+
package javax.money;
1010

1111
import java.util.ArrayList;
1212
import java.util.Collection;
@@ -23,7 +23,6 @@
2323
import java.util.logging.Logger;
2424

2525
import javax.money.CurrencyUnit;
26-
import javax.money.MoneyCurrency;
2726
import javax.money.UnknownCurrencyException;
2827

2928
/**

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
* Copyright (c) 2012-2013, Credit Suisse
77
* All rights reserved.
88
*/
9-
package javax.money.ext;
9+
package javax.money;
1010

1111
import static org.junit.Assert.assertEquals;
1212
import static org.junit.Assert.assertNotNull;
1313

1414
import javax.money.CurrencyUnit;
15+
import javax.money.MonetaryCurrencies;
1516
import javax.money.MoneyCurrency;
16-
import javax.money.ext.MonetaryCurrencies;
1717

1818
import org.junit.Test;
1919

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
* Copyright (c) 2012-2013, Credit Suisse
77
* All rights reserved.
88
*/
9-
package javax.money.ext;
9+
package javax.money;
1010

1111
import java.util.Collection;
1212
import java.util.Locale;
1313

1414
import javax.money.CurrencyUnit;
1515
import javax.money.MoneyCurrency;
16-
import javax.money.ext.MonetaryCurrencies.CurrencyUnitProviderSpi;
16+
import javax.money.MonetaryCurrencies.CurrencyUnitProviderSpi;
1717

1818
/**
1919
* Empty pseudo implementation for testing only.

0 commit comments

Comments
 (0)