killbill-aplcache

diff --git a/beatrix/pom.xml b/beatrix/pom.xml
index 10cf1a1..cdaa744 100644
--- a/beatrix/pom.xml
+++ b/beatrix/pom.xml
@@ -246,9 +246,9 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <copy file="${basedir}/../osgi-bundles/tests/beatrix/target/killbill-osgi-bundles-test-beatrix-${project.version}-jar-with-dependencies.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-test-beatrix-${project.version}-jar-with-dependencies.jar" />
-                                <copy file="${basedir}/../osgi-bundles/tests/payment/target/killbill-osgi-bundles-test-payment-${project.version}-jar-with-dependencies.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-test-payment-${project.version}-jar-with-dependencies.jar" />
-                                <copy file="${basedir}/../osgi-bundles/bundles/jruby/target/killbill-osgi-bundles-jruby-${project.version}.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-jruby-${project.version}.jar" />
+                                <copy file="${basedir}/../osgi-bundles/tests/beatrix/target/killbill-osgi-bundles-test-beatrix-${project.version}-jar-with-dependencies.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-test-beatrix-jar-with-dependencies.jar"></copy>
+                                <copy file="${basedir}/../osgi-bundles/tests/payment/target/killbill-osgi-bundles-test-payment-${project.version}-jar-with-dependencies.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-test-payment-jar-with-dependencies.jar"></copy>
+                                <copy file="${basedir}/../osgi-bundles/bundles/jruby/target/killbill-osgi-bundles-jruby-${project.version}.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-jruby.jar"></copy>
                             </tasks>
                         </configuration>
                     </execution>

diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/osgi/SetupBundleWithAssertion.java b/beatrix/src/test/java/org/killbill/billing/beatrix/osgi/SetupBundleWithAssertion.java
index f3345d3..eefbf77 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/osgi/SetupBundleWithAssertion.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/osgi/SetupBundleWithAssertion.java
@@ -155,7 +155,7 @@ public class SetupBundleWithAssertion {
 
     private void installJrubyJar() throws IOException {
 
-        final String resourceName = JRUBY_BUNDLE_RESOURCE + "-" + killbillVersion + ".jar";
+        final String resourceName = JRUBY_BUNDLE_RESOURCE + ".jar";
         final URL resourceUrl = Resources.getResource(resourceName);
         final File rubyJarInput = new File(resourceUrl.getFile());
 
@@ -170,7 +170,7 @@ public class SetupBundleWithAssertion {
 
     private PluginJavaConfig extractJavaBundleTestResource() {
 
-        final String resourceName = bundleName + "-" + killbillVersion + "-jar-with-dependencies.jar";
+        final String resourceName = bundleName + "-jar-with-dependencies.jar";
         final URL resourceUrl = Resources.getResource(resourceName);
         if (resourceUrl != null) {
             final String[] parts = resourceUrl.getPath().split("/");

diff --git a/beatrix/src/test/resources/killbill-currency-plugin-test.tar.gz b/beatrix/src/test/resources/killbill-currency-plugin-test.tar.gz
index c816039..0006981 100644
Binary files a/beatrix/src/test/resources/killbill-currency-plugin-test.tar.gz and b/beatrix/src/test/resources/killbill-currency-plugin-test.tar.gz differ

diff --git a/beatrix/src/test/resources/killbill-notification-test.tar.gz b/beatrix/src/test/resources/killbill-notification-test.tar.gz
index 960465e..b03cd00 100644
Binary files a/beatrix/src/test/resources/killbill-notification-test.tar.gz and b/beatrix/src/test/resources/killbill-notification-test.tar.gz differ

diff --git a/beatrix/src/test/resources/killbill-payment-test.tar.gz b/beatrix/src/test/resources/killbill-payment-test.tar.gz
index 13e0e1f..7263203 100644
Binary files a/beatrix/src/test/resources/killbill-payment-test.tar.gz and b/beatrix/src/test/resources/killbill-payment-test.tar.gz differ

diff --git a/payment/src/main/java/org/killbill/billing/payment/core/DirectPaymentProcessor.java b/payment/src/main/java/org/killbill/billing/payment/core/DirectPaymentProcessor.java
index 8eb7f5c..a157ce1 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/DirectPaymentProcessor.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/DirectPaymentProcessor.java
@@ -150,7 +150,7 @@ public class DirectPaymentProcessor extends ProcessorBase {
                                      new PluginWrapper() {
                                          @Override
                                          public PaymentInfoPlugin doPluginOperation(final PaymentPluginApi plugin, final Account account, final BigDecimal amount, final UUID directPaymentId, final Iterable<PluginProperty> properties, final CallContext callContext) throws PaymentPluginApiException {
-                                             return plugin.authorizePayment(account.getId(), directPaymentId, account.getPaymentMethodId(), amount, currency, properties, callContext);
+                                             return plugin.processPayment(account.getId(), directPaymentId, account.getPaymentMethodId(), amount, currency, properties, callContext);
                                          }
                                      },
                                      directPaymentId,