Refactoring addons to generate annotations and addon jars

spring-attic · Mar 3, 2015 · 5f51ca0 · 5f51ca0
1 parent c8fc1ff
commit 5f51ca0
Show file tree

Hide file tree

Showing 110 changed files with 454 additions and 159 deletions.
diff --git a/.../src/main/java/org/springframework/roo/addon/configurable/addon/ConfigurableMetadata.java b/.../src/main/java/org/springframework/roo/addon/configurable/addon/ConfigurableMetadata.java
@@ -4,6 +4,7 @@
 
 import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.springframework.roo.addon.configurable.annotations.RooConfigurable;
 import org.springframework.roo.classpath.PhysicalTypeIdentifierNamingUtils;
 import org.springframework.roo.classpath.PhysicalTypeMetadata;
 import org.springframework.roo.classpath.details.annotations.AnnotationMetadata;

diff --git a/...n/configurable/addon/RooConfigurable.java → ...igurable/annotations/RooConfigurable.java b/...n/configurable/addon/RooConfigurable.java → ...igurable/annotations/RooConfigurable.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.configurable.addon;
+package org.springframework.roo.addon.configurable.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/addon-dbre/addon/pom.xml b/addon-dbre/addon/pom.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.roo</groupId>
+        <artifactId>org.springframework.roo.addon.dbre</artifactId>
+        <version>2.0.0.BUILD-SNAPSHOT</version>
+        <relativePath>../../addon-dbre</relativePath>
+    </parent>
+    <artifactId>org.springframework.roo.addon.dbre.addon</artifactId>
+    <packaging>bundle</packaging>
+    <name>Spring Roo - Addon - Database Reverse Engineering</name>
+    <description>Support for the incremental reverse engineering of existing databases.</description>
+
+
+    <dependencies>
+    	<!-- Annotations dependency -->
+    	<dependency>
+			<groupId>org.springframework.roo</groupId>
+			<artifactId>org.springframework.roo.addon.dbre.annotations</artifactId>
+			<version>${project.parent.version}</version>    	
+    	</dependency>
+    </dependencies>
+
+   	<properties>
+    	<target.jar.directory>${basedir}/../../target/all</target.jar.directory>  
+	</properties>
+
+</project>
diff --git a/...addon/dbre/DbManagedAnnotationValues.java → ...dbre/addon/DbManagedAnnotationValues.java b/...addon/dbre/DbManagedAnnotationValues.java → ...dbre/addon/DbManagedAnnotationValues.java
@@ -1,7 +1,8 @@
-package org.springframework.roo.addon.dbre;
+package org.springframework.roo.addon.dbre.addon;
 
 import static org.springframework.roo.model.RooJavaType.ROO_DB_MANAGED;
 
+import org.springframework.roo.addon.dbre.annotations.RooDbManaged;
 import org.springframework.roo.classpath.PhysicalTypeMetadata;
 import org.springframework.roo.classpath.details.annotations.populator.AbstractAnnotationValues;
 import org.springframework.roo.classpath.details.annotations.populator.AutoPopulate;

diff --git a/...ramework/roo/addon/dbre/DbreCommands.java → ...rk/roo/addon/dbre/addon/DbreCommands.java b/...ramework/roo/addon/dbre/DbreCommands.java → ...rk/roo/addon/dbre/addon/DbreCommands.java
@@ -1,12 +1,12 @@
-package org.springframework.roo.addon.dbre;
+package org.springframework.roo.addon.dbre.addon;
 
 import java.io.File;
 import java.util.Set;
 
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
-import org.springframework.roo.addon.dbre.model.Schema;
+import org.springframework.roo.addon.dbre.addon.model.Schema;
 import org.springframework.roo.model.JavaPackage;
 import org.springframework.roo.shell.CliAvailabilityIndicator;
 import org.springframework.roo.shell.CliCommand;

diff --git a/.../roo/addon/dbre/DbreDatabaseListener.java → ...ddon/dbre/addon/DbreDatabaseListener.java b/.../roo/addon/dbre/DbreDatabaseListener.java → ...ddon/dbre/addon/DbreDatabaseListener.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre;
+package org.springframework.roo.addon.dbre.addon;
 
 /**
  * Responds to discovery of database structural information from the DBRE XML

diff --git a/.../addon/dbre/DbreDatabaseListenerImpl.java → .../dbre/addon/DbreDatabaseListenerImpl.java b/.../addon/dbre/DbreDatabaseListenerImpl.java → .../dbre/addon/DbreDatabaseListenerImpl.java
@@ -1,6 +1,6 @@
-package org.springframework.roo.addon.dbre;
+package org.springframework.roo.addon.dbre.addon;
 
-import static org.springframework.roo.addon.dbre.model.DbreModelService.DBRE_XML;
+import static org.springframework.roo.addon.dbre.addon.model.DbreModelService.DBRE_XML;
 import static org.springframework.roo.model.JavaType.OBJECT;
 import static org.springframework.roo.model.RooJavaType.ROO_DB_MANAGED;
 import static org.springframework.roo.model.RooJavaType.ROO_IDENTIFIER;
@@ -25,10 +25,10 @@
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
-import org.springframework.roo.addon.dbre.model.Column;
-import org.springframework.roo.addon.dbre.model.Database;
-import org.springframework.roo.addon.dbre.model.DbreModelService;
-import org.springframework.roo.addon.dbre.model.Table;
+import org.springframework.roo.addon.dbre.addon.model.Column;
+import org.springframework.roo.addon.dbre.addon.model.Database;
+import org.springframework.roo.addon.dbre.addon.model.DbreModelService;
+import org.springframework.roo.addon.dbre.addon.model.Table;
 import org.springframework.roo.addon.jpa.identifier.Identifier;
 import org.springframework.roo.addon.jpa.identifier.IdentifierService;
 import org.springframework.roo.addon.layers.repository.jpa.RepositoryJpaOperations;

diff --git a/...ramework/roo/addon/dbre/DbreMetadata.java → ...rk/roo/addon/dbre/addon/DbreMetadata.java b/...ramework/roo/addon/dbre/DbreMetadata.java → ...rk/roo/addon/dbre/addon/DbreMetadata.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre;
+package org.springframework.roo.addon.dbre.addon;
 
 import static org.springframework.roo.model.JdkJavaType.CALENDAR;
 import static org.springframework.roo.model.JdkJavaType.DATE;
@@ -32,12 +32,13 @@
 
 import org.apache.commons.lang3.Validate;
 import org.jvnet.inflector.Noun;
-import org.springframework.roo.addon.dbre.model.CascadeAction;
-import org.springframework.roo.addon.dbre.model.Column;
-import org.springframework.roo.addon.dbre.model.Database;
-import org.springframework.roo.addon.dbre.model.ForeignKey;
-import org.springframework.roo.addon.dbre.model.Reference;
-import org.springframework.roo.addon.dbre.model.Table;
+import org.springframework.roo.addon.dbre.addon.model.CascadeAction;
+import org.springframework.roo.addon.dbre.addon.model.Column;
+import org.springframework.roo.addon.dbre.addon.model.Database;
+import org.springframework.roo.addon.dbre.addon.model.ForeignKey;
+import org.springframework.roo.addon.dbre.addon.model.Reference;
+import org.springframework.roo.addon.dbre.addon.model.Table;
+import org.springframework.roo.addon.dbre.annotations.RooDbManaged;
 import org.springframework.roo.classpath.PhysicalTypeIdentifierNamingUtils;
 import org.springframework.roo.classpath.PhysicalTypeMetadata;
 import org.springframework.roo.classpath.details.ClassOrInterfaceTypeDetails;

diff --git a/.../roo/addon/dbre/DbreMetadataProvider.java → ...ddon/dbre/addon/DbreMetadataProvider.java b/.../roo/addon/dbre/DbreMetadataProvider.java → ...ddon/dbre/addon/DbreMetadataProvider.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre;
+package org.springframework.roo.addon.dbre.addon;
 
 import org.springframework.roo.classpath.itd.ItdTriggerBasedMetadataProvider;
 

diff --git a/.../addon/dbre/DbreMetadataProviderImpl.java → .../dbre/addon/DbreMetadataProviderImpl.java b/.../addon/dbre/DbreMetadataProviderImpl.java → .../dbre/addon/DbreMetadataProviderImpl.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre;
+package org.springframework.roo.addon.dbre.addon;
 
 import static org.springframework.roo.model.RooJavaType.ROO_DB_MANAGED;
 
@@ -9,8 +9,8 @@
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
 import org.osgi.service.component.ComponentContext;
-import org.springframework.roo.addon.dbre.model.Database;
-import org.springframework.roo.addon.dbre.model.DbreModelService;
+import org.springframework.roo.addon.dbre.addon.model.Database;
+import org.springframework.roo.addon.dbre.addon.model.DbreModelService;
 import org.springframework.roo.classpath.PhysicalTypeIdentifier;
 import org.springframework.roo.classpath.PhysicalTypeMetadata;
 import org.springframework.roo.classpath.TypeManagementService;
@@ -21,7 +21,6 @@
 import org.springframework.roo.classpath.itd.ItdTypeDetailsProvidingMetadataItem;
 import org.springframework.roo.model.JavaType;
 import org.springframework.roo.project.LogicalPath;
-
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;

diff --git a/...mework/roo/addon/dbre/DbreOperations.java → .../roo/addon/dbre/addon/DbreOperations.java b/...mework/roo/addon/dbre/DbreOperations.java → .../roo/addon/dbre/addon/DbreOperations.java
@@ -1,9 +1,9 @@
-package org.springframework.roo.addon.dbre;
+package org.springframework.roo.addon.dbre.addon;
 
 import java.io.File;
 import java.util.Set;
 
-import org.springframework.roo.addon.dbre.model.Schema;
+import org.springframework.roo.addon.dbre.addon.model.Schema;
 import org.springframework.roo.model.JavaPackage;
 
 /**

diff --git a/...rk/roo/addon/dbre/DbreOperationsImpl.java → .../addon/dbre/addon/DbreOperationsImpl.java b/...rk/roo/addon/dbre/DbreOperationsImpl.java → .../addon/dbre/addon/DbreOperationsImpl.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre;
+package org.springframework.roo.addon.dbre.addon;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -13,10 +13,10 @@
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
-import org.springframework.roo.addon.dbre.model.Database;
-import org.springframework.roo.addon.dbre.model.DatabaseXmlUtils;
-import org.springframework.roo.addon.dbre.model.DbreModelService;
-import org.springframework.roo.addon.dbre.model.Schema;
+import org.springframework.roo.addon.dbre.addon.model.Database;
+import org.springframework.roo.addon.dbre.addon.model.DatabaseXmlUtils;
+import org.springframework.roo.addon.dbre.addon.model.DbreModelService;
+import org.springframework.roo.addon.dbre.addon.model.Schema;
 import org.springframework.roo.model.JavaPackage;
 import org.springframework.roo.process.manager.FileManager;
 import org.springframework.roo.project.FeatureNames;

diff --git a/...amework/roo/addon/dbre/DbreTypeUtils.java → ...k/roo/addon/dbre/addon/DbreTypeUtils.java b/...amework/roo/addon/dbre/DbreTypeUtils.java → ...k/roo/addon/dbre/addon/DbreTypeUtils.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre;
+package org.springframework.roo.addon.dbre.addon;
 
 import static org.springframework.roo.model.JpaJavaType.TABLE;
 import static org.springframework.roo.model.RooJavaType.ROO_JPA_ACTIVE_RECORD;
@@ -10,8 +10,8 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
-import org.springframework.roo.addon.dbre.model.DbreModelService;
-import org.springframework.roo.addon.dbre.model.Table;
+import org.springframework.roo.addon.dbre.addon.model.DbreModelService;
+import org.springframework.roo.addon.dbre.addon.model.Table;
 import org.springframework.roo.classpath.details.ClassOrInterfaceTypeDetails;
 import org.springframework.roo.classpath.details.MemberHoldingTypeDetails;
 import org.springframework.roo.classpath.details.annotations.AnnotationAttributeValue;

diff --git a/...work/roo/addon/dbre/IdentifierHolder.java → ...oo/addon/dbre/addon/IdentifierHolder.java b/...work/roo/addon/dbre/IdentifierHolder.java → ...oo/addon/dbre/addon/IdentifierHolder.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre;
+package org.springframework.roo.addon.dbre.addon;
 
 import java.util.List;
 

diff --git a/...verter/IncludeExcludeTablesConverter.java → ...verter/IncludeExcludeTablesConverter.java b/...verter/IncludeExcludeTablesConverter.java → ...verter/IncludeExcludeTablesConverter.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre.converter;
+package org.springframework.roo.addon.dbre.addon.converter;
 
 import java.util.LinkedHashSet;
 import java.util.List;

diff --git a/...addon/dbre/converter/SchemaConverter.java → ...dbre/addon/converter/SchemaConverter.java b/...addon/dbre/converter/SchemaConverter.java → ...dbre/addon/converter/SchemaConverter.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre.converter;
+package org.springframework.roo.addon.dbre.addon.converter;
 
 import java.util.HashSet;
 import java.util.List;
@@ -8,8 +8,8 @@
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
-import org.springframework.roo.addon.dbre.model.DbreModelService;
-import org.springframework.roo.addon.dbre.model.Schema;
+import org.springframework.roo.addon.dbre.addon.model.DbreModelService;
+import org.springframework.roo.addon.dbre.addon.model.Schema;
 import org.springframework.roo.shell.Completion;
 import org.springframework.roo.shell.Converter;
 import org.springframework.roo.shell.MethodTarget;

diff --git a/...o/addon/dbre/jdbc/ConnectionProvider.java → ...n/dbre/addon/jdbc/ConnectionProvider.java b/...o/addon/dbre/jdbc/ConnectionProvider.java → ...n/dbre/addon/jdbc/ConnectionProvider.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre.jdbc;
+package org.springframework.roo.addon.dbre.addon.jdbc;
 
 import java.sql.Connection;
 import java.util.Map;

diff --git a/...don/dbre/jdbc/ConnectionProviderImpl.java → ...re/addon/jdbc/ConnectionProviderImpl.java b/...don/dbre/jdbc/ConnectionProviderImpl.java → ...re/addon/jdbc/ConnectionProviderImpl.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre.jdbc;
+package org.springframework.roo.addon.dbre.addon.jdbc;
 
 import java.sql.Connection;
 import java.sql.Driver;

diff --git a/...ddon/dbre/model/AbstractIntrospector.java → ...bre/addon/model/AbstractIntrospector.java b/...ddon/dbre/model/AbstractIntrospector.java → ...bre/addon/model/AbstractIntrospector.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre.model;
+package org.springframework.roo.addon.dbre.addon.model;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;

diff --git a/...k/roo/addon/dbre/model/CascadeAction.java → ...addon/dbre/addon/model/CascadeAction.java b/...k/roo/addon/dbre/model/CascadeAction.java → ...addon/dbre/addon/model/CascadeAction.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre.model;
+package org.springframework.roo.addon.dbre.addon.model;
 
 /**
  * Represents the different cascade actions for the <code>onDelete</code> and

diff --git a/...ramework/roo/addon/dbre/model/Column.java → ...rk/roo/addon/dbre/addon/model/Column.java b/...ramework/roo/addon/dbre/model/Column.java → ...rk/roo/addon/dbre/addon/model/Column.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre.model;
+package org.springframework.roo.addon.dbre.addon.model;
 
 import static org.springframework.roo.model.JavaType.BOOLEAN_OBJECT;
 import static org.springframework.roo.model.JavaType.BYTE_ARRAY_PRIMITIVE;

diff --git a/...mework/roo/addon/dbre/model/Database.java → .../roo/addon/dbre/addon/model/Database.java b/...mework/roo/addon/dbre/model/Database.java → .../roo/addon/dbre/addon/model/Database.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre.model;
+package org.springframework.roo.addon.dbre.addon.model;
 
 import java.util.Collections;
 import java.util.HashSet;

diff --git a/...on/dbre/model/DatabaseContentHandler.java → ...e/addon/model/DatabaseContentHandler.java b/...on/dbre/model/DatabaseContentHandler.java → ...e/addon/model/DatabaseContentHandler.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre.model;
+package org.springframework.roo.addon.dbre.addon.model;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
@@ -7,7 +7,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.tuple.Pair;
-import org.springframework.roo.addon.dbre.model.DatabaseXmlUtils.IndexType;
+import org.springframework.roo.addon.dbre.addon.model.DatabaseXmlUtils.IndexType;
 import org.springframework.roo.model.JavaPackage;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;

diff --git a/...ddon/dbre/model/DatabaseIntrospector.java → ...bre/addon/model/DatabaseIntrospector.java b/...ddon/dbre/model/DatabaseIntrospector.java → ...bre/addon/model/DatabaseIntrospector.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre.model;
+package org.springframework.roo.addon.dbre.addon.model;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;

diff --git a/...oo/addon/dbre/model/DatabaseXmlUtils.java → ...on/dbre/addon/model/DatabaseXmlUtils.java b/...oo/addon/dbre/model/DatabaseXmlUtils.java → ...on/dbre/addon/model/DatabaseXmlUtils.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre.model;
+package org.springframework.roo.addon.dbre.addon.model;
 
 import java.io.InputStream;
 import java.util.EmptyStackException;

diff --git a/...oo/addon/dbre/model/DbreModelService.java → ...on/dbre/addon/model/DbreModelService.java b/...oo/addon/dbre/model/DbreModelService.java → ...on/dbre/addon/model/DbreModelService.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre.model;
+package org.springframework.roo.addon.dbre.addon.model;
 
 import java.util.Set;
 

diff --git a/...ddon/dbre/model/DbreModelServiceImpl.java → ...bre/addon/model/DbreModelServiceImpl.java b/...ddon/dbre/model/DbreModelServiceImpl.java → ...bre/addon/model/DbreModelServiceImpl.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre.model;
+package org.springframework.roo.addon.dbre.addon.model;
 
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
@@ -20,7 +20,7 @@
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
-import org.springframework.roo.addon.dbre.jdbc.ConnectionProvider;
+import org.springframework.roo.addon.dbre.addon.jdbc.ConnectionProvider;
 import org.springframework.roo.addon.propfiles.PropFileOperations;
 import org.springframework.roo.file.monitor.event.FileDetails;
 import org.springframework.roo.process.manager.FileManager;

diff --git a/...work/roo/addon/dbre/model/ForeignKey.java → ...oo/addon/dbre/addon/model/ForeignKey.java b/...work/roo/addon/dbre/model/ForeignKey.java → ...oo/addon/dbre/addon/model/ForeignKey.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre.model;
+package org.springframework.roo.addon.dbre.addon.model;
 
 import java.util.LinkedHashSet;
 import java.util.Set;

diff --git a/...framework/roo/addon/dbre/model/Index.java → ...ork/roo/addon/dbre/addon/model/Index.java b/...framework/roo/addon/dbre/model/Index.java → ...ork/roo/addon/dbre/addon/model/Index.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre.model;
+package org.springframework.roo.addon.dbre.addon.model;
 
 import java.util.LinkedHashSet;
 import java.util.Set;

diff --git a/...ork/roo/addon/dbre/model/IndexColumn.java → ...o/addon/dbre/addon/model/IndexColumn.java b/...ork/roo/addon/dbre/model/IndexColumn.java → ...o/addon/dbre/addon/model/IndexColumn.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre.model;
+package org.springframework.roo.addon.dbre.addon.model;
 
 /**
  * Represents a column of an index in the database model.

diff --git a/...ework/roo/addon/dbre/model/Reference.java → ...roo/addon/dbre/addon/model/Reference.java b/...ework/roo/addon/dbre/model/Reference.java → ...roo/addon/dbre/addon/model/Reference.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre.model;
+package org.springframework.roo.addon.dbre.addon.model;
 
 import org.apache.commons.lang3.Validate;
 

diff --git a/...ramework/roo/addon/dbre/model/Schema.java → ...rk/roo/addon/dbre/addon/model/Schema.java b/...ramework/roo/addon/dbre/model/Schema.java → ...rk/roo/addon/dbre/addon/model/Schema.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre.model;
+package org.springframework.roo.addon.dbre.addon.model;
 
 import org.apache.commons.lang3.StringUtils;
 

diff --git a/...ddon/dbre/model/SchemaContentHandler.java → ...bre/addon/model/SchemaContentHandler.java b/...ddon/dbre/model/SchemaContentHandler.java → ...bre/addon/model/SchemaContentHandler.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre.model;
+package org.springframework.roo.addon.dbre.addon.model;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;

diff --git a/.../addon/dbre/model/SchemaIntrospector.java → .../dbre/addon/model/SchemaIntrospector.java b/.../addon/dbre/model/SchemaIntrospector.java → .../dbre/addon/model/SchemaIntrospector.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre.model;
+package org.springframework.roo.addon.dbre.addon.model;
 
 import java.sql.Connection;
 import java.sql.ResultSet;

diff --git a/...framework/roo/addon/dbre/model/Table.java → ...ork/roo/addon/dbre/addon/model/Table.java b/...framework/roo/addon/dbre/model/Table.java → ...ork/roo/addon/dbre/addon/model/Table.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre.model;
+package org.springframework.roo.addon.dbre.addon.model;
 
 import java.util.LinkedHashSet;
 import java.util.Set;

diff --git a/...ework/roo/addon/dbre/model/TableType.java → ...roo/addon/dbre/addon/model/TableType.java b/...ework/roo/addon/dbre/model/TableType.java → ...roo/addon/dbre/addon/model/TableType.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre.model;
+package org.springframework.roo.addon.dbre.addon.model;
 
 /**
  * SQL table types.

diff --git a/...n/dbre/model/dialect/AbstractDialect.java → .../addon/model/dialect/AbstractDialect.java b/...n/dbre/model/dialect/AbstractDialect.java → .../addon/model/dialect/AbstractDialect.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre.model.dialect;
+package org.springframework.roo.addon.dbre.addon.model.dialect;
 
 /**
  * Abstract base class for database {@link Dialect}s.

diff --git a/...don/dbre/model/dialect/DB2400Dialect.java → ...re/addon/model/dialect/DB2400Dialect.java b/...don/dbre/model/dialect/DB2400Dialect.java → ...re/addon/model/dialect/DB2400Dialect.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.dbre.model.dialect;
+package org.springframework.roo.addon.dbre.addon.model.dialect;
 
 /**
  * An SQL dialect for the DB2/400 database.

diff --git a/.../addon/dbre/model/dialect/DB2Dialect.java → .../dbre/addon/model/dialect/DB2Dialect.java b/.../addon/dbre/model/dialect/DB2Dialect.java → .../dbre/addon/model/dialect/DB2Dialect.java
@@ -1,7 +1,7 @@
-package org.springframework.roo.addon.dbre.model.dialect;
+package org.springframework.roo.addon.dbre.addon.model.dialect;
 
 import org.apache.commons.lang3.Validate;
-import org.springframework.roo.addon.dbre.model.Schema;
+import org.springframework.roo.addon.dbre.addon.model.Schema;
 
 /**
  * An SQL dialect for the DB2 database.