Fixed inconsistency between onos-archetypes-test and stc archetypes; again
Change-Id: I7ab0ba9ffb0a21d3832009b83eb10024b0ccaabe
diff --git a/tools/package/archetypes/cli/src/main/resources/archetype-resources/src/main/java/package-info.java b/tools/package/archetypes/cli/src/main/resources/archetype-resources/src/main/java/package-info.java
deleted file mode 100644
index 3d2d640..0000000
--- a/tools/package/archetypes/cli/src/main/resources/archetype-resources/src/main/java/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * Copyright ${year}-present Open Networking Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * The ${artifactId} application.
- */
-package ${package};
diff --git a/tools/package/archetypes/rest/src/main/resources/archetype-resources/src/main/java/package-info.java b/tools/package/archetypes/rest/src/main/resources/archetype-resources/src/main/java/package-info.java
deleted file mode 100644
index 3d2d640..0000000
--- a/tools/package/archetypes/rest/src/main/resources/archetype-resources/src/main/java/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * Copyright ${year}-present Open Networking Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * The ${artifactId} application.
- */
-package ${package};
diff --git a/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/java/package-info.java b/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/java/package-info.java
deleted file mode 100644
index 3d2d640..0000000
--- a/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/java/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * Copyright ${year}-present Open Networking Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * The ${artifactId} application.
- */
-package ${package};
diff --git a/tools/package/archetypes/uitab/src/main/resources/archetype-resources/src/main/java/package-info.java b/tools/package/archetypes/uitab/src/main/resources/archetype-resources/src/main/java/package-info.java
deleted file mode 100644
index 3d2d640..0000000
--- a/tools/package/archetypes/uitab/src/main/resources/archetype-resources/src/main/java/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * Copyright ${year}-present Open Networking Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * The ${artifactId} application.
- */
-package ${package};
diff --git a/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/src/main/java/package-info.java b/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/src/main/java/package-info.java
deleted file mode 100644
index 3d2d640..0000000
--- a/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/src/main/java/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * Copyright ${year}-present Open Networking Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * The ${artifactId} application.
- */
-package ${package};
diff --git a/tools/test/bin/onos-archetypes-test b/tools/test/bin/onos-archetypes-test
index aec093a..33e3d4b 100755
--- a/tools/test/bin/onos-archetypes-test
+++ b/tools/test/bin/onos-archetypes-test
@@ -19,16 +19,19 @@
set -e
export AROOT=${ONOS_STAGE_ROOT:-/tmp}/foo
-export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=2.2.2-SNAPSHOT"
+export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=2.4.0-SNAPSHOT"
+rm -fr $AROOT 2>/dev/null
mkdir -p $AROOT
+
+# FIXME: for an in api bundle cli rest ui uitab uitopo ui2; do
for an in api bundle cli rest ui uitab uitopo; do
cd $AROOT
- rm -fr $AROOT/foo-$an
+ [ $an = api ] && name=foo-api || name=foo-app
mvn -q -B archetype:generate "$@" $ARCHETYPE_OPTS \
-DarchetypeArtifactId=onos-$an-archetype \
- -DgroupId=org.foo -DartifactId=foo-$an -Dversion=1.0 \
- -Dpackage=org.foo.$an -DinteractiveMode=false
- cd $AROOT/foo-$an
+ -DgroupId=org.foo -DartifactId=$name -Dversion=1.0 \
+ -Dpackage=org.foo.test -DinteractiveMode=false
+ cd $AROOT/$name
mvn "$@" -q -B clean install
done