| commit | 2b0fc4674a2318150597a7e86d6a95644182ea0c | [log] [tgz] |
|---|---|---|
| author | Thomas Vachuska <tom@onlab.us> | Mon Sep 28 12:04:06 2015 -0700 |
| committer | Thomas Vachuska <tom@onlab.us> | Mon Sep 28 12:04:06 2015 -0700 |
| tree | 3773bea272a1806387b0847fe30ba10a7913b6d6 | |
| parent | 9f1f0258f24c34989d38f564f45ac4c5467e8c70 [diff] |
Modifying uitab archetype to allow it to co-exist/overlay the ui archetype. Change-Id: I5fd8408aaaf461e29e757389d4acbd94647cd1c5
diff --git a/tools/package/archetypes/uitab/src/main/resources/archetype-resources/src/main/java/AppUiComponent.java b/tools/package/archetypes/uitab/src/main/resources/archetype-resources/src/main/java/AppUiTableComponent.java similarity index 94% rename from tools/package/archetypes/uitab/src/main/resources/archetype-resources/src/main/java/AppUiComponent.java rename to tools/package/archetypes/uitab/src/main/resources/archetype-resources/src/main/java/AppUiTableComponent.java index 3a58d83..4cd4df0 100644 --- a/tools/package/archetypes/uitab/src/main/resources/archetype-resources/src/main/java/AppUiComponent.java +++ b/tools/package/archetypes/uitab/src/main/resources/archetype-resources/src/main/java/AppUiTableComponent.java
@@ -37,7 +37,7 @@ * Skeletal ONOS UI Table-View application component. */ @Component(immediate = true) -public class AppUiComponent { +public class AppUiTableComponent { private final Logger log = LoggerFactory.getLogger(getClass()); @@ -52,12 +52,13 @@ // Factory for UI message handlers private final UiMessageHandlerFactory messageHandlerFactory = () -> ImmutableList.of( - new AppUiMessageHandler() + new AppUiTableMessageHandler() ); // Application UI extension protected UiExtension extension = new UiExtension.Builder(getClass().getClassLoader(), uiViews) + .resourcePath("sampleTable") .messageHandlerFactory(messageHandlerFactory) .build();
diff --git a/tools/package/archetypes/uitab/src/main/resources/archetype-resources/src/main/java/AppUiMessageHandler.java b/tools/package/archetypes/uitab/src/main/resources/archetype-resources/src/main/java/AppUiTableMessageHandler.java similarity index 98% rename from tools/package/archetypes/uitab/src/main/resources/archetype-resources/src/main/java/AppUiMessageHandler.java rename to tools/package/archetypes/uitab/src/main/resources/archetype-resources/src/main/java/AppUiTableMessageHandler.java index cd3602e..50eb76b 100644 --- a/tools/package/archetypes/uitab/src/main/resources/archetype-resources/src/main/java/AppUiMessageHandler.java +++ b/tools/package/archetypes/uitab/src/main/resources/archetype-resources/src/main/java/AppUiTableMessageHandler.java
@@ -35,7 +35,7 @@ /** * Skeletal ONOS UI Table-View message handler. */ -public class AppUiMessageHandler extends UiMessageHandler { +public class AppUiTableMessageHandler extends UiMessageHandler { private static final String SAMPLE_TABLE_DATA_REQ = "sampleTableDataRequest"; private static final String SAMPLE_TABLE_DATA_RESP = "sampleTableDataResponse";
diff --git a/tools/package/archetypes/uitab/src/main/resources/archetype-resources/src/main/resources/css.html b/tools/package/archetypes/uitab/src/main/resources/archetype-resources/src/main/resources/sampleTable/css.html similarity index 100% rename from tools/package/archetypes/uitab/src/main/resources/archetype-resources/src/main/resources/css.html rename to tools/package/archetypes/uitab/src/main/resources/archetype-resources/src/main/resources/sampleTable/css.html
diff --git a/tools/package/archetypes/uitab/src/main/resources/archetype-resources/src/main/resources/js.html b/tools/package/archetypes/uitab/src/main/resources/archetype-resources/src/main/resources/sampleTable/js.html similarity index 100% rename from tools/package/archetypes/uitab/src/main/resources/archetype-resources/src/main/resources/js.html rename to tools/package/archetypes/uitab/src/main/resources/archetype-resources/src/main/resources/sampleTable/js.html