Prosoft Git

killbill-aplcache

Merge branch 'master' of github.com:killbill/killbill

10/29/2012 9:51:02 PM
stephane brossier

stephane brossier

Commit: 44691f5

Tree: 8383adc

Parents: 4ff0313
4a7f6bf

Changes

account/pom.xml 2(+1 -1)

analytics/pom.xml 2(+1 -1)

api/pom.xml 2(+1 -1)

beatrix/pom.xml 2(+1 -1)

bin/import-account 9(+8 -1)

catalog/pom.xml 2(+1 -1)

entitlement/pom.xml 2(+1 -1)

invoice/pom.xml 2(+1 -1)

jaxrs/pom.xml 2(+1 -1)

junction/pom.xml 2(+1 -1)

overdue/pom.xml 2(+1 -1)

payment/pom.xml 2(+1 -1)

pom.xml 10(+5 -5)

server/pom.xml 2(+1 -1)

tenant/pom.xml 2(+1 -1)

usage/pom.xml 2(+1 -1)

util/pom.xml 2(+1 -1)

Details

account/pom.xml 2(+1 -1) 

diff --git a/account/pom.xml b/account/pom.xml
index 024204d..2f39915 100644
--- a/account/pom.xml
+++ b/account/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.42-SNAPSHOT</version>
+        <version>0.1.43-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-account</artifactId>

analytics/pom.xml 2(+1 -1) 

diff --git a/analytics/pom.xml b/analytics/pom.xml
index 94a903a..be27884 100644
--- a/analytics/pom.xml
+++ b/analytics/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.42-SNAPSHOT</version>
+        <version>0.1.43-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-analytics</artifactId>

api/pom.xml 2(+1 -1) 

diff --git a/api/pom.xml b/api/pom.xml
index 4a381f1..b4e8797 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.42-SNAPSHOT</version>
+        <version>0.1.43-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-api</artifactId>

beatrix/pom.xml 2(+1 -1) 

diff --git a/beatrix/pom.xml b/beatrix/pom.xml
index 2ad892a..20df1d1 100644
--- a/beatrix/pom.xml
+++ b/beatrix/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.42-SNAPSHOT</version>
+        <version>0.1.43-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-beatrix</artifactId>

bin/import-account 9(+8 -1) 

diff --git a/bin/import-account b/bin/import-account
index f4e50c9..88815ad 100755
--- a/bin/import-account
+++ b/bin/import-account
@@ -35,6 +35,13 @@ rm -f xa*
 curl $KILLBILL_URL/1.0/kb/export/$1 -H"X-Killbill-CreatedBy: $WHO" | split -p '--'  --
 for i in `ls xa*`; do
     table_name=$(cat $i | head -1 | awk '{print $2}')
-    mv $i $table_name
+    # Put \N for empty columns to set values to NULL, not ''
+    tmp=${table_name}.tmp
+    grep ',,' $table_name > /dev/null
+    while [[ $? = 0 ]]; do
+        cat $table_name | sed s/,,/,\\\\N,/ > $tmp
+        mv $tmp $table_name
+        grep ',,' $table_name > /dev/null
+    done
     mysqlimport --ignore-lines=1 --fields-terminated-by=, --fields-enclosed-by=\" --verbose -u$USERNAME -p$PASSWORD $DATABASE $TMP_DIR/$table_name
 done

catalog/pom.xml 2(+1 -1) 

diff --git a/catalog/pom.xml b/catalog/pom.xml
index b981c1e..3159f7b 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.42-SNAPSHOT</version>
+        <version>0.1.43-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-catalog</artifactId>

entitlement/pom.xml 2(+1 -1) 

diff --git a/entitlement/pom.xml b/entitlement/pom.xml
index 1e0a6a8..d217b2f 100644
--- a/entitlement/pom.xml
+++ b/entitlement/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.42-SNAPSHOT</version>
+        <version>0.1.43-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-entitlement</artifactId>

invoice/pom.xml 2(+1 -1) 

diff --git a/invoice/pom.xml b/invoice/pom.xml
index 1480451..03d2194 100644
--- a/invoice/pom.xml
+++ b/invoice/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.42-SNAPSHOT</version>
+        <version>0.1.43-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-invoice</artifactId>

jaxrs/pom.xml 2(+1 -1) 

diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml
index b1af072..a896531 100644
--- a/jaxrs/pom.xml
+++ b/jaxrs/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.42-SNAPSHOT</version>
+        <version>0.1.43-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-jaxrs</artifactId>

junction/pom.xml 2(+1 -1) 

diff --git a/junction/pom.xml b/junction/pom.xml
index 0a298ee..941f4c1 100644
--- a/junction/pom.xml
+++ b/junction/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.42-SNAPSHOT</version>
+        <version>0.1.43-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-junction</artifactId>

overdue/pom.xml 2(+1 -1) 

diff --git a/overdue/pom.xml b/overdue/pom.xml
index 3bd0c74..0aefd0e 100644
--- a/overdue/pom.xml
+++ b/overdue/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.42-SNAPSHOT</version>
+        <version>0.1.43-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-overdue</artifactId>

payment/pom.xml 2(+1 -1) 

diff --git a/payment/pom.xml b/payment/pom.xml
index 3f30cc4..3da698e 100644
--- a/payment/pom.xml
+++ b/payment/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.42-SNAPSHOT</version>
+        <version>0.1.43-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-payment</artifactId>

pom.xml 10(+5 -5) 

diff --git a/pom.xml b/pom.xml
index 2c0984e..ddd39cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,10 +17,10 @@
     <groupId>com.ning.billing</groupId>
     <artifactId>killbill</artifactId>
     <packaging>pom</packaging>
-    <version>0.1.42-SNAPSHOT</version>
+    <version>0.1.43-SNAPSHOT</version>
     <name>killbill</name>
     <description>Library for managing recurring subscriptions and the associated billing</description>
-    <url>http://github.com/ning/killbill</url>
+    <url>http://github.com/killbill/killbill</url>
     <licenses>
         <license>
             <name>Apache License 2.0</name>
@@ -29,9 +29,9 @@
         </license>
     </licenses>
     <scm>
-        <connection>scm:git:git://github.com/ning/killbill.git</connection>
-        <developerConnection>scm:git:git@github.com:ning/killbill.git</developerConnection>
-        <url>http://github.com/ning/killbill/tree/master</url>
+        <connection>scm:git:git://github.com/killbill/killbill.git</connection>
+        <developerConnection>scm:git:git@github.com:killbill/killbill.git</developerConnection>
+        <url>http://github.com/killbill/killbill/tree/master</url>
     </scm>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

server/pom.xml 2(+1 -1) 

diff --git a/server/pom.xml b/server/pom.xml
index ac17049..86142b0 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.42-SNAPSHOT</version>
+        <version>0.1.43-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-server</artifactId>

tenant/pom.xml 2(+1 -1) 

diff --git a/tenant/pom.xml b/tenant/pom.xml
index d1c9e2e..605c5f0 100644
--- a/tenant/pom.xml
+++ b/tenant/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.42-SNAPSHOT</version>
+        <version>0.1.43-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-tenant</artifactId>

usage/pom.xml 2(+1 -1) 

diff --git a/usage/pom.xml b/usage/pom.xml
index 135b210..30bb692 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.42-SNAPSHOT</version>
+        <version>0.1.43-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-usage</artifactId>

util/pom.xml 2(+1 -1) 

diff --git a/util/pom.xml b/util/pom.xml
index 76a233b..e3fb81a 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.42-SNAPSHOT</version>
+        <version>0.1.43-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-util</artifactId>

Bonobo Git Server (6.3.0.632) © 2015 Jakub Chodounský · Official Page · Github