From: Tony Tkacik Date: Mon, 25 Aug 2014 13:54:02 +0000 (+0000) Subject: Merge "Archetypes for karaf support" X-Git-Tag: release/helium~215 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=91eec932865a8b38e9ab33b3fa566f1a0a9534e9;hp=540f686647f7aac4af1460853ad29eebfb1db812 Merge "Archetypes for karaf support" --- diff --git a/opendaylight/archetypes/opendaylight-configfile-archetype/pom.xml b/opendaylight/archetypes/opendaylight-configfile-archetype/pom.xml new file mode 100644 index 0000000000..38c86164e9 --- /dev/null +++ b/opendaylight/archetypes/opendaylight-configfile-archetype/pom.xml @@ -0,0 +1,52 @@ + + + 4.0.0 + + org.opendaylight.controller + opendaylight-configfile-archetype + 1.1-SNAPSHOT + maven-archetype + + + + + + org.apache.maven.archetype + archetype-packaging + 2.2 + + + + + + + maven-archetype-plugin + 2.2 + + + + + + Configuration files for md-sal + + + scm:git:ssh://git.opendaylight.org:29418/controller.git/md-sal-config + scm:git:ssh://git.opendaylight.org:29418/controller.git/md-sal-config + https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL/md-sal-config + + + + + opendaylight-release + http://nexus.opendaylight.org/content/repositories/opendaylight.release/ + + + opendaylight-snapshot + http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + + + website + dav:http://nexus.opendaylight.org/content/sites/site/sal-parent + + + diff --git a/opendaylight/archetypes/opendaylight-configfile-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/opendaylight/archetypes/opendaylight-configfile-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml new file mode 100644 index 0000000000..d404f99c7a --- /dev/null +++ b/opendaylight/archetypes/opendaylight-configfile-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -0,0 +1,16 @@ + + + + + + + + src/main/resources + + **/*.xml + + + + diff --git a/opendaylight/archetypes/opendaylight-configfile-archetype/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/opendaylight-configfile-archetype/src/main/resources/archetype-resources/pom.xml new file mode 100644 index 0000000000..e217b9abfa --- /dev/null +++ b/opendaylight/archetypes/opendaylight-configfile-archetype/src/main/resources/archetype-resources/pom.xml @@ -0,0 +1,60 @@ + + + + 4.0.0 + + ${artifactId} + ${groupId} + Configuration files for md-sal + + jar + + + 80-configfile.xml + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + + attach-artifact + + package + + + + ${project.build.directory}/classes/${configfile} + xml + config + + + + + + + + + + scm:git:ssh://git.opendaylight.org:29418/${repoName}.git + scm:git:ssh://git.opendaylight.org:29418/${repoName}.git + HEAD + https://git.opendaylight.org/gerrit/gitweb?p=${repoName}.git;a=summary + + diff --git a/opendaylight/archetypes/opendaylight-configfile-archetype/src/main/resources/archetype-resources/src/main/resources/80-configfile.xml b/opendaylight/archetypes/opendaylight-configfile-archetype/src/main/resources/archetype-resources/src/main/resources/80-configfile.xml new file mode 100644 index 0000000000..432b947351 --- /dev/null +++ b/opendaylight/archetypes/opendaylight-configfile-archetype/src/main/resources/archetype-resources/src/main/resources/80-configfile.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/opendaylight/archetypes/opendaylight-configfile-archetype/src/test/resources/projects/basic/archetype.properties b/opendaylight/archetypes/opendaylight-configfile-archetype/src/test/resources/projects/basic/archetype.properties new file mode 100644 index 0000000000..7a940e7a6e --- /dev/null +++ b/opendaylight/archetypes/opendaylight-configfile-archetype/src/test/resources/projects/basic/archetype.properties @@ -0,0 +1,6 @@ +#Mon Aug 25 05:45:18 CDT 2014 +package=it.pkg +version=0.1-SNAPSHOT +groupId=archetype.it +artifactId=basic +repoName=foo diff --git a/opendaylight/archetypes/opendaylight-configfile-archetype/src/test/resources/projects/basic/goal.txt b/opendaylight/archetypes/opendaylight-configfile-archetype/src/test/resources/projects/basic/goal.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/opendaylight/archetypes/opendaylight-karaf-distro-archetype/pom.xml b/opendaylight/archetypes/opendaylight-karaf-distro-archetype/pom.xml new file mode 100644 index 0000000000..8883c64295 --- /dev/null +++ b/opendaylight/archetypes/opendaylight-karaf-distro-archetype/pom.xml @@ -0,0 +1,38 @@ + + + 4.0.0 + + org.opendaylight.controller + opendaylight-karaf-distro-archetype + 1.0.0-SNAPSHOT + maven-archetype + + distribution-karaf-archetype + + + + + org.apache.maven.archetype + archetype-packaging + 2.2 + + + + + + + maven-archetype-plugin + 2.2 + + + + + + https://wiki.opendaylight.org/view/CrossProject:Integration_Group/distribution-karaf + + + scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main + + diff --git a/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml new file mode 100644 index 0000000000..4c4f5103ee --- /dev/null +++ b/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/archetype-resources/pom.xml new file mode 100644 index 0000000000..965c619695 --- /dev/null +++ b/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/archetype-resources/pom.xml @@ -0,0 +1,285 @@ + + + 4.0.0 + + ${artifactId} + ${groupId} + + pom + + 3.0 + + + + 1.0.0-SNAPSHOT + 1.4.2-SNAPSHOT + 3.0.1 + + + + + + org.apache.karaf.features + framework + ${karaf.version} + kar + + + org.apache.karaf.features + standard + ${karaf.version} + features + xml + runtime + + + + + org.opendaylight.controller + karaf.branding + ${branding.version} + compile + + + + + org.opendaylight.controller + opendaylight-karaf-resources + ${karaf.resources.version} + + + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.felix + maven-bundle-plugin + [0,) + + cleanVersions + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + [0,) + + copy + unpack + + + + + + + + + org.apache.karaf.tooling + karaf-maven-plugin + [0,) + + commands-generate-help + + + + + + + + + org.fusesource.scalate + maven-scalate-plugin + [0,) + + sitegen + + + + + + + + + org.apache.servicemix.tooling + depends-maven-plugin + [0,) + + generate-depends-file + + + + + + + + + + + + + + + org.apache.karaf.tooling + karaf-maven-plugin + ${karaf.version} + true + + + standard + + + + + + + process-resources + + install-kars + + process-resources + + + package + + instance-create-archive + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.6 + + + copy + + copy + + generate-resources + + + + org.opendaylight.controller + karaf.branding + ${karaf.branding.version} + target/assembly/lib + karaf.branding-${branding.version}.jar + + + + + + unpack-karaf-resources + + unpack-dependencies + + prepare-package + + ${project.build.directory}/assembly + org.opendaylight.controller + opendaylight-karaf-resources + META-INF\/** + true + false + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + prepare-package + + run + + + + + + + + + + + + + + + + + + + + + + + scm:git:ssh://git.opendaylight.org:29418/${repoName}.git + scm:git:ssh://git.opendaylight.org:29418/${repoName}.git + HEAD + https://git.opendaylight.org/gerrit/gitweb?p=${repoName}.git;a=summary + + diff --git a/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/test/resources/projects/basic/archetype.properties b/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/test/resources/projects/basic/archetype.properties new file mode 100644 index 0000000000..dd29db648f --- /dev/null +++ b/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/test/resources/projects/basic/archetype.properties @@ -0,0 +1,6 @@ +#Thu Aug 21 14:44:29 CDT 2014 +package=it.pkg +version=0.1-SNAPSHOT +groupId=archetype.it +artifactId=basic +repoName=foo diff --git a/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/test/resources/projects/basic/goal.txt b/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/test/resources/projects/basic/goal.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/opendaylight/archetypes/opendaylight-karaf-features/pom.xml b/opendaylight/archetypes/opendaylight-karaf-features/pom.xml new file mode 100644 index 0000000000..4973a69537 --- /dev/null +++ b/opendaylight/archetypes/opendaylight-karaf-features/pom.xml @@ -0,0 +1,36 @@ + + + 4.0.0 + + org.opendaylight.controller + opendaylight-karaf-features-archetype + 1.0.0-SNAPSHOT + maven-archetype + + opendaylight-karaf-features-archetype + + + + + org.apache.maven.archetype + archetype-packaging + 2.2 + + + + + + + maven-archetype-plugin + 2.2 + + + + + + + scm:git:ssh://git.opendaylight.org:29418/controller.git/ + scm:git:ssh://git.opendaylight.org:29418/controller.git/ + https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=summary + + diff --git a/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/META-INF/maven/archetype-metadata.xml b/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/META-INF/maven/archetype-metadata.xml new file mode 100644 index 0000000000..158e448265 --- /dev/null +++ b/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -0,0 +1,14 @@ + + + + + + + + src/main/resources + **/*.xml + + + diff --git a/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/pom.xml new file mode 100644 index 0000000000..e135e6b656 --- /dev/null +++ b/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/pom.xml @@ -0,0 +1,194 @@ + + + + 4.0.0 + + features-${repoName} + ${groupId} + + jar + + features.xml + + 1.0.0-SNAPSHOT + 1.4.2-SNAPSHOT + 3.0.1 + 0.6.2-SNAPSHOT + 1.4.2-SNAPSHOT + 2.16 + + + + + + + + + + + + org.opendaylight.yangtools + features-test + ${feature.test.version} + test + + + + org.opendaylight.controller + opendaylight-karaf-empty + ${karaf.empty.version} + zip + + + + + + + + src/main/resources + true + + + + + org.apache.maven.plugins + maven-resources-plugin + + + filter + generate-resources + + resources + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + package + + attach-artifact + + + + + ${project.build.directory}/classes/${features.file} + xml + features + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${surefire.version} + + + org.opendaylight.controller + opendaylight-karaf-empty + ${karaf.empty.version} + + + org.opendaylight.yangtools:features-test + + + + + + + scm:git:ssh://git.opendaylight.org:29418/${repoName}.git + scm:git:ssh://git.opendaylight.org:29418/${repoName}.git + HEAD + https://git.opendaylight.org/gerrit/gitweb?p=${repoName}.git;a=summary + + diff --git a/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/src/main/resources/features.xml b/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/src/main/resources/features.xml new file mode 100644 index 0000000000..4a59657431 --- /dev/null +++ b/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/src/main/resources/features.xml @@ -0,0 +1,86 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) + + + + + + + + + + + + + diff --git a/opendaylight/archetypes/opendaylight-karaf-features/src/test/resources/projects/basic/archetype.properties b/opendaylight/archetypes/opendaylight-karaf-features/src/test/resources/projects/basic/archetype.properties new file mode 100644 index 0000000000..bab8cd295d --- /dev/null +++ b/opendaylight/archetypes/opendaylight-karaf-features/src/test/resources/projects/basic/archetype.properties @@ -0,0 +1,6 @@ +#Thu Aug 21 23:46:25 CDT 2014 +package=it.pkg +version=0.1-SNAPSHOT +groupId=archetype.it +artifactId=basic +repoName=foo diff --git a/opendaylight/archetypes/opendaylight-karaf-features/src/test/resources/projects/basic/goal.txt b/opendaylight/archetypes/opendaylight-karaf-features/src/test/resources/projects/basic/goal.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/opendaylight/archetypes/pom.xml b/opendaylight/archetypes/pom.xml index 36af861e84..cb597c10bd 100644 --- a/opendaylight/archetypes/pom.xml +++ b/opendaylight/archetypes/pom.xml @@ -6,9 +6,9 @@ org.opendaylight.controller - commons.parent - 1.0.1-SNAPSHOT - ../commons/parent + commons.opendaylight + 1.4.2-SNAPSHOT + ../commons/opendaylight scm:git:ssh://git.opendaylight.org:29418/controller.git @@ -39,5 +39,8 @@ odl-model-project + opendaylight-configfile-archetype + opendaylight-karaf-distro-archetype + opendaylight-karaf-features diff --git a/pom.xml b/pom.xml index 22c03ac7ac..10c05e254f 100644 --- a/pom.xml +++ b/pom.xml @@ -136,6 +136,9 @@ opendaylight/distribution/opendaylight-karaf opendaylight/distribution/opendaylight-karaf-resources features + + + opendaylight/archetypes scm:git:ssh://git.opendaylight.org:29418/controller.git