Fixed OSGI/module build.

atsticks · atsticks · commit f8d3400c8796 · 2018-04-16T09:26:39.000+02:00
diff --git a/exchange/exchange-rate-frb/bnd.bnd b/exchange/exchange-rate-frb/bnd.bnd
@@ -9,7 +9,7 @@ javac.target: 1.8
 Automatic-Module-Name: org.javamoney.moneta.convert.frb
 Bundle-Version: ${project.version}.${tstamp}
 Bundle-Name: JavaMoney Moneta FRB Conversion
-Bundle-Activator: org.javamoney.moneta.convert.internal.frb.OSGIActivator
+Bundle-Activator: org.javamoney.moneta.convert.frb.OSGIActivator
 Bundle-SymbolicName: org.javamoney.moneta.convert.frb
 Bundle-Description: JavaMoney - Moneta Reference Implementation - FRB Conversion
 Bundle-Category: Implementation
diff --git a/exchange/exchange-rate-frb/pom.xml b/exchange/exchange-rate-frb/pom.xml
@@ -71,7 +71,7 @@
 							<source>${maven.compile.sourceLevel}</source>
 							<target>${maven.compile.targetLevel}</target>
 							<excludes>
-								<exclude>module-info.java</exclude>
+								<exclude>org/javamoney/moneta/convert/frb/module-info.java</exclude>
 							</excludes>
 						</configuration>
 					</execution>
diff --git a/exchange/exchange-rate-frb/src/main/java/org/javamoney/moneta/convert/frb/OSGIActivator.java b/exchange/exchange-rate-frb/src/main/java/org/javamoney/moneta/convert/frb/OSGIActivator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.javamoney.moneta.convert.internal.frb;
+package org.javamoney.moneta.convert.frb;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
diff --git a/exchange/exchange-rate-frb/src/main/java/org/javamoney/moneta/convert/frb/OSGIServiceHelper.java b/exchange/exchange-rate-frb/src/main/java/org/javamoney/moneta/convert/frb/OSGIServiceHelper.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.javamoney.moneta.convert.internal.frb;
+package org.javamoney.moneta.convert.frb;
 
 import org.osgi.framework.*;
 
diff --git a/exchange/exchange-rate-frb/src/main/java/org/javamoney/moneta/convert/frb/USFederalReserveExchangeRateType.java b/exchange/exchange-rate-frb/src/main/java/org/javamoney/moneta/convert/frb/USFederalReserveExchangeRateType.java
@@ -15,7 +15,7 @@
  *
  * Contributors: @atsticks, @keilw, @otjava
  */
-package org.javamoney.moneta.convert.internal.frb;
+package org.javamoney.moneta.convert.frb;
 
 import javax.money.convert.ExchangeRateProviderSupplier;
 
diff --git a/exchange/exchange-rate-frb/src/main/java/org/javamoney/moneta/convert/frb/USFederalReserveRateProvider.java b/exchange/exchange-rate-frb/src/main/java/org/javamoney/moneta/convert/frb/USFederalReserveRateProvider.java
@@ -15,7 +15,7 @@
  *
  * Contributors: @atsticks, @keilw, @otjava
  */
-package org.javamoney.moneta.convert.internal.frb;
+package org.javamoney.moneta.convert.frb;
 
 import java.io.InputStream;
 import java.math.MathContext;
diff --git a/exchange/exchange-rate-frb/src/main/java/org/javamoney/moneta/convert/frb/USFederalReserveRateReadingHandler.java b/exchange/exchange-rate-frb/src/main/java/org/javamoney/moneta/convert/frb/USFederalReserveRateReadingHandler.java
@@ -15,7 +15,7 @@
  *
  * Contributors: @atsticks, @keilw, @otjava
  */
-package org.javamoney.moneta.convert.internal.frb;
+package org.javamoney.moneta.convert.frb;
 
 
 import java.math.BigDecimal;
diff --git a/exchange/exchange-rate-frb/src/main/java/org/javamoney/moneta/convert/frb/module-info.java b/exchange/exchange-rate-frb/src/main/java/org/javamoney/moneta/convert/frb/module-info.java
@@ -1,4 +1,4 @@
-import org.javamoney.moneta.convert.internal.frb.USFederalReserveRateProvider;
+import org.javamoney.moneta.convert.frb.USFederalReserveRateProvider;
 
 /*
  * CREDIT SUISSE IS WILLING TO LICENSE THIS SPECIFICATION TO YOU ONLY UPON THE CONDITION THAT YOU
diff --git a/exchange/exchange-rate-frb/src/main/java/org/javamoney/moneta/convert/frb/package-info.java b/exchange/exchange-rate-frb/src/main/java/org/javamoney/moneta/convert/frb/package-info.java
@@ -19,4 +19,4 @@
 /**
  * US Federal Reserve based Conversion provider.
  */
-package org.javamoney.moneta.convert.internal.frb;
+package org.javamoney.moneta.convert.frb;
diff --git a/exchange/exchange-rate-frb/src/main/resources/META-INF/services/javax.money.convert.ExchangeRateProvider b/exchange/exchange-rate-frb/src/main/resources/META-INF/services/javax.money.convert.ExchangeRateProvider
@@ -14,4 +14,4 @@
 #
 #
 # Contributors: @atsticks, @keilw, @otjava
-org.javamoney.moneta.convert.internal.frb.USFederalReserveRateProvider
+org.javamoney.moneta.convert.frb.USFederalReserveRateProvider
diff --git a/exchange/exchange-rate-frb/src/test/java/org/javamoney/moneta/convert/frb/USFederalReserveExchangeRateTypeTest.java b/exchange/exchange-rate-frb/src/test/java/org/javamoney/moneta/convert/frb/USFederalReserveExchangeRateTypeTest.java
@@ -15,7 +15,7 @@
  *
  * Contributors: @atsticks, @keilw, @otjava
  */
-package org.javamoney.moneta.convert.internal.frb;
+package org.javamoney.moneta.convert.frb;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
diff --git a/exchange/exchange-rate-frb/src/test/java/org/javamoney/moneta/convert/frb/USFederalReserveRateProviderTest.java b/exchange/exchange-rate-frb/src/test/java/org/javamoney/moneta/convert/frb/USFederalReserveRateProviderTest.java
@@ -15,7 +15,7 @@
  *
  * Contributors: @atsticks, @keilw, @otjava
  */
-package org.javamoney.moneta.convert.internal.frb;
+package org.javamoney.moneta.convert.frb;
 
 import static javax.money.convert.MonetaryConversions.getExchangeRateProvider;
 import static org.testng.Assert.assertEquals;
diff --git a/exchange/exchange-rate-yahoo/bnd.bnd b/exchange/exchange-rate-yahoo/bnd.bnd
@@ -9,7 +9,7 @@ javac.target: 1.8
 Automatic-Module-Name: org.javamoney.moneta.convert.yahoo
 Bundle-Version: ${project.version}.${tstamp}
 Bundle-Name: JavaMoney Moneta Yahoo Conversion
-Bundle-Activator: org.javamoney.moneta.convert.internal.yahoo.OSGIActivator
+Bundle-Activator: org.javamoney.moneta.convert.yahoo.OSGIActivator
 Bundle-SymbolicName: org.javamoney.moneta.convert.yahoo
 Bundle-Description: JavaMoney - Moneta Reference Implementation - Yahoo Conversion
 Bundle-Category: Implementation
diff --git a/exchange/exchange-rate-yahoo/pom.xml b/exchange/exchange-rate-yahoo/pom.xml
@@ -71,7 +71,7 @@
 							<source>${maven.compile.sourceLevel}</source>
 							<target>${maven.compile.targetLevel}</target>
 							<excludes>
-								<exclude>module-info.java</exclude>
+								<exclude>org/javamoney/moneta/convert/yahoo/module-info.java</exclude>
 							</excludes>
 						</configuration>
 					</execution>
diff --git a/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/Meta.java b/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/Meta.java
@@ -15,7 +15,7 @@
  *
  * Contributors: @atsticks, @keilw, @otjava
  */
-package org.javamoney.moneta.convert.internal.yahoo;
+package org.javamoney.moneta.convert.yahoo;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/OSGIActivator.java b/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/OSGIActivator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.javamoney.moneta.convert.internal.yahoo;
+package org.javamoney.moneta.convert.yahoo;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
diff --git a/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/OSGIServiceHelper.java b/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/OSGIServiceHelper.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.javamoney.moneta.convert.internal.yahoo;
+package org.javamoney.moneta.convert.yahoo;
 
 import org.osgi.framework.*;
 
diff --git a/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/ObjectFactory.java b/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/ObjectFactory.java
@@ -15,7 +15,7 @@
  *
  * Contributors: @atsticks, @keilw, @otjava
  */
-package org.javamoney.moneta.convert.internal.yahoo;
+package org.javamoney.moneta.convert.yahoo;
 
 import javax.xml.bind.annotation.XmlRegistry;
 
diff --git a/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/YahooAbstractRateProvider.java b/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/YahooAbstractRateProvider.java
@@ -15,7 +15,7 @@
  *
  * Contributors: @atsticks, @keilw, @otjava
  */
-package org.javamoney.moneta.convert.internal.yahoo;
+package org.javamoney.moneta.convert.yahoo;
 
 import java.io.InputStream;
 import java.math.MathContext;
diff --git a/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/YahooCurrencies.java b/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/YahooCurrencies.java
@@ -15,7 +15,7 @@
  *
  * Contributors: @atsticks, @keilw, @otjava
  */
-package org.javamoney.moneta.convert.internal.yahoo;
+package org.javamoney.moneta.convert.yahoo;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/YahooExchangeRateType.java b/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/YahooExchangeRateType.java
@@ -15,7 +15,7 @@
  *
  * Contributors: @atsticks, @keilw, @otjava
  */
-package org.javamoney.moneta.convert.internal.yahoo;
+package org.javamoney.moneta.convert.yahoo;
 
 import javax.money.convert.ExchangeRateProviderSupplier;
 
diff --git a/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/YahooField.java b/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/YahooField.java
@@ -15,7 +15,7 @@
  *
  * Contributors: @atsticks, @keilw, @otjava
  */
-package org.javamoney.moneta.convert.internal.yahoo;
+package org.javamoney.moneta.convert.yahoo;
 
 import java.util.Objects;
 
diff --git a/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/YahooQuoteItem.java b/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/YahooQuoteItem.java
@@ -15,7 +15,7 @@
  *
  * Contributors: @atsticks, @keilw, @otjava
  */
-package org.javamoney.moneta.convert.internal.yahoo;
+package org.javamoney.moneta.convert.yahoo;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/YahooQuoteItemInformation.java b/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/YahooQuoteItemInformation.java
@@ -15,7 +15,7 @@
  *
  * Contributors: @atsticks, @keilw, @otjava
  */
-package org.javamoney.moneta.convert.internal.yahoo;
+package org.javamoney.moneta.convert.yahoo;
 
 import java.math.BigDecimal;
 import java.text.DateFormat;
diff --git a/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/YahooRateProvider.java b/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/YahooRateProvider.java
@@ -15,7 +15,7 @@
  *
  * Contributors: @atsticks, @keilw, @otjava
  */
-package org.javamoney.moneta.convert.internal.yahoo;
+package org.javamoney.moneta.convert.yahoo;
 
 import javax.money.convert.ProviderContext;
 import javax.money.convert.ProviderContextBuilder;
diff --git a/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/YahooRateReadingHandler.java b/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/YahooRateReadingHandler.java
@@ -15,7 +15,7 @@
  *
  * Contributors: @atsticks, @keilw, @otjava
  */
-package org.javamoney.moneta.convert.internal.yahoo;
+package org.javamoney.moneta.convert.yahoo;
 
 
 import java.io.InputStream;
diff --git a/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/YahooRoot.java b/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/YahooRoot.java
@@ -15,7 +15,7 @@
  *
  * Contributors: @atsticks, @keilw, @otjava
  */
-package org.javamoney.moneta.convert.internal.yahoo;
+package org.javamoney.moneta.convert.yahoo;
 
 import java.math.BigDecimal;
 
diff --git a/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/module-info.java b/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/module-info.java
@@ -1,4 +1,4 @@
-import org.javamoney.moneta.convert.internal.yahoo.YahooRateProvider;
+import org.javamoney.moneta.convert.yahoo.YahooRateProvider;
 
 /*
  * CREDIT SUISSE IS WILLING TO LICENSE THIS SPECIFICATION TO YOU ONLY UPON THE CONDITION THAT YOU
diff --git a/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/package-info.java b/exchange/exchange-rate-yahoo/src/main/java/org/javamoney/moneta/convert/yahoo/package-info.java
@@ -19,4 +19,4 @@
 /**
  * Yahoo based Conversion provider.
  */
-package org.javamoney.moneta.convert.internal.yahoo;
+package org.javamoney.moneta.convert.yahoo;
diff --git a/exchange/exchange-rate-yahoo/src/main/resources/META-INF/services/javax.money.convert.ExchangeRateProvider b/exchange/exchange-rate-yahoo/src/main/resources/META-INF/services/javax.money.convert.ExchangeRateProvider
@@ -14,4 +14,4 @@
 #
 #
 # Contributors: @atsticks, @keilw, @otjava
-org.javamoney.moneta.convert.internal.yahoo.YahooRateProvider
+org.javamoney.moneta.convert.yahoo.YahooRateProvider
diff --git a/exchange/exchange-rate-yahoo/src/test/java/org/javamoney/moneta/convert/yahoo/ExchangeRateTypeTest.java b/exchange/exchange-rate-yahoo/src/test/java/org/javamoney/moneta/convert/yahoo/ExchangeRateTypeTest.java
@@ -15,7 +15,7 @@
  *
  * Contributors: @atsticks, @keilw, @otjava
  */
-package org.javamoney.moneta.convert.internal.yahoo;
+package org.javamoney.moneta.convert.yahoo;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
diff --git a/exchange/exchange-rate-yahoo/src/test/java/org/javamoney/moneta/convert/yahoo/YahooRateProviderTest.java b/exchange/exchange-rate-yahoo/src/test/java/org/javamoney/moneta/convert/yahoo/YahooRateProviderTest.java
@@ -15,7 +15,7 @@
  *
  * Contributors: @atsticks, @keilw, @otjava
  */
-package org.javamoney.moneta.convert.internal.yahoo;
+package org.javamoney.moneta.convert.yahoo;
 
 import static javax.money.convert.MonetaryConversions.getExchangeRateProvider;
 import static org.testng.Assert.assertEquals;

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`* Contributors: @atsticks, @keilw, @otjava`
`17`	`17`	`*/`
`18`		`-package org.javamoney.moneta.convert.internal.frb;`
	`18`	`+package org.javamoney.moneta.convert.frb;`
`19`	`19`
`20`	`20`	`import javax.money.convert.ExchangeRateProviderSupplier;`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import org.javamoney.moneta.convert.internal.frb.USFederalReserveRateProvider;`
	`1`	`+import org.javamoney.moneta.convert.frb.USFederalReserveRateProvider;`
`2`	`2`
`3`	`3`	`/*`
`4`	`4`	`* CREDIT SUISSE IS WILLING TO LICENSE THIS SPECIFICATION TO YOU ONLY UPON THE CONDITION THAT YOU`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@`
`14`	`14`	`#`
`15`	`15`	`#`
`16`	`16`	`# Contributors: @atsticks, @keilw, @otjava`
`17`		`-org.javamoney.moneta.convert.internal.frb.USFederalReserveRateProvider`
	`17`	`+org.javamoney.moneta.convert.frb.USFederalReserveRateProvider`