killbill-uncached

Merge branch 'irs-integration'

11/2/2011 3:29:12 PM

Details

entitlement/pom.xml 12(+12 -0)

diff --git a/entitlement/pom.xml b/entitlement/pom.xml
index bd4c3cd..9173e3a 100644
--- a/entitlement/pom.xml
+++ b/entitlement/pom.xml
@@ -80,6 +80,18 @@
             <artifactId>testng</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-core-asl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-jaxrs</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/glue/IEntitlementConfig.java b/entitlement/src/main/java/com/ning/billing/entitlement/glue/IEntitlementConfig.java
index 1142a88..8c8e3cc 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/glue/IEntitlementConfig.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/glue/IEntitlementConfig.java
@@ -17,18 +17,23 @@
 package com.ning.billing.entitlement.glue;
 
 import org.skife.config.Config;
+import org.skife.config.Default;
 
 public interface IEntitlementConfig {
 
     @Config("killbill.entitlement.dao.claim.time")
+    @Default("60000")
     public long getDaoClaimTimeMs();
 
     @Config("killbill.entitlement.dao.ready.max")
+    @Default("1")
     public int getDaoMaxReadyEvents();
 
     @Config("killbill.entitlement.catalog.config.file")
+    @Default("hum, not sure")
     public String getCatalogConfigFileName();
 
     @Config("killbill.entitlement.engine.notifications.sleep")
+    @Default("1000")
     public long getNotificationSleepTimeMs();
 }

pom.xml 44(+27 -17)

diff --git a/pom.xml b/pom.xml
index f56b52c..4a92f6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,20 +1,14 @@
-<!--
-  ~ Copyright 2010-2011 Ning, Inc.
-  ~
-  ~ Ning licenses this file to you under the Apache License, version 2.0
-  ~ (the "License"); you may not use this file except in compliance with the
-  ~ License.  You may obtain a copy of the License at:
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  ~ License for the specific language governing permissions and limitations
-  ~ under the License.
-  -->
+<!-- ~ Copyright 2010-2011 Ning, Inc. ~ ~ Ning licenses this file to you 
+    under the Apache License, version 2.0 ~ (the "License"); you may not use 
+    this file except in compliance with the ~ License. You may obtain a copy 
+    of the License at: ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless 
+    required by applicable law or agreed to in writing, software ~ distributed 
+    under the License is distributed on an "AS IS" BASIS, WITHOUT ~ WARRANTIES 
+    OR CONDITIONS OF ANY KIND, either express or implied. See the ~ License for 
+    the specific language governing permissions and limitations ~ under the License. -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.sonatype.oss</groupId>
         <artifactId>oss-parent</artifactId>
@@ -78,6 +72,21 @@
                 <version>${project.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-core-asl</artifactId>
+                <version>1.9.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-jaxrs</artifactId>
+                <version>1.9.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-mapper-asl</artifactId>
+                <version>1.9.0</version>
+            </dependency>
+            <dependency>
                 <groupId>com.jolbox</groupId>
                 <artifactId>bonecp</artifactId>
                 <version>0.7.1.RELEASE</version>
@@ -282,7 +291,8 @@
                             <useIdeaDefaultExcludes>true</useIdeaDefaultExcludes>
                             <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
                             <excludes>
-                                <!-- For some reason, useIdeaDefaultExcludes doesn't pick up .idea directory -->
+                                <!-- For some reason, useIdeaDefaultExcludes 
+                                    doesn't pick up .idea directory -->
                                 <exclude>.idea/**</exclude>
                                 <exclude>**/.project</exclude>
                                 <exclude>.git/**</exclude>