Fixing archetypes so that the REST overlay works together with UI overlays.
Change-Id: Iab60f4cd07b59e1750ef0733883f4f7ecd0b3b46
diff --git a/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
index f442ed0..e891556 100644
--- a/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
@@ -164,8 +164,9 @@
com.google.common.*,
org.onlab.packet.*,
org.onlab.rest.*,
- org.onosproject.*,
+ org.onlab.osgi.*,
org.onlab.util.*,
+ org.onosproject.*,
org.jboss.netty.util.*
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
diff --git a/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/java/AppUiComponent.java b/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/java/AppUiComponent.java
index e44b34d..ec42b88 100644
--- a/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/java/AppUiComponent.java
+++ b/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/java/AppUiComponent.java
@@ -61,6 +61,7 @@
// Application UI extension
protected UiExtension extension =
new UiExtension.Builder(getClass().getClassLoader(), uiViews)
+ .resourcePath(VIEW_ID)
.messageHandlerFactory(messageHandlerFactory)
.build();
diff --git a/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/css.html b/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/sampleCustom/css.html
similarity index 100%
rename from tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/css.html
rename to tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/sampleCustom/css.html
diff --git a/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/js.html b/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/sampleCustom/js.html
similarity index 100%
rename from tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/js.html
rename to tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/sampleCustom/js.html