killbill-uncached
Details
diff --git a/beatrix/src/main/resources/org/killbill/billing/beatrix/ddl.sql b/beatrix/src/main/resources/org/killbill/billing/beatrix/ddl.sql
index f7811c7..2783fc6 100644
--- a/beatrix/src/main/resources/org/killbill/billing/beatrix/ddl.sql
+++ b/beatrix/src/main/resources/org/killbill/billing/beatrix/ddl.sql
@@ -21,7 +21,7 @@ CREATE INDEX bus_ext_events_tenant_account_record_id ON bus_ext_events(search_ke
DROP TABLE IF EXISTS bus_ext_events_history;
CREATE TABLE bus_ext_events_history (
- record_id int(11) unsigned NOT NULL,
+ record_id int(11) unsigned NOT NULL AUTO_INCREMENT,
class_name varchar(128) NOT NULL,
event_json varchar(2048) NOT NULL,
user_token char(36),
bin/start-server 4(+3 -1)
diff --git a/bin/start-server b/bin/start-server
index a43f78f..022b8ac 100755
--- a/bin/start-server
+++ b/bin/start-server
@@ -35,6 +35,8 @@ MAVEN_OPTS=${MAVEN_OPTS-"-Duser.timezone=GMT -Xms512m -Xmx1024m -XX:MaxPermSize=
LOG="$SERVER/src/main/resources/logback.xml"
LOG_DIR="$SERVER/logs"
+HOSTNAME=`hostname`
+
# From Argument Options
PORT=8080
JMX_PORT=8989
@@ -68,7 +70,7 @@ function start() {
debug_opts_eclipse=$DEBUG_OPTS_ECLIPSE
fi
fi
- export MAVEN_OPTS="$MAVEN_OPTS $debug_opts_eclipse -Dorg.killbill.hostname.postfix=$PORT -Djetty.port=$PORT -Dcom.sun.management.jmxremote.port=$JMX_PORT -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
+ export MAVEN_OPTS="$MAVEN_OPTS $debug_opts_eclipse -Dorg.killbill.queue.creator.name="$HOSTNAME-"$PORT -Djetty.port=$PORT -Dcom.sun.management.jmxremote.port=$JMX_PORT -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
echo "Starting IRS MAVEN_OPTS = $MAVEN_OPTS"
echo "$start_cmd"
pom.xml 2(+1 -1)
diff --git a/pom.xml b/pom.xml
index 66fc730..0e9d030 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>killbill-oss-parent</artifactId>
<groupId>org.kill-bill.billing</groupId>
- <version>0.9.11</version>
+ <version>0.9.12-SNAPSHOT</version>
</parent>
<artifactId>killbill</artifactId>
<version>0.13.5-SNAPSHOT</version>
diff --git a/util/src/main/resources/org/killbill/billing/util/ddl.sql b/util/src/main/resources/org/killbill/billing/util/ddl.sql
index db53c9c..2704dc9 100644
--- a/util/src/main/resources/org/killbill/billing/util/ddl.sql
+++ b/util/src/main/resources/org/killbill/billing/util/ddl.sql
@@ -174,7 +174,7 @@ CREATE INDEX notifications_tenant_account_record_id ON notifications(search_key2
DROP TABLE IF EXISTS notifications_history;
CREATE TABLE notifications_history (
- record_id int(11) unsigned NOT NULL,
+ record_id int(11) unsigned NOT NULL AUTO_INCREMENT,
class_name varchar(256) NOT NULL,
event_json varchar(2048) NOT NULL,
user_token char(36),
@@ -213,7 +213,7 @@ CREATE INDEX bus_events_tenant_account_record_id ON bus_events(search_key2, sear
DROP TABLE IF EXISTS bus_events_history;
CREATE TABLE bus_events_history (
- record_id int(11) unsigned NOT NULL,
+ record_id int(11) unsigned NOT NULL AUTO_INCREMENT,
class_name varchar(128) NOT NULL,
event_json varchar(2048) NOT NULL,
user_token char(36),