Updated the GUI2 archetype with real gui code
Change-Id: If0fb2a6cb38bff69a978a7a23dd2e3a6212d67f3
diff --git a/tools/package/archetypes/ui2/src/main/resources/archetype-resources/app/pom.xml b/tools/package/archetypes/ui2/src/main/resources/archetype-resources/app/pom.xml
index 75a1c31..4a7c9fd 100644
--- a/tools/package/archetypes/ui2/src/main/resources/archetype-resources/app/pom.xml
+++ b/tools/package/archetypes/ui2/src/main/resources/archetype-resources/app/pom.xml
@@ -34,7 +34,7 @@
<properties>
<onos.app.name>${package}.${artifactId}</onos.app.name>
- <onos.app.title>${appNameCap}${appNameEnd} App</onos.app.title>
+ <onos.app.title>${appNameTitle} App</onos.app.title>
<onos.app.origin>Foo, Inc.</onos.app.origin>
<onos.app.category>UI</onos.app.category>
<onos.app.url>http://onosproject.org</onos.app.url>
diff --git a/tools/package/archetypes/ui2/src/main/resources/archetype-resources/app/src/main/java/AppUiComponent.java b/tools/package/archetypes/ui2/src/main/resources/archetype-resources/app/src/main/java/__appNameTitle__UiComponent.java
similarity index 89%
rename from tools/package/archetypes/ui2/src/main/resources/archetype-resources/app/src/main/java/AppUiComponent.java
rename to tools/package/archetypes/ui2/src/main/resources/archetype-resources/app/src/main/java/__appNameTitle__UiComponent.java
index 4522692..a1d8b33 100644
--- a/tools/package/archetypes/ui2/src/main/resources/archetype-resources/app/src/main/java/AppUiComponent.java
+++ b/tools/package/archetypes/ui2/src/main/resources/archetype-resources/app/src/main/java/__appNameTitle__UiComponent.java
@@ -37,10 +37,10 @@
* Skeletal ONOS UI Custom-View application component.
*/
@Component(immediate = true)
-public class AppUiComponent {
+public class ${appNameTitle}UiComponent {
- private static final String VIEW_ID = "sampleCustom";
- private static final String VIEW_TEXT = "Sample Custom";
+ private static final String VIEW_ID = "${artifactId}-gui";
+ private static final String VIEW_TEXT = "${appNameTitle} UI";
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -55,14 +55,15 @@
// Factory for UI message handlers
private final UiMessageHandlerFactory messageHandlerFactory =
() -> ImmutableList.of(
- new AppUiMessageHandler()
+ new ${appNameTitle}UiMessageHandler()
);
- // Application UI extension
+ // ${appNameTitle} UI extension
protected UiExtension extension =
new UiExtension.Builder(getClass().getClassLoader(), uiViews)
.resourcePath(VIEW_ID)
.messageHandlerFactory(messageHandlerFactory)
+ .ui2()
.build();
@Activate
diff --git a/tools/package/archetypes/ui2/src/main/resources/archetype-resources/app/src/main/java/AppUiMessageHandler.java b/tools/package/archetypes/ui2/src/main/resources/archetype-resources/app/src/main/java/__appNameTitle__UiMessageHandler.java
similarity index 79%
rename from tools/package/archetypes/ui2/src/main/resources/archetype-resources/app/src/main/java/AppUiMessageHandler.java
rename to tools/package/archetypes/ui2/src/main/resources/archetype-resources/app/src/main/java/__appNameTitle__UiMessageHandler.java
index 0a35370..18c0968 100644
--- a/tools/package/archetypes/ui2/src/main/resources/archetype-resources/app/src/main/java/AppUiMessageHandler.java
+++ b/tools/package/archetypes/ui2/src/main/resources/archetype-resources/app/src/main/java/__appNameTitle__UiMessageHandler.java
@@ -30,10 +30,10 @@
/**
* Skeletal ONOS UI Custom-View message handler.
*/
-public class AppUiMessageHandler extends UiMessageHandler {
+public class ${appNameTitle}UiMessageHandler extends UiMessageHandler {
- private static final String SAMPLE_CUSTOM_DATA_REQ = "sampleCustomDataRequest";
- private static final String SAMPLE_CUSTOM_DATA_RESP = "sampleCustomDataResponse";
+ private static final String ${appNameAllCaps}_DATA_REQ = "${appNameAllLower}DataRequest";
+ private static final String ${appNameAllCaps}_DATA_RESP = "${appNameAllLower}DataResponse";
private static final String NUMBER = "number";
private static final String SQUARE = "square";
@@ -49,15 +49,15 @@
@Override
protected Collection<RequestHandler> createRequestHandlers() {
return ImmutableSet.of(
- new SampleCustomDataRequestHandler()
+ new ${appNameTitle}DataRequestHandler()
);
}
// handler for sample data requests
- private final class SampleCustomDataRequestHandler extends RequestHandler {
+ private final class ${appNameTitle}DataRequestHandler extends RequestHandler {
- private SampleCustomDataRequestHandler() {
- super(SAMPLE_CUSTOM_DATA_REQ);
+ private ${appNameTitle}DataRequestHandler() {
+ super(${appNameAllCaps}_DATA_REQ);
}
@Override
@@ -71,7 +71,7 @@
result.put(SQUARE, someNumber * someNumber);
result.put(CUBE, someNumber * someNumber * someNumber);
result.put(MESSAGE, String.format(MSG_FORMAT, someIncrement + 1));
- sendMessage(SAMPLE_CUSTOM_DATA_RESP, result);
+ sendMessage(${appNameAllCaps}_DATA_RESP, result);
}
}
}