Reorganized packages, added bnd OSGI descriptor.

Author: atsticks

javamoney-cdi/bnd.bnd

@@ -0,0 +1,29 @@
+-buildpath: \
+	osgi.annotation; version=6.0.0,\
+	osgi.core; version=6.0,\
+	osgi.cmpn; version=6.0
+
+-testpath: \
+	${junit}
+
+javac.source: 1.8
+javac.target: 1.8
+
+Automatic-Module-Name: org.javamoney.moneta.cdi
+Bundle-Version: ${version}.${tstamp}
+Bundle-Name: JavaMoney Moneta CDI Support
+Bundle-SymbolicName: org.javamoney.moneta.cdi
+Bundle-Description: JavaMoney - CDI Integration
+Bundle-Category: Implementation
+Bundle-Copyright: (C) Credit Suisse AG
+Bundle-License: Apache License, Version 2.0
+Bundle-Vendor: Credit Suisse AG
+Bundle-DocURL: http://www.javamoney.org
+Import-Package: \
+	javax.money,\
+    javax.money.spi,\
+    org.javamoney.moneta
+Export-Package: \
+	org.javamoney.cdi
+Private-Package: \
+    org.javamoney.cdi.internal

javamoney-cdi/src/main/java/org/javamoney/cdi/api/AmountSpec.java renamed to javamoney-cdi/src/main/java/org/javamoney/cdi/AmountSpec.java

@@ -15,7 +15,7 @@
  *
  * Contributors: @atsticks, @keilw, @otjava
  */
-package org.javamoney.cdi.api;
+package org.javamoney.cdi;
 
 import javax.money.MonetaryAmount;
 import java.lang.annotation.*;

javamoney-cdi/src/main/java/org/javamoney/cdi/api/ConversionSpec.java renamed to javamoney-cdi/src/main/java/org/javamoney/cdi/ConversionSpec.java

@@ -15,7 +15,7 @@
  *
  * Contributors: @atsticks, @keilw, @otjava
  */
-package org.javamoney.cdi.api;
+package org.javamoney.cdi;
 
 import javax.money.convert.RateType;
 import java.lang.annotation.*;

javamoney-cdi/src/main/java/org/javamoney/cdi/api/CurrencySpec.java renamed to javamoney-cdi/src/main/java/org/javamoney/cdi/CurrencySpec.java

@@ -15,7 +15,7 @@
  *
  * Contributors: @atsticks, @keilw, @otjava
  */
-package org.javamoney.cdi.api;
+package org.javamoney.cdi;
 
 import java.lang.annotation.*;
 

javamoney-cdi/src/main/java/org/javamoney/cdi/api/FormatSpec.java renamed to javamoney-cdi/src/main/java/org/javamoney/cdi/FormatSpec.java

@@ -15,7 +15,7 @@
  *
  * Contributors: @atsticks, @keilw, @otjava
  */
-package org.javamoney.cdi.api;
+package org.javamoney.cdi;
 
 import java.lang.annotation.*;
 

javamoney-cdi/src/main/java/org/javamoney/cdi/api/package-info.java renamed to javamoney-cdi/src/main/java/org/javamoney/cdi/package-info.java

@@ -19,4 +19,4 @@
 /**
  * Contains the annotations to refine the javamoney artifacts that can be injected.
  */
-package org.javamoney.cdi.api;
+package org.javamoney.cdi;