Update config-module-archetype.

Increase config version to 0.2.5-SNAPSHOT.
Add sal code generator as netconf relies on YangModuleInfo.
Fix generated pom to be able to install the artifact.

Change-Id: I09b6460615aa9788a9be5819707b923b2d340a9e
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>

diff --git a/opendaylight/config/config-module-archetype/README.txt b/opendaylight/config/config-module-archetype/README.txt
new file mode 100644 (file)
index 0000000..8b1f29b
--- /dev/null
+++ b/opendaylight/config/config-module-archetype/README.txt
@@ -0,0 +1,12 @@
+Use
+GROUP_ID=com.mycompany.app
+ARTIFACT_ID=my-app
+mvn archetype:generate -DgroupId=$GROUP_ID -DartifactId=$ARTIFACT_ID \
+ -DarchetypeArtifactId=config-module-archetype -DarchetypeGroupId=org.opendaylight.controller  \
+ -DarchetypeVersion=0.2.5-SNAPSHOT
+
+Module name and prefix define yang module name and its java name prefix.
+For example when creating thread factory wrapper, yang name might be
+thread-factory
+and java prefix
+ThreadFactory
\ No newline at end of file

diff --git a/opendaylight/config/config-module-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/opendaylight/config/config-module-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index fc30b4d2c37c9e926311d8a7ec90af4e196e9b2f..f7b87290df2e90c10ec100b2589797b3e391c64e 100644 (file)
--- a/opendaylight/config/config-module-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/opendaylight/config/config-module-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -15,7 +15,7 @@
             <defaultValue>2013-04-05</defaultValue>
         </requiredProperty>
         <requiredProperty key="config-api-version">
-            <defaultValue>0.2.4-SNAPSHOT</defaultValue>
+            <defaultValue>0.2.5-SNAPSHOT</defaultValue>
         </requiredProperty>
         <requiredProperty key="yang-maven-plugin-version">
             <defaultValue>0.6.2-SNAPSHOT</defaultValue>

diff --git a/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/pom.xml b/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/pom.xml
index d1c371d61869f30d16ecf2b3dc8555ed92fe90e7..21b1a5590bfb2470508a33ceed0a9a53a73d2f76 100644 (file)
--- a/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/pom.xml
@@ -9,8 +9,13 @@
 
     <properties>
         <jmxGeneratorPath>${project.build.directory}/generated-sources/config</jmxGeneratorPath>
+        <salGeneratorPath>${project.build.directory}/generated-sources/sal</salGeneratorPath>
         <config.version>${config-api-version}</config.version>
+        <yangtools.version>${yang-maven-plugin-version}</yangtools.version>
         <maven.bundle.version>${maven-bundle-plugin-version}</maven.bundle.version>
+        <java.version.source>1.7</java.version.source>
+        <java.version.target>1.7</java.version.target>
+        <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
     </properties>
 
     <dependencies>
@@ -26,7 +31,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>${yang-maven-plugin-version}</version>
+                <version>${yangtools.version}</version>
                 <executions>
                     <execution>
                         <id>config</id>
@@ -46,6 +51,14 @@
                                         </namespaceToPackage1>
                                     </additionalConfiguration>
                                 </generator>
+                                <generator>
+                                    <codeGeneratorClass>
+                                        org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
+                                    </codeGeneratorClass>
+                                    <outputBaseDir>
+                                        ${salGeneratorPath}
+                                    </outputBaseDir>
+                                </generator>
                             </codeGenerators>
                             <inspectDependencies>true</inspectDependencies>
                         </configuration>
@@ -57,6 +70,11 @@
                         <artifactId>yang-jmx-generator-plugin</artifactId>
                         <version>${config.version}</version>
                     </dependency>
+                    <dependency>
+                        <groupId>org.opendaylight.yangtools</groupId>
+                        <artifactId>maven-sal-api-gen-plugin</artifactId>
+                        <version>${yangtools.version}</version>
+                    </dependency>
                 </dependencies>
             </plugin>
 
@@ -88,16 +106,21 @@
                 <configuration>
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                        <Export-Package>
-                            ${yang-namespace-mapping-to}.${module-name},
-                        </Export-Package>
-                        <Import-Package>
-                            *
-                        </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven.compile.plugin.version}</version>
+                <configuration>
+                    <source>${java.version.source}</source>
+                    <target>${java.version.target}</target>
+                    <testSource>${java.version.source}</testSource>
+                    <testTarget>${java.version.target}</testTarget>
+                </configuration>
+            </plugin>
 
         </plugins>
     </build>