Refactoring addon-plural

spring-attic · Mar 4, 2015 · 1c555d7 · 1c555d7
1 parent 1fd2f8f
commit 1c555d7
Show file tree

Hide file tree

Showing 38 changed files with 102 additions and 39 deletions.
diff --git a/addon-cloud/pom.xml b/addon-cloud/pom.xml
@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.roo</groupId>
-            <artifactId>org.springframework.roo.addon.plural</artifactId>
+            <artifactId>org.springframework.roo.addon.plural.addon</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.roo</groupId>

diff --git a/addon-dbre/pom.xml b/addon-dbre/pom.xml
@@ -55,7 +55,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.roo</groupId>
-            <artifactId>org.springframework.roo.addon.plural</artifactId>
+            <artifactId>org.springframework.roo.addon.plural.addon</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.roo</groupId>

diff --git a/addon-dod/pom.xml b/addon-dod/pom.xml
@@ -39,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.roo</groupId>
-            <artifactId>org.springframework.roo.addon.plural</artifactId>
+            <artifactId>org.springframework.roo.addon.plural.addon</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.roo</groupId>

diff --git a/addon-email/pom.xml b/addon-email/pom.xml
@@ -33,7 +33,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.roo</groupId>
-            <artifactId>org.springframework.roo.addon.plural</artifactId>
+            <artifactId>org.springframework.roo.addon.plural.addon</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.roo</groupId>

diff --git a/addon-finder/pom.xml b/addon-finder/pom.xml
@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.roo</groupId>
-            <artifactId>org.springframework.roo.addon.plural</artifactId>
+            <artifactId>org.springframework.roo.addon.plural.addon</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.roo</groupId>

diff --git a/...c/main/java/org/springframework/roo/addon/jpa/addon/activerecord/EntityLayerProvider.java b/...c/main/java/org/springframework/roo/addon/jpa/addon/activerecord/EntityLayerProvider.java
@@ -8,7 +8,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.plural.PluralMetadata;
+import org.springframework.roo.addon.plural.addon.PluralMetadata;
 import org.springframework.roo.classpath.TypeLocationService;
 import org.springframework.roo.classpath.details.ClassOrInterfaceTypeDetailsBuilder;
 import org.springframework.roo.classpath.details.ImportMetadataBuilder;

diff --git a/...springframework/roo/addon/jpa/addon/activerecord/JpaActiveRecordMetadataProviderImpl.java b/...springframework/roo/addon/jpa/addon/activerecord/JpaActiveRecordMetadataProviderImpl.java
@@ -33,8 +33,8 @@
 import org.osgi.service.component.ComponentContext;
 import org.springframework.roo.addon.configurable.addon.ConfigurableMetadataProvider;
 import org.springframework.roo.addon.jpa.addon.entity.JpaEntityAnnotationValues;
-import org.springframework.roo.addon.plural.PluralMetadata;
-import org.springframework.roo.addon.plural.PluralMetadataProvider;
+import org.springframework.roo.addon.plural.addon.PluralMetadata;
+import org.springframework.roo.addon.plural.addon.PluralMetadataProvider;
 import org.springframework.roo.classpath.PhysicalTypeIdentifier;
 import org.springframework.roo.classpath.PhysicalTypeMetadata;
 import org.springframework.roo.classpath.customdata.taggers.CustomDataKeyDecorator;

diff --git a/...st/java/org/springframework/roo/addon/jpa/addon/activerecord/EntityLayerProviderTest.java b/...st/java/org/springframework/roo/addon/jpa/addon/activerecord/EntityLayerProviderTest.java
@@ -28,7 +28,7 @@
 import org.springframework.roo.addon.jpa.addon.activerecord.EntityLayerProvider;
 import org.springframework.roo.addon.jpa.addon.activerecord.JpaActiveRecordMetadataProvider;
 import org.springframework.roo.addon.jpa.addon.activerecord.JpaCrudAnnotationValues;
-import org.springframework.roo.addon.plural.PluralMetadata;
+import org.springframework.roo.addon.plural.addon.PluralMetadata;
 import org.springframework.roo.classpath.TypeLocationService;
 import org.springframework.roo.classpath.customdata.tagkeys.MethodMetadataCustomDataKey;
 import org.springframework.roo.classpath.layers.MemberTypeAdditions;

diff --git a/addon-jpa/pom.xml b/addon-jpa/pom.xml
@@ -39,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.roo</groupId>
-            <artifactId>org.springframework.roo.addon.plural</artifactId>
+            <artifactId>org.springframework.roo.addon.plural.addon</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.roo</groupId>

diff --git a/...on/addon/src/main/java/org/springframework/roo/addon/json/addon/JsonMetadataProvider.java b/...on/addon/src/main/java/org/springframework/roo/addon/json/addon/JsonMetadataProvider.java
@@ -6,7 +6,7 @@
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Service;
 import org.osgi.service.component.ComponentContext;
-import org.springframework.roo.addon.plural.PluralMetadata;
+import org.springframework.roo.addon.plural.addon.PluralMetadata;
 import org.springframework.roo.classpath.PhysicalTypeIdentifier;
 import org.springframework.roo.classpath.PhysicalTypeMetadata;
 import org.springframework.roo.classpath.itd.AbstractItdMetadataProvider;

diff --git a/addon-json/pom.xml b/addon-json/pom.xml
@@ -35,7 +35,7 @@
         <!-- Spring Roo modules -->
         <dependency>
             <groupId>org.springframework.roo</groupId>
-            <artifactId>org.springframework.roo.addon.plural</artifactId>
+            <artifactId>org.springframework.roo.addon.plural.addon</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.roo</groupId>

diff --git a/...java/org/springframework/roo/addon/layers/service/addon/ServiceClassMetadataProvider.java b/...java/org/springframework/roo/addon/layers/service/addon/ServiceClassMetadataProvider.java
@@ -10,7 +10,7 @@
 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.plural.PluralMetadata;
+import org.springframework.roo.addon.plural.addon.PluralMetadata;
 import org.springframework.roo.classpath.PhysicalTypeIdentifier;
 import org.springframework.roo.classpath.PhysicalTypeMetadata;
 import org.springframework.roo.classpath.details.ClassOrInterfaceTypeDetails;

diff --git a/.../org/springframework/roo/addon/layers/service/addon/ServiceInterfaceMetadataProvider.java b/.../org/springframework/roo/addon/layers/service/addon/ServiceInterfaceMetadataProvider.java
@@ -12,7 +12,7 @@
 import org.apache.felix.scr.annotations.Service;
 import org.osgi.service.component.ComponentContext;
 import org.springframework.roo.addon.layers.service.annotations.RooService;
-import org.springframework.roo.addon.plural.PluralMetadata;
+import org.springframework.roo.addon.plural.addon.PluralMetadata;
 import org.springframework.roo.addon.security.PermissionEvaluatorMetadata;
 import org.springframework.roo.classpath.PhysicalTypeIdentifier;
 import org.springframework.roo.classpath.PhysicalTypeMetadata;

diff --git a/...rc/main/java/org/springframework/roo/addon/layers/service/addon/ServiceLayerProvider.java b/...rc/main/java/org/springframework/roo/addon/layers/service/addon/ServiceLayerProvider.java
@@ -14,7 +14,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.plural.PluralMetadata;
+import org.springframework.roo.addon.plural.addon.PluralMetadata;
 import org.springframework.roo.classpath.TypeLocationService;
 import org.springframework.roo.classpath.details.ClassOrInterfaceTypeDetails;
 import org.springframework.roo.classpath.details.ClassOrInterfaceTypeDetailsBuilder;

diff --git a/...est/java/org/springframework/roo/addon/layers/service/addon/ServiceLayerProviderTest.java b/...est/java/org/springframework/roo/addon/layers/service/addon/ServiceLayerProviderTest.java
@@ -22,7 +22,7 @@
 import org.springframework.roo.addon.layers.service.addon.ServiceInterfaceLocator;
 import org.springframework.roo.addon.layers.service.addon.ServiceLayerProvider;
 import org.springframework.roo.addon.layers.service.annotations.RooService;
-import org.springframework.roo.addon.plural.PluralMetadata;
+import org.springframework.roo.addon.plural.addon.PluralMetadata;
 import org.springframework.roo.classpath.TypeLocationService;
 import org.springframework.roo.classpath.details.ClassOrInterfaceTypeDetails;
 import org.springframework.roo.classpath.layers.MemberTypeAdditions;

diff --git a/addon-layers-service/pom.xml b/addon-layers-service/pom.xml
@@ -80,7 +80,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.roo</groupId>
-            <artifactId>org.springframework.roo.addon.plural</artifactId>
+            <artifactId>org.springframework.roo.addon.plural.addon</artifactId>
 
         </dependency>
         <dependency>

diff --git a/addon-plural/addon/pom.xml b/addon-plural/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.plural</artifactId>
+        <version>2.0.0.BUILD-SNAPSHOT</version>
+        <relativePath>../../addon-plural</relativePath>
+    </parent>
+    <artifactId>org.springframework.roo.addon.plural.addon</artifactId>
+    <packaging>bundle</packaging>
+    <name>Spring Roo - Addon - Plural Details</name>
+    <description>Determines the plural term for a given String literal using Inflector (https://inflector.dev.java.net/).</description>
+
+
+    <dependencies>
+    	<!-- Annotations dependency -->
+    	<dependency>
+			<groupId>org.springframework.roo</groupId>
+			<artifactId>org.springframework.roo.addon.plural.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/plural/PluralAnnotationValues.java → .../plural/addon/PluralAnnotationValues.java b/.../addon/plural/PluralAnnotationValues.java → .../plural/addon/PluralAnnotationValues.java
@@ -1,5 +1,6 @@
-package org.springframework.roo.addon.plural;
+package org.springframework.roo.addon.plural.addon;
 
+import org.springframework.roo.addon.plural.annotations.RooPlural;
 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/...work/roo/addon/plural/PluralMetadata.java → ...oo/addon/plural/addon/PluralMetadata.java b/...work/roo/addon/plural/PluralMetadata.java → ...oo/addon/plural/addon/PluralMetadata.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.plural;
+package org.springframework.roo.addon.plural.addon;
 
 import static org.springframework.roo.model.RooJavaType.ROO_PLURAL;
 
@@ -10,6 +10,7 @@
 import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.jvnet.inflector.Noun;
+import org.springframework.roo.addon.plural.annotations.RooPlural;
 import org.springframework.roo.classpath.PhysicalTypeIdentifierNamingUtils;
 import org.springframework.roo.classpath.PhysicalTypeMetadata;
 import org.springframework.roo.classpath.details.FieldMetadata;

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

diff --git a/...on/plural/PluralMetadataProviderImpl.java → ...ral/addon/PluralMetadataProviderImpl.java b/...on/plural/PluralMetadataProviderImpl.java → ...ral/addon/PluralMetadataProviderImpl.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.plural;
+package org.springframework.roo.addon.plural.addon;
 
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Service;

diff --git a/...on/plural/PluralAnnotationValuesTest.java → ...ral/addon/PluralAnnotationValuesTest.java b/...on/plural/PluralAnnotationValuesTest.java → ...ral/addon/PluralAnnotationValuesTest.java
@@ -1,5 +1,7 @@
-package org.springframework.roo.addon.plural;
+package org.springframework.roo.addon.plural.addon;
 
+import org.springframework.roo.addon.plural.addon.PluralAnnotationValues;
+import org.springframework.roo.addon.plural.annotations.RooPlural;
 import org.springframework.roo.classpath.details.annotations.populator.AnnotationValuesTestCase;
 
 /**

diff --git a/addon-plural/annotations/pom.xml b/addon-plural/annotations/pom.xml
@@ -0,0 +1,19 @@
+<?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.plural</artifactId>
+        <version>2.0.0.BUILD-SNAPSHOT</version>
+        <relativePath>../../addon-plural</relativePath>
+    </parent>
+    <artifactId>org.springframework.roo.addon.plural.annotations</artifactId>
+    <packaging>bundle</packaging>
+    <name>Spring Roo - Annotations - Plural Details</name>
+    <description>Determines the plural term for a given String literal using Inflector (https://inflector.dev.java.net/).</description>
+
+   	<properties>
+    	<target.jar.directory>${basedir}/../../target/all</target.jar.directory>  
+	</properties>
+
+</project>
diff --git a/...framework/roo/addon/plural/RooPlural.java → ...o/addon/plural/annotations/RooPlural.java b/...framework/roo/addon/plural/RooPlural.java → ...o/addon/plural/annotations/RooPlural.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.plural;
+package org.springframework.roo.addon.plural.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/addon-plural/pom.xml b/addon-plural/pom.xml
@@ -8,9 +8,15 @@
         <relativePath>../runtime/osgi-bundle</relativePath>
     </parent>
     <artifactId>org.springframework.roo.addon.plural</artifactId>
-    <packaging>bundle</packaging>
-    <name>Spring Roo - Addon - Plural Details</name>
+    <packaging>pom</packaging>
+    <name>Spring Roo - Plural Details</name>
     <description>Determines the plural term for a given String literal using Inflector (https://inflector.dev.java.net/).</description>
+
+    <modules>
+    	<module>addon</module>
+    	<module>annotations</module>
+    </modules>
+
     <dependencies>
         <!-- OSGi -->
         <dependency>
@@ -69,4 +75,9 @@
             <artifactId>org.springframework.roo.wrapping.inflector</artifactId>
         </dependency>
     </dependencies>
+
+  	<properties>
+    	<target.jar.directory>${basedir}/../target/all</target.jar.directory>  
+	</properties>
+
 </project>
diff --git a/...main/java/org/springframework/roo/addon/security/PermissionEvaluatorMetadataProvider.java b/...main/java/org/springframework/roo/addon/security/PermissionEvaluatorMetadataProvider.java
@@ -11,7 +11,7 @@
 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.plural.PluralMetadata;
+import org.springframework.roo.addon.plural.addon.PluralMetadata;
 import org.springframework.roo.classpath.PhysicalTypeIdentifier;
 import org.springframework.roo.classpath.PhysicalTypeMetadata;
 import org.springframework.roo.classpath.TypeManagementService;

diff --git a/addon-tailor/pom.xml b/addon-tailor/pom.xml
@@ -33,7 +33,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.roo</groupId>
-            <artifactId>org.springframework.roo.addon.plural</artifactId>
+            <artifactId>org.springframework.roo.addon.plural.addon</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.roo</groupId>

diff --git a/addon-test/pom.xml b/addon-test/pom.xml
@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.roo</groupId>
-            <artifactId>org.springframework.roo.addon.plural</artifactId>
+            <artifactId>org.springframework.roo.addon.plural.addon</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.roo</groupId>

diff --git a/addon-web-mvc-controller/pom.xml b/addon-web-mvc-controller/pom.xml
@@ -51,7 +51,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.roo</groupId>
-            <artifactId>org.springframework.roo.addon.plural</artifactId>
+            <artifactId>org.springframework.roo.addon.plural.addon</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.roo</groupId>

diff --git a/...er/src/main/java/org/springframework/roo/addon/web/mvc/controller/ControllerCommands.java b/...er/src/main/java/org/springframework/roo/addon/web/mvc/controller/ControllerCommands.java
@@ -13,7 +13,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.plural.PluralMetadata;
+import org.springframework.roo.addon.plural.addon.PluralMetadata;
 import org.springframework.roo.classpath.PhysicalTypeIdentifier;
 import org.springframework.roo.classpath.TypeLocationService;
 import org.springframework.roo.classpath.details.ClassOrInterfaceTypeDetails;

diff --git a/.../main/java/org/springframework/roo/addon/web/mvc/controller/ControllerOperationsImpl.java b/.../main/java/org/springframework/roo/addon/web/mvc/controller/ControllerOperationsImpl.java
@@ -17,7 +17,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.plural.PluralMetadata;
+import org.springframework.roo.addon.plural.addon.PluralMetadata;
 import org.springframework.roo.addon.web.mvc.controller.scaffold.WebScaffoldMetadata;
 import org.springframework.roo.classpath.PhysicalTypeCategory;
 import org.springframework.roo.classpath.PhysicalTypeIdentifier;

diff --git a/...java/org/springframework/roo/addon/web/mvc/controller/details/WebMetadataServiceImpl.java b/...java/org/springframework/roo/addon/web/mvc/controller/details/WebMetadataServiceImpl.java
@@ -37,7 +37,7 @@
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
 import org.springframework.roo.addon.finder.FinderMetadata;
-import org.springframework.roo.addon.plural.PluralMetadata;
+import org.springframework.roo.addon.plural.addon.PluralMetadata;
 import org.springframework.roo.addon.web.mvc.controller.scaffold.WebScaffoldMetadata;
 import org.springframework.roo.classpath.PhysicalTypeCategory;
 import org.springframework.roo.classpath.PhysicalTypeIdentifier;

diff --git a/...va/org/springframework/roo/addon/web/mvc/controller/json/WebJsonMetadataProviderImpl.java b/...va/org/springframework/roo/addon/web/mvc/controller/json/WebJsonMetadataProviderImpl.java
@@ -15,7 +15,7 @@
 import org.apache.felix.scr.annotations.Service;
 import org.osgi.service.component.ComponentContext;
 import org.springframework.roo.addon.json.addon.JsonMetadata;
-import org.springframework.roo.addon.plural.PluralMetadata;
+import org.springframework.roo.addon.plural.addon.PluralMetadata;
 import org.springframework.roo.addon.web.mvc.controller.details.FinderMetadataDetails;
 import org.springframework.roo.addon.web.mvc.controller.details.JavaTypePersistenceMetadataDetails;
 import org.springframework.roo.addon.web.mvc.controller.details.WebMetadataService;

diff --git a/...ain/java/org/springframework/roo/addon/web/mvc/controller/json/WebJsonOperationsImpl.java b/...ain/java/org/springframework/roo/addon/web/mvc/controller/json/WebJsonOperationsImpl.java
@@ -13,7 +13,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.plural.PluralMetadata;
+import org.springframework.roo.addon.plural.addon.PluralMetadata;
 import org.springframework.roo.addon.web.mvc.controller.WebMvcOperations;
 import org.springframework.roo.addon.web.mvc.controller.scaffold.WebScaffoldAnnotationValues;
 import org.springframework.roo.classpath.PhysicalTypeCategory;

diff --git a/addon-web-selenium/pom.xml b/addon-web-selenium/pom.xml
@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.roo</groupId>
-            <artifactId>org.springframework.roo.addon.plural</artifactId>
+            <artifactId>org.springframework.roo.addon.plural.addon</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.roo</groupId>

diff --git a/pom.xml b/pom.xml
@@ -519,7 +519,7 @@
             </dependency>
             <dependency>
                 <groupId>org.springframework.roo</groupId>
-                <artifactId>org.springframework.roo.addon.plural</artifactId>
+                <artifactId>org.springframework.roo.addon.plural.addon</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>

diff --git a/...rc/test/java/org/springframework/roo/classpath/PhysicalTypeIdentifierNamingUtilsTest.java b/...rc/test/java/org/springframework/roo/classpath/PhysicalTypeIdentifierNamingUtilsTest.java
@@ -15,8 +15,8 @@
 public class PhysicalTypeIdentifierNamingUtilsTest {
 
     // instance ID
-    private static final String METADATA_CLASS_ID = "MID:org.springframework.roo.addon.plural.PluralMetadata";
-    private static final String METADATA_INSTANCE_ID = "MID:org.springframework.roo.addon.plural.PluralMetadata#core|SRC_MAIN_JAVA?com.example.domain.Thing";
+    private static final String METADATA_CLASS_ID = "MID:org.springframework.roo.addon.plural.addon.PluralMetadata";
+    private static final String METADATA_INSTANCE_ID = "MID:org.springframework.roo.addon.plural.addon.PluralMetadata#core|SRC_MAIN_JAVA?com.example.domain.Thing";
     private static final String MODULE = "core"; // Same as in the above
                                                  // instance ID
     private static final Path PATH = Path.SRC_MAIN_JAVA; // Same as in the below

diff --git a/runtime/model/src/main/java/org/springframework/roo/model/RooJavaType.java b/runtime/model/src/main/java/org/springframework/roo/model/RooJavaType.java
@@ -57,7 +57,7 @@ public final class RooJavaType {
     public static final JavaType ROO_PERMISSION_EVALUATOR = new JavaType(
             "org.springframework.roo.addon.security.RooPermissionEvaluator");
     public static final JavaType ROO_PLURAL = new JavaType(
-            "org.springframework.roo.addon.plural.RooPlural");
+            "org.springframework.roo.addon.plural.annotations.RooPlural");
     public static final JavaType ROO_REPOSITORY_JPA = new JavaType(
             "org.springframework.roo.addon.layers.repository.jpa.annotations.RooJpaRepository");
     public static final JavaType ROO_REPOSITORY_MONGO = new JavaType(