killbill-aplcache

Moving ControlTagType from account to tag package

3/16/2012 6:21:08 PM

Martin Westhead

Commit: d160be0

Tree: 52b0385

Parents: 436d131

Changes

api/src/main/java/com/ning/billing/util/tag/ControlTag.java 1(+0 -1)

api/src/main/java/com/ning/billing/util/tag/ControlTagType.java 2(+1 -1)

util/src/main/java/com/ning/billing/util/tag/dao/DefaultTagDefinitionDao.java 2(+1 -1)

util/src/main/java/com/ning/billing/util/tag/dao/TagMapper.java 3(+2 -1)

util/src/main/java/com/ning/billing/util/tag/DefaultControlTag.java 1(+0 -1)

util/src/main/java/com/ning/billing/util/tag/DefaultTagStore.java 1(+0 -1)

util/src/test/java/com/ning/billing/util/tag/TestTagStore.java 1(+0 -1)

Details

api/src/main/java/com/ning/billing/util/tag/ControlTag.java 1(+0 -1)

diff --git a/api/src/main/java/com/ning/billing/util/tag/ControlTag.java b/api/src/main/java/com/ning/billing/util/tag/ControlTag.java
index a933cff..3ae9eb5 100644
--- a/api/src/main/java/com/ning/billing/util/tag/ControlTag.java
+++ b/api/src/main/java/com/ning/billing/util/tag/ControlTag.java
@@ -16,7 +16,6 @@
 
 package com.ning.billing.util.tag;
 
-import com.ning.billing.account.api.ControlTagType;
 
 public interface ControlTag extends Tag {
     public ControlTagType getControlTagType();

util/src/main/java/com/ning/billing/util/tag/dao/DefaultTagDefinitionDao.java 2(+1 -1)

diff --git a/util/src/main/java/com/ning/billing/util/tag/dao/DefaultTagDefinitionDao.java b/util/src/main/java/com/ning/billing/util/tag/dao/DefaultTagDefinitionDao.java
index baaf9cd..dddb14f 100644
--- a/util/src/main/java/com/ning/billing/util/tag/dao/DefaultTagDefinitionDao.java
+++ b/util/src/main/java/com/ning/billing/util/tag/dao/DefaultTagDefinitionDao.java
@@ -21,9 +21,9 @@ import java.util.List;
 import org.skife.jdbi.v2.IDBI;
 import com.google.inject.Inject;
 import com.ning.billing.ErrorCode;
-import com.ning.billing.account.api.ControlTagType;
 import com.ning.billing.util.api.TagDefinitionApiException;
 import com.ning.billing.util.clock.Clock;
+import com.ning.billing.util.tag.ControlTagType;
 import com.ning.billing.util.tag.DefaultTagDefinition;
 import com.ning.billing.util.tag.Tag;
 import com.ning.billing.util.tag.TagDefinition;

util/src/main/java/com/ning/billing/util/tag/dao/TagMapper.java 3(+2 -1)

diff --git a/util/src/main/java/com/ning/billing/util/tag/dao/TagMapper.java b/util/src/main/java/com/ning/billing/util/tag/dao/TagMapper.java
index fadf98c..4e3804f 100644
--- a/util/src/main/java/com/ning/billing/util/tag/dao/TagMapper.java
+++ b/util/src/main/java/com/ning/billing/util/tag/dao/TagMapper.java
@@ -22,7 +22,8 @@ import java.util.UUID;
 import org.joda.time.DateTime;
 import org.skife.jdbi.v2.StatementContext;
 import org.skife.jdbi.v2.tweak.ResultSetMapper;
-import com.ning.billing.account.api.ControlTagType;
+
+import com.ning.billing.util.tag.ControlTagType;
 import com.ning.billing.util.tag.DefaultControlTag;
 import com.ning.billing.util.tag.DefaultTagDefinition;
 import com.ning.billing.util.tag.DescriptiveTag;

util/src/main/java/com/ning/billing/util/tag/DefaultControlTag.java 1(+0 -1)

diff --git a/util/src/main/java/com/ning/billing/util/tag/DefaultControlTag.java b/util/src/main/java/com/ning/billing/util/tag/DefaultControlTag.java
index 707526d..588beb7 100644
--- a/util/src/main/java/com/ning/billing/util/tag/DefaultControlTag.java
+++ b/util/src/main/java/com/ning/billing/util/tag/DefaultControlTag.java
@@ -18,7 +18,6 @@ package com.ning.billing.util.tag;
 
 import java.util.UUID;
 import org.joda.time.DateTime;
-import com.ning.billing.account.api.ControlTagType;
 
 public class DefaultControlTag extends DescriptiveTag implements ControlTag {
     private final ControlTagType controlTagType;

util/src/main/java/com/ning/billing/util/tag/DefaultTagStore.java 1(+0 -1)

diff --git a/util/src/main/java/com/ning/billing/util/tag/DefaultTagStore.java b/util/src/main/java/com/ning/billing/util/tag/DefaultTagStore.java
index 2fd8144..5bea67a 100644
--- a/util/src/main/java/com/ning/billing/util/tag/DefaultTagStore.java
+++ b/util/src/main/java/com/ning/billing/util/tag/DefaultTagStore.java
@@ -17,7 +17,6 @@
 package com.ning.billing.util.tag;
 
 import java.util.UUID;
-import com.ning.billing.account.api.ControlTagType;
 import com.ning.billing.util.entity.EntityCollectionBase;
 
 public class DefaultTagStore extends EntityCollectionBase<Tag> implements TagStore {

util/src/test/java/com/ning/billing/util/tag/TestTagStore.java 1(+0 -1)

diff --git a/util/src/test/java/com/ning/billing/util/tag/TestTagStore.java b/util/src/test/java/com/ning/billing/util/tag/TestTagStore.java
index c913791..52dede6 100644
--- a/util/src/test/java/com/ning/billing/util/tag/TestTagStore.java
+++ b/util/src/test/java/com/ning/billing/util/tag/TestTagStore.java
@@ -31,7 +31,6 @@ import org.testng.annotations.Test;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Stage;
-import com.ning.billing.account.api.ControlTagType;
 import com.ning.billing.util.api.TagDefinitionApiException;
 import com.ning.billing.util.clock.Clock;
 import com.ning.billing.util.clock.DefaultClock;