Startup arch - remove artifactId prefix from dir names.

Change-Id: I3f63ebfbd6f152ed47597f38bed28a9e3b57c4ce
Signed-off-by: Nathan Harmon <nathan.harmon@hp.com>

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/META-INF/maven/archetype-metadata.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/META-INF/maven/archetype-metadata.xml
index 7057a86fe59d32a459834c0d3703c61ed272df83..f4c2893da78459140e4a2dbdc574f777cb639830 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -28,7 +28,7 @@
 
     <!-- karaf distro -->
     <fileSet filtered="true" encoding="UTF-8">
-        <directory>__artifactId__-karaf</directory>
+        <directory>karaf</directory>
         <includes>
             <include>pom.xml</include>
         </includes>
@@ -37,13 +37,13 @@
     <!-- features -->
 
     <fileSet filtered="true" encoding="UTF-8">
-        <directory>__artifactId__-features</directory>
+        <directory>features</directory>
         <includes>
             <include>pom.xml</include>
         </includes>
     </fileSet>
     <fileSet filtered="true" encoding="UTF-8">
-        <directory>__artifactId__-features/src/main/features</directory>
+        <directory>features/src/main/features</directory>
         <includes>
             <include>**/*.xml</include>
           </includes>
@@ -52,25 +52,25 @@
     <!-- impl -->
 
     <fileSet filtered="true" encoding="UTF-8">
-        <directory>__artifactId__-impl</directory>
+        <directory>impl</directory>
         <includes>
             <include>pom.xml</include>
         </includes>
     </fileSet>
     <fileSet filtered="true" encoding="UTF-8">
-        <directory>__artifactId__-impl/src/main/java</directory>
+        <directory>impl/src/main/java</directory>
         <includes>
             <include>**/*.java</include>
          </includes>
     </fileSet>
     <fileSet filtered="true" encoding="UTF-8">
-        <directory>__artifactId__-impl/src/main/config</directory>
+        <directory>impl/src/main/config</directory>
         <includes>
             <include>**/*.xml</include>
          </includes>
     </fileSet>
     <fileSet filtered="true" encoding="UTF-8">
-       <directory>__artifactId__-impl/src/main/yang</directory>
+       <directory>impl/src/main/yang</directory>
        <includes>
          <include>**/*.yang</include>
        </includes>
@@ -79,13 +79,13 @@
      <!-- api -->
 
      <fileSet filtered="true" encoding="UTF-8">
-       <directory>__artifactId__-api</directory>
+       <directory>api</directory>
        <includes>
          <include>pom.xml</include>
        </includes>
      </fileSet>
      <fileSet filtered="true" encoding="UTF-8">
-       <directory>__artifactId__-api/src/main/yang</directory>
+       <directory>api/src/main/yang</directory>
        <includes>
          <include>**/*.yang</include>
        </includes>
@@ -93,7 +93,7 @@
 
      <!-- artifacts -->
      <fileSet filtered="true" encoding="UTF-8">
-       <directory>__artifactId__-artifacts</directory>
+       <directory>artifacts</directory>
        <includes>
          <include>pom.xml</include>
        </includes>

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-api/.gitignore b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/.gitignore
similarity index 100%
rename from opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-api/.gitignore
rename to opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/.gitignore

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-api/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/pom.xml
similarity index 100%
rename from opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-api/pom.xml
rename to opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/pom.xml

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-api/src/main/yang/__artifactId__.yang b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/src/main/yang/__artifactId__.yang
similarity index 100%
rename from opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-api/src/main/yang/__artifactId__.yang
rename to opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/src/main/yang/__artifactId__.yang

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-artifacts/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/artifacts/pom.xml
similarity index 100%
rename from opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-artifacts/pom.xml
rename to opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/artifacts/pom.xml

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-features/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml
similarity index 100%
rename from opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-features/pom.xml
rename to opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-features/src/main/features/features.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/src/main/features/features.xml
similarity index 100%
rename from opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-features/src/main/features/features.xml
rename to opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/src/main/features/features.xml

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-impl/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/pom.xml
similarity index 100%
rename from opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-impl/pom.xml
rename to opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/pom.xml

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-impl/src/main/config/default-config.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/src/main/config/default-config.xml
similarity index 100%
rename from opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-impl/src/main/config/default-config.xml
rename to opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/src/main/config/default-config.xml

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-impl/src/main/java/__packageInPathFormat__/__classPrefix__Provider.java b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/src/main/java/__packageInPathFormat__/__classPrefix__Provider.java
similarity index 100%
rename from opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-impl/src/main/java/__packageInPathFormat__/__classPrefix__Provider.java
rename to opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/src/main/java/__packageInPathFormat__/__classPrefix__Provider.java

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/__artifactId__/impl/rev141210/__classPrefix__ImplModule.java b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/__artifactId__/impl/rev141210/__classPrefix__ImplModule.java
similarity index 100%
rename from opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/__artifactId__/impl/rev141210/__classPrefix__ImplModule.java
rename to opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/__artifactId__/impl/rev141210/__classPrefix__ImplModule.java

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/__artifactId__/impl/rev141210/__classPrefix__ImplModuleFactory.java b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/__artifactId__/impl/rev141210/__classPrefix__ImplModuleFactory.java
similarity index 100%
rename from opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/__artifactId__/impl/rev141210/__classPrefix__ImplModuleFactory.java
rename to opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/__artifactId__/impl/rev141210/__classPrefix__ImplModuleFactory.java

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-impl/src/main/yang/__artifactId__-impl.yang b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/src/main/yang/__artifactId__-impl.yang
similarity index 100%
rename from opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-impl/src/main/yang/__artifactId__-impl.yang
rename to opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/src/main/yang/__artifactId__-impl.yang

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-karaf/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml
similarity index 100%
rename from opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-karaf/pom.xml
rename to opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
index 3221efd3628b833a1fd71622d4c1b942041c3e96..b134ccc646627ea0a025a0a6d21aed674439c1c3 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
@@ -16,11 +16,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <maven>3.1.1</maven>
   </prerequisites>
   <modules>
-    <module>${artifactId}-api</module>
-    <module>${artifactId}-impl</module>
-    <module>${artifactId}-karaf</module>
-    <module>${artifactId}-features</module>
-    <module>${artifactId}-artifacts</module>
+    <module>api</module>
+    <module>impl</module>
+    <module>karaf</module>
+    <module>features</module>
+    <module>artifacts</module>
   </modules>
   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
   <build>